From 2d3948b98bb9e8c7bad60f1acd99ff0b42b3ae30 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/grammar.cc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'decoder/grammar.cc')

diff --git a/decoder/grammar.cc b/decoder/grammar.cc
index ee43f537..f2530d35 100644
--- a/decoder/grammar.cc
+++ b/decoder/grammar.cc
@@ -3,15 +3,20 @@
 #include <algorithm>
 #include <utility>
 #include <map>
-#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_set; }
+#endif
 
 #include "rule_lexer.h"
 #include "filelib.h"
 #include "tdict.h"
 
 using namespace std;
-using namespace std::tr1;
 
 const vector<TRulePtr> Grammar::NO_RULES;
 
-- 
cgit v1.2.3