diff options
| author | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
| commit | 062d8af12f2bcad39c47b42295b69f44f878768f (patch) | |
| tree | a455fb5dd1a3c01ca3fa6e2ddd5e368040e32eaa /word-aligner/fast_align.cc | |
| parent | b8bf706976720527b455eb665fe94f907e372b65 (diff) | |
| parent | f83186887c94b2ff8b17aefcd0b395f116c09eb6 (diff) | |
merge w/ upstream
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"); |