about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorHristina Palikareva <h.palikareva@imperial.ac.uk>2014-12-02 18:48:51 +0000
committerDan Liew <daniel.liew@imperial.ac.uk>2014-12-02 18:57:05 +0000
commitd0f8c9ee4140689043ff5857f5283f6b0d22cbdc (patch)
treeaf7ffaa3de764a01b29180ed3ba359f33181f920
parent46abe43b291d8386666062e18faa72cee354b04c (diff)
downloadklee-d0f8c9ee4140689043ff5857f5283f6b0d22cbdc.tar.gz
Unbreak compilation (in metaSMT configuration) by preventing the #define
unordered_map and unordered_set from leaking out into other compilation
units. This should be removed entirely when C++11 support lands.
-rw-r--r--include/klee/util/ArrayExprHash.h3
-rw-r--r--include/klee/util/ExprHashMap.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/include/klee/util/ArrayExprHash.h b/include/klee/util/ArrayExprHash.h
index 646ffd0c..da3b1d2b 100644
--- a/include/klee/util/ArrayExprHash.h
+++ b/include/klee/util/ArrayExprHash.h
@@ -140,4 +140,7 @@ void ArrayExprHash<T>::hashUpdateNodeExpr(const UpdateNode* un, T& exp)
 
 }
 
+#undef unordered_map
+#undef unordered_set
+
 #endif
diff --git a/include/klee/util/ExprHashMap.h b/include/klee/util/ExprHashMap.h
index 867ad001..88086e7c 100644
--- a/include/klee/util/ExprHashMap.h
+++ b/include/klee/util/ExprHashMap.h
@@ -56,4 +56,7 @@ namespace klee {
 
 }
 
+#undef unordered_map
+#undef unordered_set
+
 #endif