summaryrefslogtreecommitdiff
path: root/decoder/ff_wordalign.h
diff options
context:
space:
mode:
authorPaul Baltescu <pauldb89@gmail.com>2013-11-23 17:33:47 +0000
committerPaul Baltescu <pauldb89@gmail.com>2013-11-23 17:33:47 +0000
commitcc6313b23cac25eb05976b6cf64f96faf1ed4163 (patch)
tree3dc28060ad25b43773e875bea7388ab1cefcd927 /decoder/ff_wordalign.h
parent7990c750829af93f0a1e0fc14534582f52ee9e8c (diff)
parentf2fb69b10a897e8beb4e6e6d6cbb4327096235ef (diff)
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'decoder/ff_wordalign.h')
-rw-r--r--decoder/ff_wordalign.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/decoder/ff_wordalign.h b/decoder/ff_wordalign.h
index ba3d0b9b..0161f603 100644
--- a/decoder/ff_wordalign.h
+++ b/decoder/ff_wordalign.h
@@ -5,8 +5,16 @@
#include "array2d.h"
#include "factored_lexicon_helper.h"
+#include <boost/functional/hash.hpp>
+#include <cassert>
#include <boost/scoped_ptr.hpp>
#include <boost/multi_array.hpp>
+#ifndef HAVE_OLD_CPP
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+namespace std { using std::tr1::unordered_map; }
+#endif
class RelativeSentencePosition : public FeatureFunction {
public:
@@ -124,9 +132,6 @@ class LexicalTranslationTrigger : public FeatureFunction {
std::vector<std::vector<WordID> > triggers_;
};
-#include <tr1/unordered_map>
-#include <boost/functional/hash.hpp>
-#include <cassert>
class BlunsomSynchronousParseHack : public FeatureFunction {
public:
BlunsomSynchronousParseHack(const std::string& param);
@@ -196,7 +201,7 @@ class BlunsomSynchronousParseHack : public FeatureFunction {
const int fid_;
mutable int cur_sent_;
- typedef std::tr1::unordered_map<std::vector<WordID>, int, boost::hash<std::vector<WordID> > > Vec2Int;
+ typedef std::unordered_map<std::vector<WordID>, int, boost::hash<std::vector<WordID> > > Vec2Int;
mutable Vec2Int cur_map_;
const std::vector<WordID> mutable * cur_ref_;
mutable std::vector<std::vector<WordID> > refs_;