diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-15 16:31:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-15 16:33:36 +0300 |
| commit | 06743f4018b244769a4366a3dd9e5581713f8679 (patch) | |
| tree | 2dc3370ef162d72abfa28391f18517c91b22faeb | |
| parent | 3e6b7d0fd874789c13aa53a62932d94cbb36163b (diff) | |
Cycles: Make guarded allocator compatible with MSVC2015
| -rw-r--r-- | intern/cycles/util/util_guarded_allocator.h | 4 |
1 files 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. |