From f06f6d4d86bf221b83520e61833e272c0b1e694f Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 4 Feb 2016 23:15:48 +0100 Subject: [PATCH] Windows build fix fixes #11096 --- lib/base/object.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/base/object.hpp b/lib/base/object.hpp index 26a4a31fa..8f7a7f4b3 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -117,7 +117,11 @@ private: Object(const Object& other); Object& operator=(const Object& rhs); +# ifndef _WIN32 intptr_t m_References; +# else /* _WIN32 */ + uintptr_t m_References; +# endif /* _WIN32 */ mutable uintptr_t m_Mutex; #ifdef I2_DEBUG @@ -153,11 +157,10 @@ inline void intrusive_ptr_add_ref(Object *object) inline void intrusive_ptr_release(Object *object) { - intptr_t refs; #ifdef _WIN32 - refs = InterlockedDecrement(&object->m_References); + uintptr_t refs = InterlockedDecrement(&object->m_References); #else /* _WIN32 */ - refs = __sync_sub_and_fetch(&object->m_References, 1); + intptr_t refs = __sync_sub_and_fetch(&object->m_References, 1); #endif /* _WIN32 */ ASSERT(refs >= 0); -- 2.40.0