Set incomplete if not applying ho extensionality (#6281)

[cvc5.git] / src / util / hash.h

diff --git a/src/util/hash.h b/src/util/hash.h
index 0cdc96fcb94c0dbb83ac9a2094cb2deb980c9d6a..6ba4534d1b6e975888e736071e2e75bda4fda242 100644 (file)
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -1,13 +1,13 @@
 /*********************                                                        */
 /*! \file hash.h
  ** \verbatim
- ** Original author: Christopher L. Conway
- ** Major contributors: Morgan Deters
- ** Minor contributors (to current version): Dejan Jovanovic
+ ** Top contributors (to current version):
+ **   Morgan Deters, Andres Noetzli, Mathias Preiner
  ** This file is part of the CVC4 project.
- ** Copyright (c) 2009-2013  New York University and The University of Iowa
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
+ ** Copyright (c) 2009-2021 by the authors listed in the file AUTHORS
+ ** in the top-level source directory and their institutional affiliations.
+ ** All rights reserved.  See the file COPYING in the top-level source
+ ** directory for licensing information.\endverbatim
  **
  ** \brief [[ Add one-line brief description here ]]
  **
@@ -17,16 +17,13 @@
 
 #include "cvc4_public.h"
 
-#ifndef __CVC4__HASH_H
-#define __CVC4__HASH_H
+#ifndef CVC4__HASH_H
+#define CVC4__HASH_H
 
-// in case it's not been declared as a namespace yet
-namespace __gnu_cxx {}
+#include <functional>
+#include <string>
 
-#include <ext/hash_map>
-#include <ext/hash_set>
-
-namespace __gnu_cxx {
+namespace std {
 
 #ifdef CVC4_NEED_HASH_UINT64_T
 // on some versions and architectures of GNU C++, we need a
@@ -39,26 +36,34 @@ struct hash<uint64_t> {
 };/* struct hash<uint64_t> */
 #endif /* CVC4_NEED_HASH_UINT64_T */
 
-}/* __gnu_cxx namespace */
+}/* std namespace */
 
-// hackish: treat hash stuff as if it were in std namespace
-namespace std { using namespace __gnu_cxx; }
+namespace cvc5 {
 
-namespace CVC4 {
+namespace fnv1a {
 
-struct StringHashFunction {
-  size_t operator()(const std::string& str) const {
-    return __gnu_cxx::hash<const char*>()(str.c_str());
-  }
-};/* struct StringHashFunction */
+/**
+ * FNV-1a hash algorithm for 64-bit numbers.
+ *
+ * More details here: http://www.isthe.com/chongo/tech/comp/fnv/index.html
+ */
+inline uint64_t fnv1a_64(uint64_t v, uint64_t hash = 14695981039346656037U) {
+  hash ^= v;
+  // Compute (hash * 1099511628211)
+  return hash + (hash << 1) + (hash << 4) + (hash << 5) + (hash << 7) +
+         (hash << 8) + (hash << 40);
+}
+
+}  // namespace fnv1a
 
 template <class T, class U, class HashT = std::hash<T>, class HashU = std::hash<U> >
 struct PairHashFunction {
   size_t operator()(const std::pair<T, U>& pr) const {
-    return HashT()(pr.first) ^ HashU()(pr.second);
+    uint64_t hash = fnv1a::fnv1a_64(HashT()(pr.first));
+    return static_cast<size_t>(fnv1a::fnv1a_64(HashU()(pr.second), hash));
   }
 };/* struct PairHashFunction */
 
-}/* CVC4 namespace */
+}  // namespace cvc5
 
-#endif /* __CVC4__HASH_H */
+#endif /* CVC4__HASH_H */