diff --git a/panda/src/express/weakPointerToBase.I b/panda/src/express/weakPointerToBase.I
index 938196cc33..4b610e34fd 100644
--- a/panda/src/express/weakPointerToBase.I
+++ b/panda/src/express/weakPointerToBase.I
@@ -297,7 +297,7 @@ operator >= (To *other) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator == (nullptr_t) const {
+operator == (std::nullptr_t) const {
   return _void_ptr == nullptr;
 }
 
@@ -306,7 +306,7 @@ operator == (nullptr_t) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator != (nullptr_t) const {
+operator != (std::nullptr_t) const {
   return _void_ptr != nullptr;
 }
 
@@ -315,7 +315,7 @@ operator != (nullptr_t) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator > (nullptr_t) const {
+operator > (std::nullptr_t) const {
   return _void_ptr != nullptr;
 }
 
@@ -324,7 +324,7 @@ operator > (nullptr_t) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator <= (nullptr_t) const {
+operator <= (std::nullptr_t) const {
   return _void_ptr == nullptr;
 }
 
@@ -333,7 +333,7 @@ operator <= (nullptr_t) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator >= (nullptr_t) const {
+operator >= (std::nullptr_t) const {
   return true;
 }
 
@@ -442,7 +442,7 @@ operator < (const To *other) const {
  */
 template<class T>
 INLINE bool WeakPointerToBase<T>::
-operator < (nullptr_t) const {
+operator < (std::nullptr_t) const {
   return false;
 }
 
diff --git a/panda/src/express/weakPointerToBase.h b/panda/src/express/weakPointerToBase.h
index 20505191e3..34960920ab 100644
--- a/panda/src/express/weakPointerToBase.h
+++ b/panda/src/express/weakPointerToBase.h
@@ -60,11 +60,11 @@ public:
   INLINE bool operator <= (To *other) const;
   INLINE bool operator >= (To *other) const;
 
-  INLINE bool operator == (nullptr_t) const;
-  INLINE bool operator != (nullptr_t) const;
-  INLINE bool operator > (nullptr_t) const;
-  INLINE bool operator <= (nullptr_t) const;
-  INLINE bool operator >= (nullptr_t) const;
+  INLINE bool operator == (std::nullptr_t) const;
+  INLINE bool operator != (std::nullptr_t) const;
+  INLINE bool operator > (std::nullptr_t) 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;
@@ -79,7 +79,7 @@ public:
   INLINE bool operator >= (const PointerToBase<To> &other) const;
 #endif  // WIN32_VC
   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 PointerToBase<To> &other) const;
 #endif  // CPPPARSER