3 files changed, 40 insertions, 30 deletions
diff --git a/indra/llcommon/hbxxh.h b/indra/llcommon/hbxxh.h
index 236716722a..9c0e9cf172 100644
--- a/indra/llcommon/hbxxh.h
+++ b/indra/llcommon/hbxxh.h
@@ -96,6 +96,15 @@ public:
         }
     }
 
+    // Make this class no-copy (it would be possible, with custom copy
+    // operators, but it is not trivially copyable, because of the mState
+    // pointer): it does not really make sense to allow copying it anyway,
+    // since all we care about is the resulting digest (so you should only
+    // need and care about storing/copying the digest and not a class
+    // instance).
+    HBXXH64(const HBXXH64&) noexcept = delete;
+    HBXXH64& operator=(const HBXXH64&) noexcept = delete;
+
     ~HBXXH64();
 
     void update(const void* buffer, size_t len);
@@ -199,6 +208,15 @@ public:
         }
     }
 
+    // Make this class no-copy (it would be possible, with custom copy
+    // operators, but it is not trivially copyable, because of the mState
+    // pointer): it does not really make sense to allow copying it anyway,
+    // since all we care about is the resulting digest (so you should only
+    // need and care about storing/copying the digest and not a class
+    // instance).
+    HBXXH128(const HBXXH128&) noexcept = delete;
+    HBXXH128& operator=(const HBXXH128&) noexcept = delete;
+
     ~HBXXH128();
 
     void update(const void* buffer, size_t len);
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 8ff6c45760..aa8045e6ab 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -878,7 +878,7 @@ U32 LLUUID::getRandomSeed()
    seed[7]=(unsigned char)(pid);
    getSystemTime((uuid_time_t *)(&seed[8]));
 
-   U64 seed64 = HBXXH64((const void*)seed, 16).digest();
+   U64 seed64 = HBXXH64::digest((const void*)seed, 16);
    return U32(seed64) ^ U32(seed64 >> 32);
 }
 
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index 86a396ab06..2c36a1d222 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -119,6 +119,14 @@ public:
 	U16 getCRC16() const;
 	U32 getCRC32() const;
 
+	// Returns a 64 bits digest of the UUID, by XORing its two 64 bits long
+	// words. HB
+	inline U64 getDigest64() const
+	{
+		U64* tmp = (U64*)mData;
+		return tmp[0] ^ tmp[1];
+	}
+
 	static BOOL validate(const std::string& in_string); // Validate that the UUID string is legal.
 
 	static const LLUUID null;
@@ -165,36 +173,20 @@ public:
 	LLAssetID makeAssetID(const LLUUID& session) const;
 };
 
-// Generate a hash of an LLUUID object using the boost hash templates. 
-template <>
-struct boost::hash<LLUUID>
-{
-    typedef LLUUID argument_type;
-    typedef std::size_t result_type;
-    result_type operator()(argument_type const& s) const
-    {
-        result_type seed(0);
-
-        for (S32 i = 0; i < UUID_BYTES; ++i)
-        {
-            boost::hash_combine(seed, s.mData[i]);
-        }
-
-        return seed;
-    }
-};
-
-// Adapt boost hash to std hash
+// std::hash implementation for LLUUID
 namespace std
 {
-    template<> struct hash<LLUUID>
-    {
-        std::size_t operator()(LLUUID const& s) const noexcept
-        {
-            return boost::hash<LLUUID>()(s);
-        }
-    };
+	template<> struct hash<LLUUID>
+	{
+		inline size_t operator()(const LLUUID& id) const noexcept
+		{
+			return (size_t)id.getDigest64();
+		}
+	};
 }
-#endif
-
 
+// For use with boost containers.
+inline size_t hash_value(const LLUUID& id) noexcept
+{
+	return (size_t)id.getDigest64();
+}