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

Add support for std::string_view to wx vararg functions

Browse Source 
Allow using wxPrintf() etc with std::string_view arguments when using
C++17.

This is inefficient but still more convenient than not being able to use
string_view at all.
This commit is contained in:
Vadim Zeitlin
2021-06-20 18:12:34 +02:00
parent fcfe91b16d
commit 8e2cac22ba
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/wx/strvararg.h
View File

@@ -780,6 +780,13 @@ WX_ARG_NORMALIZER_FORWARD(const wxWCharBuffer&, const wchar_t*);
#include "wx/stringimpl.h" #include "wx/stringimpl.h"
// And also string_view, if we have it (notice that <string> was included from
// wx/stringimpl.h above, so __cpp_lib_string_view should be defined if it's
// supported).
#ifdef __cpp_lib_string_view
#include <string_view>
#endif // __cpp_lib_string_view
#if !wxUSE_UTF8_LOCALE_ONLY #if !wxUSE_UTF8_LOCALE_ONLY
#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING #ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
template<> template<>
@@ -790,6 +797,22 @@ struct wxArgNormalizerWchar<const std::string&>
const wxFormatString *fmt, unsigned index) const wxFormatString *fmt, unsigned index)
: wxArgNormalizerWchar<const char*>(s.c_str(), fmt, index) {} : wxArgNormalizerWchar<const char*>(s.c_str(), fmt, index) {}
}; };
#ifdef __cpp_lib_string_view
// This is inefficient because we create a temporary string rather than using
// the string_view directly, but is required because the rest of the code
// assumes NUL-terminated strings and is still better than nothing (i.e. no
// support for std::string_view at all).
template<>
struct wxArgNormalizerWchar<const std::string_view&>
: public wxArgNormalizerWchar<const std::string&>
{
wxArgNormalizerWchar(const std::string_view& v,
const wxFormatString *fmt, unsigned index)
: wxArgNormalizerWchar<const std::string&>(std::string{v}, fmt, index) {}
};
#endif // __cpp_lib_string_view
#endif // NO_IMPLICIT_WXSTRING_ENCODING #endif // NO_IMPLICIT_WXSTRING_ENCODING
template<> template<>
@@ -812,6 +835,18 @@ struct wxArgNormalizerUtf8<const std::string&>
const wxFormatString *fmt, unsigned index) const wxFormatString *fmt, unsigned index)
: wxArgNormalizerUtf8<const char*>(s.c_str(), fmt, index) {} : wxArgNormalizerUtf8<const char*>(s.c_str(), fmt, index) {}
}; };
#ifdef __cpp_lib_string_view
template<>
struct wxArgNormalizerUtf8<const std::string_view&>
: public wxArgNormalizerUtf8<const char*>
{
wxArgNormalizerUtf8(const std::string_view& v,
const wxFormatString *fmt, unsigned index)
: wxArgNormalizerUtf8<const char*>(v.data(), fmt, index) {}
};
#endif // __cpp_lib_string_view
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
template<> template<>
@@ -826,6 +861,9 @@ struct wxArgNormalizerUtf8<const wxStdWideString&>
#ifndef wxNO_IMPLICIT_WXSTRING_ENCODING #ifndef wxNO_IMPLICIT_WXSTRING_ENCODING
WX_ARG_NORMALIZER_FORWARD(std::string, const std::string&); WX_ARG_NORMALIZER_FORWARD(std::string, const std::string&);
#ifdef __cpp_lib_string_view
WX_ARG_NORMALIZER_FORWARD(std::string_view, const std::string_view&);
#endif // __cpp_lib_string_view
#endif #endif
WX_ARG_NORMALIZER_FORWARD(wxStdWideString, const wxStdWideString&); WX_ARG_NORMALIZER_FORWARD(wxStdWideString, const wxStdWideString&);

5
tests/strings/vararg.cpp
View File

@@ -65,6 +65,11 @@ TEST_CASE("StringPrintf", "[wxString][Printf][vararg]")
wxGCC_WARNING_RESTORE(write-strings) wxGCC_WARNING_RESTORE(write-strings)
wxCLANG_WARNING_RESTORE(c++11-compat-deprecated-writable-strings) wxCLANG_WARNING_RESTORE(c++11-compat-deprecated-writable-strings)
#ifdef __cpp_lib_string_view
CHECK( wxString::Format("%s", std::string_view{"foobar", 3}) == "foo" );
CHECK( wxString::Format("%s", std::string_view{"bar"}) == "bar" );
#endif // __cpp_lib_string_view
} }
TEST_CASE("CharPrintf", "[wxString][Printf][vararg]") TEST_CASE("CharPrintf", "[wxString][Printf][vararg]")