diff options
| author | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-11-13 18:12:10 +0100 |
| commit | 062d8af12f2bcad39c47b42295b69f44f878768f (patch) | |
| tree | a455fb5dd1a3c01ca3fa6e2ddd5e368040e32eaa /decoder/decoder.cc | |
| parent | b8bf706976720527b455eb665fe94f907e372b65 (diff) | |
| parent | f83186887c94b2ff8b17aefcd0b395f116c09eb6 (diff) | |
merge w/ upstream
Diffstat (limited to 'decoder/decoder.cc')
| -rw-r--r-- | decoder/decoder.cc | 10 |
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) { |