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 | d9cc1a6986188a97e09e4c8cef46c34eee5f9cd2 (patch) | |
| tree | 662e45620fcf5b27f6a6edb5a5c105a0514e51cd /decoder/earley_composer.cc | |
| parent | db0dcd780abea416cfdb2b2382152dbe11c35170 (diff) | |
guard against direct includes of tr1
Diffstat (limited to 'decoder/earley_composer.cc')
| -rw-r--r-- | decoder/earley_composer.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/decoder/earley_composer.cc b/decoder/earley_composer.cc index efce70a6..32c387d3 100644 --- a/decoder/earley_composer.cc +++ b/decoder/earley_composer.cc @@ -4,8 +4,14 @@ #include <fstream> #include <map> #include <queue> -#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_multiset; using std::tr1::unordered_set; } +#endif #include <boost/shared_ptr.hpp> #include <boost/program_options.hpp> @@ -19,7 +25,6 @@ #include "hg_remove_eps.h" using namespace std; -using namespace std::tr1; // Define the following macro if you want to see lots of debugging output // when you run the chart parser |