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 | 072c4bb1edde483b87b93bc6f4eec36fc8a21008 (patch) | |
| tree | 6ceaa6ae1e08df9e523282740b14f4857236297c /word-aligner/fast_align.cc | |
| parent | 7e90b8ea10904f9b83f4e77e14c7396a3e6f7d5d (diff) | |
| parent | 9e80389b9763aa4f7f626ec71b561ccf6948d3ad (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"); |