[Bf-blender-cvs] [06743f4] master: Cycles: Make guarded allocator compatible with MSVC2015

[Sergey Sharybin]

Commit: 06743f4018b244769a4366a3dd9e5581713f8679
Author: Sergey Sharybin
Date:   Mon Feb 15 18:31:13 2016 +0500
Branches: master
https://developer.blender.org/rB06743f4018b244769a4366a3dd9e5581713f8679

Cycles: Make guarded allocator compatible with MSVC2015

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

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 ad1eb6f..f600474 100644
--- a/intern/cycles/util/util_guarded_allocator.h
+++ b/intern/cycles/util/util_guarded_allocator.h
@@ -121,8 +121,8 @@ 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); }
+	inline bool operator==(GuardedAllocator const& /*other*/) const { return true; }
+	inline bool operator!=(GuardedAllocator const& other) const { return !operator==(other); }
 
 #ifdef _MSC_VER
 	/* Welcome to the black magic here.