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/kbest.h | |
| parent | db0dcd780abea416cfdb2b2382152dbe11c35170 (diff) | |
guard against direct includes of tr1
Diffstat (limited to 'decoder/kbest.h')
| -rw-r--r-- | decoder/kbest.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/decoder/kbest.h b/decoder/kbest.h index 44c23151..cd386aef 100644 --- a/decoder/kbest.h +++ b/decoder/kbest.h @@ -3,7 +3,12 @@ #include <vector> #include <utility> -#include <tr1/unordered_set> +#ifdef HAVE_CXX11 +# include <unordered_set> +#else +# include <tr1/unordered_set> +namespace std { using std::tr1::unordered_set; } +#endif #include <boost/shared_ptr.hpp> #include <boost/type_traits.hpp> @@ -22,7 +27,7 @@ namespace KBest { // optional, filter unique yield strings struct FilterUnique { - std::tr1::unordered_set<std::vector<WordID>, boost::hash<std::vector<WordID> > > unique; + std::unordered_set<std::vector<WordID>, boost::hash<std::vector<WordID> > > unique; bool operator()(const std::vector<WordID>& yield) { return !unique.insert(yield).second; @@ -111,7 +116,7 @@ namespace KBest { }; typedef std::vector<Derivation*> CandidateHeap; typedef std::vector<Derivation*> DerivationList; - typedef std::tr1::unordered_set< + typedef std::unordered_set< const Derivation*, DerivationUniquenessHash, DerivationUniquenessEquals> UniqueDerivationSet; struct NodeDerivationState { |