3 files changed, 15 insertions, 9 deletions
diff --git a/python/cdec/sa/_sa.c b/python/cdec/sa/_sa.cpp
index a9f7855e..a9f7855e 100644
--- a/python/cdec/sa/_sa.c
+++ b/python/cdec/sa/_sa.cpp
diff --git a/python/cdec/sa/compile.py b/python/cdec/sa/compile.py
index d4cd8387..caa93f8b 100644
--- a/python/cdec/sa/compile.py
+++ b/python/cdec/sa/compile.py
@@ -75,6 +75,13 @@ def main():
     a_bin = os.path.join(args.output, 'a.bin')
     lex_bin = os.path.join(args.output, 'lex.bin')
 
+    config = cdec.configobj.ConfigObj(args.config, unrepr=True)
+    config['f_sa_file'] = os.path.abspath(f_sa_bin)
+    config['e_file'] = os.path.abspath(e_bin)
+    config['a_file'] = os.path.abspath(a_bin)
+    config['lex_file'] = os.path.abspath(lex_bin)
+    config['precompute_file'] = os.path.abspath(precomp_bin)
+
     start_time = monitor_cpu()
     logger.info('Compiling source suffix array')
     if args.bitext:
@@ -116,12 +123,6 @@ def main():
     logger.info('Compiling bilexical dictionary took %f seconds', stop_time - start_time)
 
     # Write configuration
-    config = cdec.configobj.ConfigObj(args.config, unrepr=True)
-    config['f_sa_file'] = os.path.abspath(f_sa_bin)
-    config['e_file'] = os.path.abspath(e_bin)
-    config['a_file'] = os.path.abspath(a_bin)
-    config['lex_file'] = os.path.abspath(lex_bin)
-    config['precompute_file'] = os.path.abspath(precomp_bin)
     for name, value in zip(param_names, params):
         config[name] = value
     config.write()
diff --git a/python/cdec/sa/strmap.cc b/python/cdec/sa/strmap.cc
index 5040477e..b6debfb0 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>
+
+#ifndef HAVE_OLD_CPP
+# 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