[Bf-blender-cvs] [61c6cae] openvdb: A more sensible hash function for pthreads on Windows.

Kévin Dietrich noreply at git.blender.org
Sun Jan 31 13:21:31 CET 2016


Commit: 61c6cae79e0df6f4513dda9a4a7917f46722e99c
Author: Kévin Dietrich
Date:   Sun Jan 31 13:21:12 2016 +0100
Branches: openvdb
https://developer.blender.org/rB61c6cae79e0df6f4513dda9a4a7917f46722e99c

A more sensible hash function for pthreads on Windows.

===================================================================

M	intern/cycles/util/util_volume.h

===================================================================

diff --git a/intern/cycles/util/util_volume.h b/intern/cycles/util/util_volume.h
index 736c4cb..4a6aafe 100644
--- a/intern/cycles/util/util_volume.h
+++ b/intern/cycles/util/util_volume.h
@@ -81,7 +81,7 @@ template<>
 struct hash<pthread_t> {
 	size_t operator()(const pthread_t &pt) const
 	{
-		return static_cast<size_t>(pt.p);
+		return std::hash<void *>()(pt.p) ^ (std::hash<unsigned int>()(pt.x) << 1);
 	}
 };




More information about the Bf-blender-cvs mailing list