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

express: Fully qualify std::nullptr_t

Browse Source
This commit is contained in:
Sam Edwards 2018-06-03 16:56:44 -06:00
parent 5e82671084
commit f0fc6e6d56
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ operator >= (To *other) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator == (nullptr_t) const { operator == (std::nullptr_t) const {
return _void_ptr == nullptr; return _void_ptr == nullptr;
} }
@ -306,7 +306,7 @@ operator == (nullptr_t) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator != (nullptr_t) const { operator != (std::nullptr_t) const {
return _void_ptr != nullptr; return _void_ptr != nullptr;
} }
@ -315,7 +315,7 @@ operator != (nullptr_t) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator > (nullptr_t) const { operator > (std::nullptr_t) const {
return _void_ptr != nullptr; return _void_ptr != nullptr;
} }
@ -324,7 +324,7 @@ operator > (nullptr_t) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator <= (nullptr_t) const { operator <= (std::nullptr_t) const {
return _void_ptr == nullptr; return _void_ptr == nullptr;
} }
@ -333,7 +333,7 @@ operator <= (nullptr_t) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator >= (nullptr_t) const { operator >= (std::nullptr_t) const {
return true; return true;
} }
@ -442,7 +442,7 @@ operator < (const To *other) const {
*/ */
template<class T> template<class T>
INLINE bool WeakPointerToBase<T>:: INLINE bool WeakPointerToBase<T>::
operator < (nullptr_t) const { operator < (std::nullptr_t) const {
return false; return false;
} }

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

@ -60,11 +60,11 @@ public:
INLINE bool operator <= (To *other) const; INLINE bool operator <= (To *other) const;
INLINE bool operator >= (To *other) const; INLINE bool operator >= (To *other) const;
INLINE bool operator == (nullptr_t) const; INLINE bool operator == (std::nullptr_t) const;
INLINE bool operator != (nullptr_t) const; INLINE bool operator != (std::nullptr_t) const;
INLINE bool operator > (nullptr_t) const; INLINE bool operator > (std::nullptr_t) const;
INLINE bool operator <= (nullptr_t) const; INLINE bool operator <= (std::nullptr_t) const;
INLINE bool operator >= (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;
INLINE bool operator != (const WeakPointerToBase<To> &other) const; INLINE bool operator != (const WeakPointerToBase<To> &other) const;
@ -79,7 +79,7 @@ public:
INLINE bool operator >= (const PointerToBase<To> &other) const; INLINE bool operator >= (const PointerToBase<To> &other) const;
#endif // WIN32_VC #endif // WIN32_VC
INLINE bool operator < (const To *other) const; INLINE bool operator < (const To *other) const;
INLINE bool operator < (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;
INLINE bool operator < (const PointerToBase<To> &other) const; INLINE bool operator < (const PointerToBase<To> &other) const;
#endif // CPPPARSER #endif // CPPPARSER