Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fully qualify std::nullptr_t

Browse Source 
Fix a stupid mistake from 00cdab77c5
This commit is contained in:
Vadim Zeitlin
2020-02-05 15:19:33 +01:00
parent 00cdab77c5
commit 3f49942051
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/wxcrt.h
View File

@@ -869,16 +869,16 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
#ifdef wxHAS_NULLPTR_T #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)); }; { 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)); }; { return wxStrtod(nptr.AsString(), static_cast<wxStringCharType**>(NULL)); };
#define WX_STRTOX_DEFINE_NULLPTR_OVERLOADS(rettype, name) \ #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), \ { return name(nptr.wx_str(), static_cast<wxStringCharType**>(NULL), \
base); }; \ 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), \ { return name(nptr.AsString(), static_cast<wxStringCharType**>(NULL), \
base); }; base); };