]> granicus.if.org Git - icinga2/commitdiff
Revert "Windows build fix"
authorGunnar Beutner <gunnar@beutner.name>
Tue, 9 Feb 2016 12:54:19 +0000 (13:54 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Tue, 9 Feb 2016 12:54:19 +0000 (13:54 +0100)
This reverts commit f06f6d4d86bf221b83520e61833e272c0b1e694f.

lib/base/object.hpp

index 8f7a7f4b35907ba15605006af617f96cdb24e113..26a4a31facf5270bb92045ff46318c7ec455e287 100644 (file)
@@ -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);