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

---
 word-aligner/fast_align.cc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'word-aligner/fast_align.cc')

diff --git a/word-aligner/fast_align.cc b/word-aligner/fast_align.cc
index fddcba9c..589ca62d 100644
--- a/word-aligner/fast_align.cc
+++ b/word-aligner/fast_align.cc
@@ -1,7 +1,12 @@
 #include <iostream>
 #include <cmath>
 #include <utility>
-#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/functional/hash.hpp>
 #include <boost/program_options.hpp>
@@ -17,7 +22,6 @@
 
 namespace po = boost::program_options;
 using namespace std;
-using namespace std::tr1;
 
 bool InitCommandLine(int argc, char** argv, po::variables_map* conf) {
   po::options_description opts("Configuration options");
-- 
cgit v1.2.3