From d9cc1a6986188a97e09e4c8cef46c34eee5f9cd2 Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@Chriss-MacBook-Air.local>
Date: Sun, 10 Nov 2013 00:58:44 -0500
Subject: guard against direct includes of tr1

---
 decoder/earley_composer.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'decoder/earley_composer.cc')

diff --git a/decoder/earley_composer.cc b/decoder/earley_composer.cc
index efce70a6..32c387d3 100644
--- a/decoder/earley_composer.cc
+++ b/decoder/earley_composer.cc
@@ -4,8 +4,14 @@
 #include <fstream>
 #include <map>
 #include <queue>
-#include <tr1/unordered_map>
-#include <tr1/unordered_set>
+#ifdef HAVE_CXX11
+# include <unordered_map>
+# include <unordered_set>
+#else
+# include <tr1/unordered_map>
+# include <tr1/unordered_set>
+namespace std { using std::tr1::unordered_map; using std::tr1::unordered_multiset; using std::tr1::unordered_set; }
+#endif
 
 #include <boost/shared_ptr.hpp>
 #include <boost/program_options.hpp>
@@ -19,7 +25,6 @@
 #include "hg_remove_eps.h"
 
 using namespace std;
-using namespace std::tr1;
 
 // Define the following macro if you want to see lots of debugging output
 // when you run the chart parser
-- 
cgit v1.2.3