From cc364493808ba1453d6ea84124f16ace0e975194 Mon Sep 17 00:00:00 2001
From: Daniel Dunbar <daniel@zuster.org>
Date: Fri, 12 Sep 2014 14:08:26 -0700
Subject: When building against libc++ (vs libstdcxx), use standard
 unordered_{map,set} includes.

 - I'm not sure what the status of libstdcxx's c++11 support is. It may be we
   can just move over to <unordered_map> everywhere, but I don't have a Linux
   test machine handy at the moment.
---
 lib/Solver/CachingSolver.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib/Solver')

diff --git a/lib/Solver/CachingSolver.cpp b/lib/Solver/CachingSolver.cpp
index 674d4627..cfe08a96 100644
--- a/lib/Solver/CachingSolver.cpp
+++ b/lib/Solver/CachingSolver.cpp
@@ -17,7 +17,14 @@
 
 #include "SolverStats.h"
 
+#include <ciso646>
+#ifdef _LIBCPP_VERSION
+#include <unordered_map>
+#define unordered_map std::unordered_map
+#else
 #include <tr1/unordered_map>
+#define unordered_map std::tr1::unordered_map
+#endif
 
 using namespace klee;
 
@@ -59,9 +66,9 @@ private:
     }
   };
 
-  typedef std::tr1::unordered_map<CacheEntry, 
-                                  IncompleteSolver::PartialValidity, 
-                                  CacheEntryHash> cache_map;
+  typedef unordered_map<CacheEntry, 
+                        IncompleteSolver::PartialValidity, 
+                        CacheEntryHash> cache_map;
   
   Solver *solver;
   cache_map cache;
-- 
cgit 1.4.1