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

Allow wxStrto... functions to accept nullptr

Browse Source
This commit is contained in:
Paul Cornett
2020-01-27 11:33:05 -08:00
parent 26f58bdf78
commit 63b1f00eb8
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/wxcrt.h
View File

@@ -844,18 +844,21 @@ template<> struct wxStrtoxCharType<int>
return NULL; return NULL;
} }
}; };
#if __cplusplus >= 201103
template<> struct wxStrtoxCharType<std::nullptr_t>
{
typedef const char* Type;
static char** AsPointer(std::nullptr_t)
{
return nullptr;
}
};
#endif
template<typename T> template<typename T>
inline double wxStrtod(const wxString& nptr, T endptr) inline double wxStrtod(const wxString& nptr, T endptr)
{ {
if ( endptr == 0 ) if (endptr)
{
// when we don't care about endptr, use the string representation that
// doesn't require any conversion (it doesn't matter for this function
// even if its UTF-8):
return wxStrtod(nptr.wx_str(), (wxStringCharType**)NULL);
}
else
{ {
// note that it is important to use c_str() here and not mb_str() or // note that it is important to use c_str() here and not mb_str() or
// wc_str(), because we store the pointer into (possibly converted) // wc_str(), because we store the pointer into (possibly converted)
@@ -864,6 +867,11 @@ inline double wxStrtod(const wxString& nptr, T endptr)
return wxStrtod((CharType)nptr.c_str(), return wxStrtod((CharType)nptr.c_str(),
wxStrtoxCharType<T>::AsPointer(endptr)); wxStrtoxCharType<T>::AsPointer(endptr));
} }
// when we don't care about endptr, use the string representation that
// doesn't require any conversion (it doesn't matter for this function
// even if its UTF-8):
wxStringCharType** p = NULL;
return wxStrtod(nptr.wx_str(), p);
} }
template<typename T> template<typename T>
inline double wxStrtod(const wxCStrData& nptr, T endptr) inline double wxStrtod(const wxCStrData& nptr, T endptr)
@@ -882,15 +890,15 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
template<typename T> \ template<typename T> \
inline rettype name(const wxString& nptr, T endptr, int base) \ inline rettype name(const wxString& nptr, T endptr, int base) \
{ \ { \
if ( endptr == 0 ) \ if (endptr) \
return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \
else \
{ \ { \
typedef typename wxStrtoxCharType<T>::Type CharType; \ typedef typename wxStrtoxCharType<T>::Type CharType; \
return name((CharType)nptr.c_str(), \ return name((CharType)nptr.c_str(), \
wxStrtoxCharType<T>::AsPointer(endptr), \ wxStrtoxCharType<T>::AsPointer(endptr), \
base); \ base); \
} \ } \
wxStringCharType** p = NULL; \
return name(nptr.wx_str(), p, base); \
} \ } \
template<typename T> \ template<typename T> \
inline rettype name(const wxCStrData& nptr, T endptr, int base) \ inline rettype name(const wxCStrData& nptr, T endptr, int base) \