diff options
| author | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
| commit | d6e6babf2cfe49fed040b651624b7e34d1a9b507 (patch) | |
| tree | 2a00ab18f10a7f93e7e172551c01b48cc9f20b8c /decoder/ff_source_syntax.cc | |
| parent | 2d2d5eced93d58bc77894d8c328195cd9950b96d (diff) | |
| parent | 8a24bb77bc2e9fd17a6f6529a2942cde96a6af49 (diff) | |
merge w/ upstream
Diffstat (limited to 'decoder/ff_source_syntax.cc')
| -rw-r--r-- | decoder/ff_source_syntax.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/decoder/ff_source_syntax.cc b/decoder/ff_source_syntax.cc index 4879ca1d..6b183863 100644 --- a/decoder/ff_source_syntax.cc +++ b/decoder/ff_source_syntax.cc @@ -2,7 +2,12 @@ #include <sstream> #include <stack> -#include <tr1/unordered_set> +#ifndef HAVE_OLD_CPP +# include <unordered_set> +#else +# include <tr1/unordered_set> +namespace std { using std::tr1::unordered_set; } +#endif #include "sentence_metadata.h" #include "array2d.h" @@ -145,7 +150,7 @@ struct SourceSyntaxFeaturesImpl { Array2D<WordID> src_tree; // src_tree(i,j) NT = type // mutable Array2D<int> fids_cat; // this tends to overfit baddly mutable Array2D<map<const TRule*, int> > fids_ef; // fires for fully lexicalized - tr1::unordered_set<int> feature_filter; + unordered_set<int> feature_filter; }; SourceSyntaxFeatures::SourceSyntaxFeatures(const string& param) : |