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_wordalign.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'decoder/ff_wordalign.cc')

diff --git a/decoder/ff_wordalign.cc b/decoder/ff_wordalign.cc
index 1491819d..8ed053c2 100644
--- a/decoder/ff_wordalign.cc
+++ b/decoder/ff_wordalign.cc
@@ -7,7 +7,12 @@
 #include <string>
 #include <cmath>
 #include <bitset>
-#include <tr1/unordered_map>
+#ifdef HAVE_CXX11
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+namespace std { using std::tr1::unordered_map; }
+#endif
 
 #include <boost/tuple/tuple.hpp>
 #include "boost/tuple/tuple_comparison.hpp"
@@ -249,7 +254,7 @@ void NewJump::FireFeature(const SentenceMetadata& smeta,
   if (fp1_)   get<6>(key) = GetSourceWord(id, cur_src_index + 1);
   if (fprev_) get<7>(key) = GetSourceWord(id, prev_src_index);
 
-  static std::tr1::unordered_map<NewJumpFeatureKey, int, KeyHash> fids;
+  static std::unordered_map<NewJumpFeatureKey, int, KeyHash> fids;
   int& fid = fids[key];
   if (!fid) {
     ostringstream os;
-- 
cgit v1.2.3