diff options
| author | Chris Dyer <cdyer@Chriss-MacBook-Air.local> | 2013-11-10 00:58:44 -0500 |
|---|---|---|
| committer | Chris Dyer <cdyer@Chriss-MacBook-Air.local> | 2013-11-10 00:58:44 -0500 |
| commit | 2d3948b98bb9e8c7bad60f1acd99ff0b42b3ae30 (patch) | |
| tree | 22cd235bd6c94ee25c1ab9b2cf2a2d1d9aaec5c5 /decoder/ff_wordalign.cc | |
| parent | 074fa88375967adababc632ea763e9dea389831e (diff) | |
guard against direct includes of tr1
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..8ed053c2 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> +#ifdef HAVE_CXX11 +# 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; |