Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-13 15:28:51 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-13 15:29:13 +0300
commit89b1f042cf2c9f3152a00a7509820ffec89deb56 (patch)
tree80046430a6bcf91c4ea9cc81f6dd1430de0b0b39 /intern
parent69dc0c319277480dda17d47fa3899b946b965768 (diff)
Cycles: Fix compilation error on Windows
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_guarded_allocator.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/util/util_guarded_allocator.h b/intern/cycles/util/util_guarded_allocator.h
index 91345e2b74b..484aa3a8cce 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. */