TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

express: enable WeakPointerToBase comparison operators on Win32

Browse Source 
I'm not sure why they were ifdeffed out, but they should certainly be available so that it is possible to compare WeakPointerTo in a thread-safe manner.
This commit is contained in:
rdb 2018-07-08 21:22:25 +02:00
parent 269d154aea
commit fb82a1c557
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/express/weakPointerToBase.I
View File

@ -202,7 +202,6 @@ update_type(To *ptr) {
} }
#ifndef CPPPARSER #ifndef CPPPARSER
#ifndef WIN32_VC
/** /**
* *
*/ */
@ -426,7 +425,6 @@ INLINE bool WeakPointerToBase<T>::
operator >= (const PointerToBase<To> &other) const { operator >= (const PointerToBase<To> &other) const {
return (To *)_void_ptr >= (To *)((WeakPointerToBase<To> *)&other)->_void_ptr; return (To *)_void_ptr >= (To *)((WeakPointerToBase<To> *)&other)->_void_ptr;
} }
#endif // WIN32_VC
/** /**
* *

3
panda/src/express/weakPointerToBase.h
View File

@ -48,7 +48,6 @@ public:
// These comparison functions are common to all things PointerTo, so they're // These comparison functions are common to all things PointerTo, so they're
// defined up here. // defined up here.
#ifndef CPPPARSER #ifndef CPPPARSER
#ifndef WIN32_VC
INLINE bool operator == (const To *other) const; INLINE bool operator == (const To *other) const;
INLINE bool operator != (const To *other) const; INLINE bool operator != (const To *other) const;
INLINE bool operator > (const To *other) const; INLINE bool operator > (const To *other) const;
@ -77,7 +76,7 @@ public:
INLINE bool operator > (const PointerToBase<To> &other) const; INLINE bool operator > (const PointerToBase<To> &other) const;
INLINE bool operator <= (const PointerToBase<To> &other) const; INLINE bool operator <= (const PointerToBase<To> &other) const;
INLINE bool operator >= (const PointerToBase<To> &other) const; INLINE bool operator >= (const PointerToBase<To> &other) const;
#endif // WIN32_VC
INLINE bool operator < (const To *other) const; INLINE bool operator < (const To *other) const;
INLINE bool operator < (std::nullptr_t) const; INLINE bool operator < (std::nullptr_t) const;
INLINE bool operator < (const WeakPointerToBase<To> &other) const; INLINE bool operator < (const WeakPointerToBase<To> &other) const;