From 3f499420519d9f8699ec3833d8e9672f17eaec9c Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 5 Feb 2020 15:19:33 +0100
Subject: [PATCH] Fully qualify std::nullptr_t

Fix a stupid mistake from 00cdab77c50b454e42d5e1f956d55d1bfebfa271
---
 include/wx/wxcrt.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index ab9752db22..4fe0ba9650 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -869,16 +869,16 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
 
 #ifdef wxHAS_NULLPTR_T
 
-inline double wxStrtod(const wxString& nptr, nullptr_t)
+inline double wxStrtod(const wxString& nptr, std::nullptr_t)
     { return wxStrtod(nptr.wx_str(), static_cast<wxStringCharType**>(NULL)); };
-inline double wxStrtod(const wxCStrData& nptr, nullptr_t)
+inline double wxStrtod(const wxCStrData& nptr, std::nullptr_t)
     { return wxStrtod(nptr.AsString(), static_cast<wxStringCharType**>(NULL)); };
 
 #define WX_STRTOX_DEFINE_NULLPTR_OVERLOADS(rettype, name)                     \
-    inline rettype name(const wxString& nptr, nullptr_t, int base)            \
+    inline rettype name(const wxString& nptr, std::nullptr_t, int base)       \
         { return name(nptr.wx_str(), static_cast<wxStringCharType**>(NULL),   \
                       base); };                                               \
-    inline rettype name(const wxCStrData& nptr, nullptr_t, int base)          \
+    inline rettype name(const wxCStrData& nptr, std::nullptr_t, int base)     \
         { return name(nptr.AsString(), static_cast<wxStringCharType**>(NULL), \
                       base); };