tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Windows build fix" 

This reverts commit f06f6d4d86.
This commit is contained in:
Gunnar Beutner 2016-02-09 13:54:19 +01:00
parent 90e241ca85
commit 9e7da9837e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/base/object.hpp
View File

@ -117,11 +117,7 @@ private:
Object(const Object& other); Object(const Object& other);
Object& operator=(const Object& rhs); Object& operator=(const Object& rhs);
# ifndef _WIN32
intptr_t m_References; intptr_t m_References;
# else /* _WIN32 */
uintptr_t m_References;
# endif /* _WIN32 */
mutable uintptr_t m_Mutex; mutable uintptr_t m_Mutex;
#ifdef I2_DEBUG #ifdef I2_DEBUG
@ -157,10 +153,11 @@ inline void intrusive_ptr_add_ref(Object *object)
inline void intrusive_ptr_release(Object *object) inline void intrusive_ptr_release(Object *object)
{ {
intptr_t refs;
#ifdef _WIN32 #ifdef _WIN32
uintptr_t refs = InterlockedDecrement(&object->m_References); refs = InterlockedDecrement(&object->m_References);
#else /* _WIN32 */ #else /* _WIN32 */
intptr_t refs = __sync_sub_and_fetch(&object->m_References, 1); refs = __sync_sub_and_fetch(&object->m_References, 1);
#endif /* _WIN32 */ #endif /* _WIN32 */
ASSERT(refs >= 0); ASSERT(refs >= 0);