From 9e7da9837eabd792affd8dd46c4e97065580de22 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 9 Feb 2016 13:54:19 +0100 Subject: [PATCH] Revert "Windows build fix" This reverts commit f06f6d4d86bf221b83520e61833e272c0b1e694f. --- lib/base/object.hpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/base/object.hpp b/lib/base/object.hpp index 8f7a7f4b3..26a4a31fa 100644 --- a/lib/base/object.hpp +++ b/lib/base/object.hpp @@ -117,11 +117,7 @@ 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 @@ -157,10 +153,11 @@ inline void intrusive_ptr_add_ref(Object *object) inline void intrusive_ptr_release(Object *object) { + intptr_t refs; #ifdef _WIN32 - uintptr_t refs = InterlockedDecrement(&object->m_References); + refs = InterlockedDecrement(&object->m_References); #else /* _WIN32 */ - intptr_t refs = __sync_sub_and_fetch(&object->m_References, 1); + refs = __sync_sub_and_fetch(&object->m_References, 1); #endif /* _WIN32 */ ASSERT(refs >= 0);