summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorChris Dyer <cdyer@Chriss-MacBook-Air.local>2013-11-10 00:58:44 -0500
committerChris Dyer <cdyer@Chriss-MacBook-Air.local>2013-11-10 00:58:44 -0500
commitd9cc1a6986188a97e09e4c8cef46c34eee5f9cd2 (patch)
tree662e45620fcf5b27f6a6edb5a5c105a0514e51cd /python
parentdb0dcd780abea416cfdb2b2382152dbe11c35170 (diff)
guard against direct includes of tr1
Diffstat (limited to 'python')
-rw-r--r--python/cdec/sa/strmap.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/python/cdec/sa/strmap.cc b/python/cdec/sa/strmap.cc
index 5040477e..d7c4f2a3 100644
--- a/python/cdec/sa/strmap.cc
+++ b/python/cdec/sa/strmap.cc
@@ -2,11 +2,16 @@
#include <vector>
#include <string>
-#include <tr1/unordered_map>
-#include <stdint.h>
+#include <cstdint>
+
+#ifdef HAVE_CXX11
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+namespace std { using std::tr1::unordered_map; }
+#endif
using namespace std;
-using namespace std::tr1;
#undef HAVE_64_BITS