summaryrefslogtreecommitdiff
path: root/extools/extract.cc
diff options
context:
space:
mode:
authorChris Dyer <cdyer@cs.cmu.edu>2012-03-20 15:37:54 -0400
committerChris Dyer <cdyer@cs.cmu.edu>2012-03-20 15:37:54 -0400
commit34b4752a1eefc002166e95782c2c52747bb08b3a (patch)
tree0045687d1de1d539cd232ba4e71940e9baee72c0 /extools/extract.cc
parent0b598b997a7c1d2d9dc255cc2ff1bf9bb2c425a1 (diff)
make c++11 compatible
Diffstat (limited to 'extools/extract.cc')
-rw-r--r--extools/extract.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/extools/extract.cc b/extools/extract.cc
index f6c121b4..49542fed 100644
--- a/extools/extract.cc
+++ b/extools/extract.cc
@@ -131,16 +131,16 @@ lookup_and_append(const map<K, V> &dict, const K &key, V &output)
// phrases if there is more than one annotation.
// TODO: support source annotation
void Extract::AnnotatePhrasesWithCategoryTypes(const WordID default_cat,
- const map< tuple<short,short,short,short>, vector<WordID> > &types,
+ const map< boost::tuple<short,short,short,short>, vector<WordID> > &types,
vector<ParallelSpan>* phrases) {
const int num_unannotated_phrases = phrases->size();
// have to use num_unannotated_phrases since we may grow the vector
for (int i = 0; i < num_unannotated_phrases; ++i) {
ParallelSpan& phrase = (*phrases)[i];
vector<WordID> cats;
- lookup_and_append(types, make_tuple(phrase.i1, phrase.i2, phrase.j1, phrase.j2), cats);
- lookup_and_append(types, make_tuple((short)-1, (short)-1, phrase.j1, phrase.j2), cats);
- lookup_and_append(types, make_tuple(phrase.i1, phrase.i2, (short)-1, (short)-1), cats);
+ lookup_and_append(types, boost::make_tuple(phrase.i1, phrase.i2, phrase.j1, phrase.j2), cats);
+ lookup_and_append(types, boost::make_tuple((short)-1, (short)-1, phrase.j1, phrase.j2), cats);
+ lookup_and_append(types, boost::make_tuple(phrase.i1, phrase.i2, (short)-1, (short)-1), cats);
if (cats.empty() && default_cat != 0) {
cats = vector<WordID>(1, default_cat);
}