fix src/util/hash.h to specialize GNU's hash template for <uint64_t> on platforms that need it; fixes Mac builds.

2 files changed, 8 insertions, 7 deletions

diff --git a/src/expr/pickler.h b/src/expr/pickler.h
index 264ae0e4b..6e79d6997 100644
--- a/src/expr/pickler.h
+++ b/src/expr/pickler.h
@@ -50,7 +50,7 @@ public:
   Pickle();
   Pickle(const Pickle& p);
   ~Pickle();
-  Pickle& operator = (const Pickle& other);
+  Pickle& operator=(const Pickle& other);
 };/* class Pickle */
 
 class CVC4_PUBLIC PicklingException : public Exception {
@@ -116,11 +116,11 @@ public:
 protected:
 
   virtual uint64_t variableToMap(uint64_t x) const
-    throw(AssertionException, PicklingException){
+    throw(AssertionException, PicklingException) {
     VarMap::const_iterator i = d_toMap.find(x);
-    if(i != d_toMap.end()){
+    if(i != d_toMap.end()) {
       return i->second;
-    }else{
+    } else {
       throw PicklingException();
     }
   }
diff --git a/src/util/hash.h b/src/util/hash.h
index 5f0189d44..fdfbf4087 100644
--- a/src/util/hash.h
+++ b/src/util/hash.h
@@ -29,15 +29,16 @@ namespace __gnu_cxx {}
 
 namespace __gnu_cxx {
 
-#if __WORDSIZE == 32
-// on 32-bit, we need a specialization of hash for 64-bit values
+#ifdef CVC4_NEED_HASH_UINT64_T
+// on some versions and architectures of GNU C++, we need a
+// specialization of hash for 64-bit values
 template <>
 struct hash<uint64_t> {
   size_t operator()(uint64_t v) const {
     return v;
   }
 };/* struct hash<uint64_t> */
-#endif /* 32-bit */
+#endif /* CVC4_NEED_HASH_UINT64_T */
 
 }/* __gnu_cxx namespace */