From 1e9afb904a57ff0b03edd0e94d634ef98e7d4b2a Mon Sep 17 00:00:00 2001
From: Chris Dyer <cdyer@allegro.clab.cs.cmu.edu>
Date: Sun, 10 Nov 2013 01:46:28 -0500
Subject: fix for c++11

---
 decoder/apply_models.cc           | 2 +-
 decoder/decoder.cc                | 2 +-
 decoder/earley_composer.cc        | 2 +-
 decoder/ff_source_syntax.cc       | 2 +-
 decoder/ff_source_syntax2_p.cc    | 2 +-
 decoder/ff_source_syntax_p.cc     | 2 +-
 decoder/ff_wordalign.cc           | 2 +-
 decoder/ff_wordalign.h            | 2 +-
 decoder/ff_wordset.h              | 2 +-
 decoder/grammar.cc                | 2 +-
 decoder/hg_intersect.cc           | 2 +-
 decoder/kbest.h                   | 2 +-
 decoder/maxtrans_blunsom.cc       | 2 +-
 decoder/phrasebased_translator.cc | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'decoder')

diff --git a/decoder/apply_models.cc b/decoder/apply_models.cc
index 2e093d6a..4cd8b36f 100644
--- a/decoder/apply_models.cc
+++ b/decoder/apply_models.cc
@@ -8,7 +8,7 @@
 
 #include <vector>
 #include <algorithm>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 # include <unordered_set>
 #else
diff --git a/decoder/decoder.cc b/decoder/decoder.cc
index 2c0e07b7..da65713a 100644
--- a/decoder/decoder.cc
+++ b/decoder/decoder.cc
@@ -1,6 +1,6 @@
 #include "decoder.h"
 
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 #else
 # include <tr1/unordered_map>
diff --git a/decoder/earley_composer.cc b/decoder/earley_composer.cc
index 32c387d3..d47a6969 100644
--- a/decoder/earley_composer.cc
+++ b/decoder/earley_composer.cc
@@ -4,7 +4,7 @@
 #include <fstream>
 #include <map>
 #include <queue>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 # include <unordered_set>
 #else
diff --git a/decoder/ff_source_syntax.cc b/decoder/ff_source_syntax.cc
index 95709076..88f6714c 100644
--- a/decoder/ff_source_syntax.cc
+++ b/decoder/ff_source_syntax.cc
@@ -2,7 +2,7 @@
 
 #include <sstream>
 #include <stack>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_set>
 #else
 # include <tr1/unordered_set>
diff --git a/decoder/ff_source_syntax2_p.cc b/decoder/ff_source_syntax2_p.cc
index 130144fa..6a2ae742 100644
--- a/decoder/ff_source_syntax2_p.cc
+++ b/decoder/ff_source_syntax2_p.cc
@@ -3,7 +3,7 @@
 #include <sstream>
 #include <stack>
 #include <string>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_set>
 #else
 # include <tr1/unordered_set>
diff --git a/decoder/ff_source_syntax_p.cc b/decoder/ff_source_syntax_p.cc
index 1d3dc497..c094de59 100644
--- a/decoder/ff_source_syntax_p.cc
+++ b/decoder/ff_source_syntax_p.cc
@@ -2,7 +2,7 @@
 
 #include <sstream>
 #include <stack>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_set>
 #else
 # include <tr1/unordered_set>
diff --git a/decoder/ff_wordalign.cc b/decoder/ff_wordalign.cc
index 8ed053c2..dcb80110 100644
--- a/decoder/ff_wordalign.cc
+++ b/decoder/ff_wordalign.cc
@@ -7,7 +7,7 @@
 #include <string>
 #include <cmath>
 #include <bitset>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 #else
 # include <tr1/unordered_map>
diff --git a/decoder/ff_wordalign.h b/decoder/ff_wordalign.h
index 50f0dafa..0161f603 100644
--- a/decoder/ff_wordalign.h
+++ b/decoder/ff_wordalign.h
@@ -9,7 +9,7 @@
 #include <cassert>
 #include <boost/scoped_ptr.hpp>
 #include <boost/multi_array.hpp>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 #else
 # include <tr1/unordered_map>
diff --git a/decoder/ff_wordset.h b/decoder/ff_wordset.h
index affee2f4..e78cd2fb 100644
--- a/decoder/ff_wordset.h
+++ b/decoder/ff_wordset.h
@@ -9,7 +9,7 @@
 #include <iostream>
 #include <fstream>
 
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_set>
 #else
 # include <tr1/unordered_set>
diff --git a/decoder/grammar.cc b/decoder/grammar.cc
index f2530d35..160d00e6 100644
--- a/decoder/grammar.cc
+++ b/decoder/grammar.cc
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <utility>
 #include <map>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 # include <unordered_set>
 #else
diff --git a/decoder/hg_intersect.cc b/decoder/hg_intersect.cc
index c5f1cc91..31a9a1ce 100644
--- a/decoder/hg_intersect.cc
+++ b/decoder/hg_intersect.cc
@@ -1,7 +1,7 @@
 #include "hg_intersect.h"
 
 #include <vector>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 #else
 # include <tr1/unordered_map>
diff --git a/decoder/kbest.h b/decoder/kbest.h
index cd386aef..c7194c7e 100644
--- a/decoder/kbest.h
+++ b/decoder/kbest.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 #include <utility>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_set>
 #else
 # include <tr1/unordered_set>
diff --git a/decoder/maxtrans_blunsom.cc b/decoder/maxtrans_blunsom.cc
index 8d1d471c..a9f65fab 100644
--- a/decoder/maxtrans_blunsom.cc
+++ b/decoder/maxtrans_blunsom.cc
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include <algorithm>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 # include <unordered_set>
 #else
diff --git a/decoder/phrasebased_translator.cc b/decoder/phrasebased_translator.cc
index 321fb286..04b3e5d2 100644
--- a/decoder/phrasebased_translator.cc
+++ b/decoder/phrasebased_translator.cc
@@ -2,7 +2,7 @@
 
 #include <queue>
 #include <iostream>
-#ifdef HAVE_CXX11
+#ifndef HAVE_OLD_CPP
 # include <unordered_map>
 # include <unordered_set>
 #else
-- 
cgit v1.2.3