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/hg_intersect.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'decoder/hg_intersect.cc')

diff --git a/decoder/hg_intersect.cc b/decoder/hg_intersect.cc
index ad5b701a..c5f1cc91 100644
--- a/decoder/hg_intersect.cc
+++ b/decoder/hg_intersect.cc
@@ -1,7 +1,12 @@
 #include "hg_intersect.h"
 
 #include <vector>
-#include <tr1/unordered_map>
+#ifdef HAVE_CXX11
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+namespace std { using std::tr1::unordered_map; }
+#endif
 #include "fast_lexical_cast.hpp"
 #include <boost/functional/hash.hpp>
 
@@ -13,7 +18,6 @@
 #include "bottom_up_parser.h"
 
 using boost::lexical_cast;
-using namespace std::tr1;
 using namespace std;
 
 struct RuleFilter {
-- 
cgit v1.2.3