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 | d6e6babf2cfe49fed040b651624b7e34d1a9b507 (patch) | |
| tree | 2a00ab18f10a7f93e7e172551c01b48cc9f20b8c /decoder/maxtrans_blunsom.cc | |
| parent | 2d2d5eced93d58bc77894d8c328195cd9950b96d (diff) | |
| parent | 8a24bb77bc2e9fd17a6f6529a2942cde96a6af49 (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 { |