diff options
author | Tim King <taking@cs.nyu.edu> | 2018-02-05 12:38:13 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-05 12:38:13 -0800 |
commit | b458d1768202f7f9e117693b83985794665f73e2 (patch) | |
tree | 75e472b45a247d31ec5fe2628fd4e619744a60b2 | |
parent | 5035105b8d3ca8d260581581ca2beccf9ead3354 (diff) |
Removing references to __gnu_cxx. (#1541)
-rw-r--r-- | src/context/cdhashset_forward.h | 18 | ||||
-rw-r--r-- | src/context/cdinsert_hashmap_forward.h | 18 | ||||
-rw-r--r-- | src/context/cdlist_forward.h | 4 |
3 files changed, 15 insertions, 25 deletions
diff --git a/src/context/cdhashset_forward.h b/src/context/cdhashset_forward.h index ed665ce1b..426f8917d 100644 --- a/src/context/cdhashset_forward.h +++ b/src/context/cdhashset_forward.h @@ -26,19 +26,13 @@ #ifndef __CVC4__CONTEXT__CDSET_FORWARD_H #define __CVC4__CONTEXT__CDSET_FORWARD_H -/// \cond internals - -namespace __gnu_cxx { - template <class Key> struct hash; -}/* __gnu_cxx namespace */ +#include <functional> namespace CVC4 { - namespace context { - template <class V, class HashFcn = __gnu_cxx::hash<V> > - class CDHashSet; - }/* CVC4::context namespace */ -}/* CVC4 namespace */ - -/// \endcond +namespace context { +template <class V, class HashFcn = std::hash<V> > +class CDHashSet; +} // namespace context +} // namespace CVC4 #endif /* __CVC4__CONTEXT__CDSET_FORWARD_H */ diff --git a/src/context/cdinsert_hashmap_forward.h b/src/context/cdinsert_hashmap_forward.h index 05501f1a2..d3f46791a 100644 --- a/src/context/cdinsert_hashmap_forward.h +++ b/src/context/cdinsert_hashmap_forward.h @@ -23,16 +23,16 @@ #include "cvc4_public.h" -#pragma once +#ifndef __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H +#define __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H -namespace __gnu_cxx { - template <class Key> struct hash; -}/* __gnu_cxx namespace */ +#include <functional> namespace CVC4 { - namespace context { - template <class Key, class Data, class HashFcn = __gnu_cxx::hash<Key> > - class CDInsertHashMap; - }/* CVC4::context namespace */ -}/* CVC4 namespace */ +namespace context { +template <class Key, class Data, class HashFcn = std::hash<Key> > +class CDInsertHashMap; +} // namespace context +} // namespace CVC4 +#endif /* __CVC4__CONTEXT__CDINSERT_HASHMAP_FORWARD_H */ diff --git a/src/context/cdlist_forward.h b/src/context/cdlist_forward.h index 49a077349..e599c037c 100644 --- a/src/context/cdlist_forward.h +++ b/src/context/cdlist_forward.h @@ -36,10 +36,6 @@ /// \cond internals -namespace __gnu_cxx { - template <class Key> struct hash; -}/* __gnu_cxx namespace */ - namespace CVC4 { namespace context { |