diff options
| author | Paul Baltescu <pauldb89@gmail.com> | 2013-11-23 17:33:47 +0000 |
|---|---|---|
| committer | Paul Baltescu <pauldb89@gmail.com> | 2013-11-23 17:33:47 +0000 |
| commit | cc6313b23cac25eb05976b6cf64f96faf1ed4163 (patch) | |
| tree | 3dc28060ad25b43773e875bea7388ab1cefcd927 /word-aligner/fast_align.cc | |
| parent | 7990c750829af93f0a1e0fc14534582f52ee9e8c (diff) | |
| parent | f2fb69b10a897e8beb4e6e6d6cbb4327096235ef (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'word-aligner/fast_align.cc')
| -rw-r--r-- | word-aligner/fast_align.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/word-aligner/fast_align.cc b/word-aligner/fast_align.cc index fddcba9c..f54233eb 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> +#ifndef HAVE_OLD_CPP +# 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"); |