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 /decoder/ff_wordalign.cc | |
| parent | 7990c750829af93f0a1e0fc14534582f52ee9e8c (diff) | |
| parent | f2fb69b10a897e8beb4e6e6d6cbb4327096235ef (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'decoder/ff_wordalign.cc')
| -rw-r--r-- | decoder/ff_wordalign.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/decoder/ff_wordalign.cc b/decoder/ff_wordalign.cc index 1491819d..dcb80110 100644 --- a/decoder/ff_wordalign.cc +++ b/decoder/ff_wordalign.cc @@ -7,7 +7,12 @@ #include <string> #include <cmath> #include <bitset> -#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/tuple/tuple.hpp> #include "boost/tuple/tuple_comparison.hpp" @@ -249,7 +254,7 @@ void NewJump::FireFeature(const SentenceMetadata& smeta, if (fp1_) get<6>(key) = GetSourceWord(id, cur_src_index + 1); if (fprev_) get<7>(key) = GetSourceWord(id, prev_src_index); - static std::tr1::unordered_map<NewJumpFeatureKey, int, KeyHash> fids; + static std::unordered_map<NewJumpFeatureKey, int, KeyHash> fids; int& fid = fids[key]; if (!fid) { ostringstream os; |