diff options
| author | Tim King <taking@cs.nyu.edu> | 2017-07-20 17:04:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 17:04:30 -0700 |
| commit | 8b0659e6cd342ae40b676781b5e819d5fd2b3af7 (patch) | |
| tree | 5ac55f64d115b3e8865ce8f691f38da65fc82a94 /src/cvc4.i | |
| parent | 6d82ee2d1f84065ff4a86f688a3b671b85728f80 (diff) | |
Moving from the gnu extensions for hash maps to the c++11 hash maps
* Replacing __gnu_cxx::hash_map with std::unordered_map.
* Replacing __gnu_cxx::hash_set with std::unordered_set.
* Replacing __gnu_cxx::hash with std::hash.
* Adding missing includes.
Diffstat (limited to 'src/cvc4.i')
| -rw-r--r-- | src/cvc4.i | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cvc4.i b/src/cvc4.i index 5f90fdb7d..4768e2344 100644 --- a/src/cvc4.i +++ b/src/cvc4.i @@ -11,7 +11,7 @@ namespace std { class istream; class ostream; template <class T> class set {}; - template <class K, class V, class H> class hash_map {}; + template <class K, class V, class H> class unordered_map {}; } %{ @@ -41,7 +41,7 @@ namespace CVC4 {} using namespace CVC4; #include <cassert> -#include <ext/hash_map> +#include <unordered_map> #include <iosfwd> #include <set> #include <string> @@ -86,7 +86,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters; %template(vectorPairStringType) std::vector< std::pair< std::string, CVC4::Type > >; %template(pairStringType) std::pair< std::string, CVC4::Type >; %template(setOfType) std::set< CVC4::Type >; -%template(hashmapExpr) std::hash_map< CVC4::Expr, CVC4::Expr, CVC4::ExprHashFunction >; +%template(hashmapExpr) std::unordered_map< CVC4::Expr, CVC4::Expr, CVC4::ExprHashFunction >; // This is unfortunate, but seems to be necessary; if we leave NULL // defined, swig will expand it to "(void*) 0", and some of swig's |