diff options
| -rw-r--r-- | decoder/ff_csplit.cc | 8 | ||||
| -rw-r--r-- | decoder/ff_source_syntax.cc | 7 | ||||
| -rw-r--r-- | decoder/ff_source_syntax2.cc | 1 | ||||
| -rw-r--r-- | decoder/scfg_translator.cc | 1 | ||||
| -rw-r--r-- | decoder/tree2string_translator.cc | 1 |
5 files changed, 6 insertions, 12 deletions
diff --git a/decoder/ff_csplit.cc b/decoder/ff_csplit.cc index a0e538d3..550ff69a 100644 --- a/decoder/ff_csplit.cc +++ b/decoder/ff_csplit.cc @@ -2,6 +2,8 @@ #include <set> #include <cstring> +#include <unordered_set> +#include <unordered_map> #include "klm/lm/model.hh" @@ -14,12 +16,6 @@ #include "stringlib.h" #include "tdict.h" -#ifndef HAVE_OLD_CPP -# include <unordered_set> -#else -# include <tr1/unordered_set> -namespace std { using std::tr1::unordered_set; } -#endif using namespace std; struct BasicCSplitFeaturesImpl { diff --git a/decoder/ff_source_syntax.cc b/decoder/ff_source_syntax.cc index 6b183863..f6f673d2 100644 --- a/decoder/ff_source_syntax.cc +++ b/decoder/ff_source_syntax.cc @@ -2,12 +2,7 @@ #include <sstream> #include <stack> -#ifndef HAVE_OLD_CPP -# include <unordered_set> -#else -# include <tr1/unordered_set> -namespace std { using std::tr1::unordered_set; } -#endif +#include <unordered_set> #include "sentence_metadata.h" #include "array2d.h" diff --git a/decoder/ff_source_syntax2.cc b/decoder/ff_source_syntax2.cc index a97e31d8..48991920 100644 --- a/decoder/ff_source_syntax2.cc +++ b/decoder/ff_source_syntax2.cc @@ -3,6 +3,7 @@ #include <sstream> #include <stack> #include <string> +#include <unordered_set> #include "sentence_metadata.h" #include "array2d.h" diff --git a/decoder/scfg_translator.cc b/decoder/scfg_translator.cc index c3cfcaad..83b65c28 100644 --- a/decoder/scfg_translator.cc +++ b/decoder/scfg_translator.cc @@ -1,5 +1,6 @@ #include <algorithm> #include <vector> +#include <unordered_set> #include <boost/foreach.hpp> #include <boost/functional/hash.hpp> #include "fast_lexical_cast.hpp" diff --git a/decoder/tree2string_translator.cc b/decoder/tree2string_translator.cc index adc8dc89..bd3b01d0 100644 --- a/decoder/tree2string_translator.cc +++ b/decoder/tree2string_translator.cc @@ -2,6 +2,7 @@ #include <vector> #include <queue> #include <map> +#include <unordered_map> #include <unordered_set> #include <boost/shared_ptr.hpp> #include <boost/functional/hash.hpp> |