diff options
| author | Patrick Simianer <p@simianer.de> | 2014-10-13 19:03:48 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2014-10-13 19:03:48 +0100 |
| commit | cb9fb7088dde35881516c088db402abe747d49fa (patch) | |
| tree | a91e4935a7941f1b261f76d88ab41fa3078a1891 /decoder/ff_csplit.cc | |
| parent | 0a00e57e921c8eca8e02364db7d2e6607bfdcebc (diff) | |
| parent | b1ed81ef3216b212295afa76c5d20a56fb647204 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'decoder/ff_csplit.cc')
| -rw-r--r-- | decoder/ff_csplit.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/decoder/ff_csplit.cc b/decoder/ff_csplit.cc index a0e538d3..550ff69a 100644 --- a/decoder/ff_csplit.cc +++ b/decoder/ff_csplit.cc @@ -2,6 +2,8 @@ #include <set> #include <cstring> +#include <unordered_set> +#include <unordered_map> #include "klm/lm/model.hh" @@ -14,12 +16,6 @@ #include "stringlib.h" #include "tdict.h" -#ifndef HAVE_OLD_CPP -# include <unordered_set> -#else -# include <tr1/unordered_set> -namespace std { using std::tr1::unordered_set; } -#endif using namespace std; struct BasicCSplitFeaturesImpl { |