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/ff_source_syntax2_p.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'decoder/ff_source_syntax2_p.cc')

diff --git a/decoder/ff_source_syntax2_p.cc b/decoder/ff_source_syntax2_p.cc
index dfa791ea..130144fa 100644
--- a/decoder/ff_source_syntax2_p.cc
+++ b/decoder/ff_source_syntax2_p.cc
@@ -3,7 +3,12 @@
 #include <sstream>
 #include <stack>
 #include <string>
-#include <tr1/unordered_set>
+#ifdef HAVE_CXX11
+# include <unordered_set>
+#else
+# include <tr1/unordered_set>
+namespace std { using std::tr1::unordered_set; }
+#endif
 
 #include "sentence_metadata.h"
 #include "array2d.h"
@@ -133,8 +138,7 @@ struct PSourceSyntaxFeatures2Impl {
 
   Array2D<WordID> src_tree;  // src_tree(i,j) NT = type
   mutable Array2D<map<const TRule*, int> > fids_ef;    // fires for fully lexicalized
-  tr1::unordered_set<int> feature_filter;
-
+  unordered_set<int> feature_filter;
 };
 
 PSourceSyntaxFeatures2::PSourceSyntaxFeatures2(const string& param) :
-- 
cgit v1.2.3