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/earley_composer.cc | |
| parent | 7990c750829af93f0a1e0fc14534582f52ee9e8c (diff) | |
| parent | f2fb69b10a897e8beb4e6e6d6cbb4327096235ef (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
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..d47a6969 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> +#ifndef HAVE_OLD_CPP +# 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 |