diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2017-09-26 12:54:39 +0300 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2017-09-26 12:54:39 +0300 |
commit | 65c75ff0739ee2f88fc423ec1ad074e1b9b4a9b8 (patch) | |
tree | b54a4affcbe560b6b71ccf55c3d4a8f102b992e0 /moses2/defer/CubePruningCardinalStack | |
parent | d3c2c0bda54cd8992742953d68dc06d86284d196 (diff) |
use std::unordered_set instead of boost::unordered_set for all instances in moses2. To avoid confusionRELEASE-4.0RELEASE-4.0
Diffstat (limited to 'moses2/defer/CubePruningCardinalStack')
-rw-r--r-- | moses2/defer/CubePruningCardinalStack/Misc.h | 3 | ||||
-rw-r--r-- | moses2/defer/CubePruningCardinalStack/Search.cpp | 2 | ||||
-rw-r--r-- | moses2/defer/CubePruningCardinalStack/Stack.h | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/moses2/defer/CubePruningCardinalStack/Misc.h b/moses2/defer/CubePruningCardinalStack/Misc.h index 9f5d28f1e..d04c299d1 100644 --- a/moses2/defer/CubePruningCardinalStack/Misc.h +++ b/moses2/defer/CubePruningCardinalStack/Misc.h @@ -7,7 +7,6 @@ #pragma once #include <boost/pool/pool_alloc.hpp> #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <vector> #include <queue> #include "../../legacy/Range.h" @@ -72,7 +71,7 @@ public: QueueItemOrderer> Queue; typedef std::pair<const CubeEdge*, int> SeenPositionItem; - typedef boost::unordered_set<SeenPositionItem, + typedef std::unordered_set<SeenPositionItem, boost::hash<SeenPositionItem>, std::equal_to<SeenPositionItem> > SeenPositions; diff --git a/moses2/defer/CubePruningCardinalStack/Search.cpp b/moses2/defer/CubePruningCardinalStack/Search.cpp index 23cae74eb..6f72a53f8 100644 --- a/moses2/defer/CubePruningCardinalStack/Search.cpp +++ b/moses2/defer/CubePruningCardinalStack/Search.cpp @@ -96,7 +96,7 @@ void Search::Decode(size_t stackInd) /* cerr << "edges: "; - boost::unordered_set<const Bitmap*> uniqueBM; + std::unordered_set<const Bitmap*> uniqueBM; BOOST_FOREACH(CubeEdge *edge, edges) { uniqueBM.insert(&edge->newBitmap); //cerr << *edge << " "; diff --git a/moses2/defer/CubePruningCardinalStack/Stack.h b/moses2/defer/CubePruningCardinalStack/Stack.h index 94e987b7b..06ca54a57 100644 --- a/moses2/defer/CubePruningCardinalStack/Stack.h +++ b/moses2/defer/CubePruningCardinalStack/Stack.h @@ -6,7 +6,6 @@ */ #pragma once #include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <deque> #include "../Hypothesis.h" #include "../../TypeDef.h" @@ -29,7 +28,7 @@ typedef Vector<const Hypothesis*> Hypotheses; class Stack { protected: - typedef boost::unordered_set<const Hypothesis*, + typedef std::unordered_set<const Hypothesis*, UnorderedComparer<Hypothesis>, UnorderedComparer<Hypothesis> > _HCType; |