Commit: 65977350c5fe009490ed960953301cf6ddd25c41
Author: Kévin Dietrich
Date: Fri Jan 29 21:30:50 2016 +0100
Branches: openvdb
https://developer.blender.org/rB65977350c5fe009490ed960953301cf6ddd25c41
Attempt to fix compilation on windows.
===================================================================
M intern/cycles/util/util_volume.cpp
M intern/cycles/util/util_volume.h
===================================================================
diff --git a/intern/cycles/util/util_volume.cpp
b/intern/cycles/util/util_volume.cpp
index 19de461..f48b983 100644
--- a/intern/cycles/util/util_volume.cpp
+++ b/intern/cycles/util/util_volume.cpp
@@ -16,6 +16,19 @@
#include "util_volume.h"
+#if defined(HAS_CPP11_FEATURES) && defined(_MSC_VER)
+
+namespace std {
+
+bool operator==(const pthread_t &lhs, const pthread_t &rhs)
+{
+ return lhs.p == rhs.p;
+}
+
+} /* namespace std */
+
+#endif
+
CCL_NAMESPACE_BEGIN
template <typename T>
diff --git a/intern/cycles/util/util_volume.h b/intern/cycles/util/util_volume.h
index 6d7570d..736c4cb 100644
--- a/intern/cycles/util/util_volume.h
+++ b/intern/cycles/util/util_volume.h
@@ -70,8 +70,27 @@ CCL_NAMESPACE_END
#endif
#include "util_map.h"
+#include "util_thread.h"
#include "util_vector.h"
+#if defined(HAS_CPP11_FEATURES) && defined(_MSC_VER)
+
+namespace std {
+
+template<>
+struct hash<pthread_t> {
+ size_t operator()(const pthread_t &pt) const
+ {
+ return static_cast<size_t>(pt.p);
+ }
+};
+
+bool operator==(const pthread_t &lhs, const pthread_t &rhs);
+
+} /* namespace std */
+
+#endif
+
CCL_NAMESPACE_BEGIN
#if defined(HAS_CPP11_FEATURES)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
