[Bf-blender-cvs] [89b1f04] master: Cycles: Fix compilation error on Windows

Sergey Sharybin noreply at git.blender.org
Sat Feb 13 13:29:45 CET 2016


Commit: 89b1f042cf2c9f3152a00a7509820ffec89deb56
Author: Sergey Sharybin
Date:   Sat Feb 13 13:28:51 2016 +0100
Branches: master
https://developer.blender.org/rB89b1f042cf2c9f3152a00a7509820ffec89deb56

Cycles: Fix compilation error on Windows

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

M	intern/cycles/util/util_guarded_allocator.h

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

diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h
index 91345e2..484aa3a 100644
--- a/intern/cycles/util/util_guarded_allocator.h
+++ b/intern/cycles/util/util_guarded_allocator.h
@@ -120,6 +120,9 @@ public:
 
 	template <class U>
 	GuardedAllocator& operator=(const GuardedAllocator<U>&) { return *this; }
+
+	inline bool operator==(GuardedAllocator const& /*other*/) { return true; }
+	inline bool operator!=(GuardedAllocator const& other) { return !operator==(other); }
 };
 
 /* Get memory usage and peak from the guarded STL allocator. */




More information about the Bf-blender-cvs mailing list