From 06743f4018b244769a4366a3dd9e5581713f8679 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 15 Feb 2016 18:31:13 +0500
Subject: Cycles: Make guarded allocator compatible with MSVC2015

---
 intern/cycles/util/util_guarded_allocator.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h
index ad1eb6f657f..f6004749a13 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.
-- 
cgit v1.2.3