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/grammar.cc | |
| parent | 074fa88375967adababc632ea763e9dea389831e (diff) | |
guard against direct includes of tr1
Diffstat (limited to 'decoder/grammar.cc')
| -rw-r--r-- | decoder/grammar.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/decoder/grammar.cc b/decoder/grammar.cc index ee43f537..f2530d35 100644 --- a/decoder/grammar.cc +++ b/decoder/grammar.cc @@ -3,15 +3,20 @@ #include <algorithm> #include <utility> #include <map> -#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 "rule_lexer.h" #include "filelib.h" #include "tdict.h" using namespace std; -using namespace std::tr1; const vector<TRulePtr> Grammar::NO_RULES; |