summaryrefslogtreecommitdiff
path: root/util/util.h
diff options
context:
space:
mode:
Diffstat (limited to 'util/util.h')
-rw-r--r--util/util.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/util/util.h b/util/util.h
index 7dfab93..1e78aa3 100644
--- a/util/util.h
+++ b/util/util.h
@@ -32,6 +32,7 @@
#include <set>
#include <atomic>
#include <mutex> // For std::call_once
+#include <unordered_set>
// Use std names.
using std::set;
@@ -46,22 +47,7 @@ using std::stack;
using std::sort;
using std::swap;
using std::make_pair;
-
-#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(_LIBCPP_ABI_VERSION)
-
-#include <tr1/unordered_set>
-using std::tr1::unordered_set;
-
-#else
-
-#include <unordered_set>
-#if defined(_WIN32)
-using std::tr1::unordered_set;
-#else
using std::unordered_set;
-#endif
-
-#endif
#ifdef _WIN32