]> granicus.if.org Git - icinga2/commitdiff
Windows build fix
authorMichael Friedrich <michael.friedrich@netways.de>
Thu, 4 Feb 2016 22:15:48 +0000 (23:15 +0100)
committerMichael Friedrich <michael.friedrich@netways.de>
Fri, 5 Feb 2016 09:55:16 +0000 (10:55 +0100)
fixes #11096

lib/base/object.hpp

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