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/apply_models.cc | |
| parent | 074fa88375967adababc632ea763e9dea389831e (diff) | |
guard against direct includes of tr1
Diffstat (limited to 'decoder/apply_models.cc')
| -rw-r--r-- | decoder/apply_models.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/decoder/apply_models.cc b/decoder/apply_models.cc index 330de9e2..2e093d6a 100644 --- a/decoder/apply_models.cc +++ b/decoder/apply_models.cc @@ -8,8 +8,14 @@ #include <vector> #include <algorithm> -#include <tr1/unordered_map> -#include <tr1/unordered_set> +#ifdef HAVE_CXX11 +# include <unordered_map> +# include <unordered_set> +#else +# include <tr1/unordered_map> +# include <tr1/unordered_set> +namespace std { using std::tr1::unordered_map; using std::tr1::unordered_set; } +#endif #include <boost/functional/hash.hpp> @@ -23,7 +29,6 @@ #define FAST_CP_2 3 using namespace std; -using namespace std::tr1; struct Candidate; typedef SmallVectorInt JVector; |