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/maxtrans_blunsom.cc | |
| parent | b8bf706976720527b455eb665fe94f907e372b65 (diff) | |
| parent | f83186887c94b2ff8b17aefcd0b395f116c09eb6 (diff) | |
merge w/ upstream
Diffstat (limited to 'decoder/maxtrans_blunsom.cc')
| -rw-r--r-- | decoder/maxtrans_blunsom.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/decoder/maxtrans_blunsom.cc b/decoder/maxtrans_blunsom.cc index 774e4170..a9f65fab 100644 --- a/decoder/maxtrans_blunsom.cc +++ b/decoder/maxtrans_blunsom.cc @@ -2,8 +2,14 @@ #include <vector> #include <algorithm> -#include <tr1/unordered_map> -#include <tr1/unordered_set> +#ifndef HAVE_OLD_CPP +# include <unordered_map> +# include <unordered_set> +#else +# include <tr1/unordered_map> +# include <tr1/unordered_set> +namespace std { using std::tr1::unordered_map; using std::tr1::unordered_set; } +#endif #include <boost/tuple/tuple.hpp> #include <boost/functional/hash.hpp> @@ -14,7 +20,6 @@ using boost::tuple; using namespace std; -using namespace std::tr1; namespace Hack { |