summaryrefslogtreecommitdiff
path: root/decoder/decoder.cc
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2013-11-13 18:12:10 +0100
committerPatrick Simianer <p@simianer.de>2013-11-13 18:12:10 +0100
commitd6e6babf2cfe49fed040b651624b7e34d1a9b507 (patch)
tree2a00ab18f10a7f93e7e172551c01b48cc9f20b8c /decoder/decoder.cc
parent2d2d5eced93d58bc77894d8c328195cd9950b96d (diff)
parent8a24bb77bc2e9fd17a6f6529a2942cde96a6af49 (diff)
merge w/ upstream
Diffstat (limited to 'decoder/decoder.cc')
-rw-r--r--decoder/decoder.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/decoder/decoder.cc b/decoder/decoder.cc
index 31e6dc46..da65713a 100644
--- a/decoder/decoder.cc
+++ b/decoder/decoder.cc
@@ -1,6 +1,11 @@
#include "decoder.h"
-#include <tr1/unordered_map>
+#ifndef HAVE_OLD_CPP
+# include <unordered_map>
+#else
+# include <tr1/unordered_map>
+namespace std { using std::tr1::unordered_map; }
+#endif
#include <boost/program_options.hpp>
#include <boost/program_options/variables_map.hpp>
#include <boost/make_shared.hpp>
@@ -61,7 +66,6 @@
static const double kMINUS_EPSILON = -1e-6; // don't be too strict
using namespace std;
-using namespace std::tr1;
namespace po = boost::program_options;
static bool verbose_feature_functions=true;
@@ -90,7 +94,7 @@ struct ELengthWeightFunction {
}
};
inline void ShowBanner() {
- cerr << "cdec v1.0 (c) 2009-2011 by Chris Dyer\n";
+ cerr << "cdec (c) 2009--2013 by Chris Dyer\n";
}
inline string str(char const* name,po::variables_map const& conf) {