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

Remove wrong template arguments from wxArgNormalized ctors

Browse Source 
Ctor of a template class specialization shouldn't actually repeat the
specialized template arguments, as it was done in 65cbf40b7e (Add
wxNO_UNSAFE_WXSTRING_CONV2 macro, 2019-10-21), so remove them because
this doesn't compile with g++ 11, even though it (wrongly?) did with the
previous gcc versions.
This commit is contained in:
Vadim Zeitlin
2021-04-25 18:02:19 +02:00
parent 3d278ee75f
commit 7f246330de
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/strvararg.h
View File

@@ -295,7 +295,7 @@ struct wxFormatStringArgumentFinder<wxScopedCharBuffer>
: public wxFormatStringArgumentFinder<const wxScopedCharBuffer&> { : public wxFormatStringArgumentFinder<const wxScopedCharBuffer&> {
#ifdef wxNO_IMPLICIT_WXSTRING_ENCODING #ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
private: private:
wxFormatStringArgumentFinder<wxScopedCharBuffer>(); // Disabled wxFormatStringArgumentFinder(); // Disabled
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
}; };
@@ -308,7 +308,7 @@ struct wxFormatStringArgumentFinder<wxCharBuffer>
: public wxFormatStringArgumentFinder<const wxCharBuffer&> { : public wxFormatStringArgumentFinder<const wxCharBuffer&> {
#ifdef wxNO_IMPLICIT_WXSTRING_ENCODING #ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
private: private:
wxFormatStringArgumentFinder<wxCharBuffer>(); // Disabled wxFormatStringArgumentFinder(); // Disabled
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
}; };
@@ -409,7 +409,7 @@ struct wxFormatStringSpecifier<const T*>
template<> struct wxFormatStringSpecifier<T> \ template<> struct wxFormatStringSpecifier<T> \
{ \ { \
private: \ private: \
wxFormatStringSpecifier<T>(); /* Disabled */ \ wxFormatStringSpecifier(); /* Disabled */ \
}; };
wxFORMAT_STRING_SPECIFIER(bool, wxFormatString::Arg_Int) wxFORMAT_STRING_SPECIFIER(bool, wxFormatString::Arg_Int)
@@ -689,42 +689,37 @@ struct wxArgNormalizerWchar<const wchar_t*>
template<> template<>
struct wxArgNormalizer<const char*> { struct wxArgNormalizer<const char*> {
private: private:
wxArgNormalizer<const char*>(const char*, const wxFormatString *, wxArgNormalizer(const char*, const wxFormatString *, unsigned);
unsigned);
const char *get() const; const char *get() const;
}; };
template<> template<>
struct wxArgNormalizer<char*> { struct wxArgNormalizer<char*> {
private: private:
wxArgNormalizer<char*>(const char*, const wxFormatString *, unsigned); wxArgNormalizer(const char*, const wxFormatString *, unsigned);
char *get() const; char *get() const;
}; };
template<> template<>
struct wxArgNormalizer<const std::string> { struct wxArgNormalizer<const std::string> {
private: private:
wxArgNormalizer<const std::string>(const std::string&, wxArgNormalizer(const std::string&, const wxFormatString *, unsigned);
const wxFormatString *, unsigned);
std::string get() const; std::string get() const;
}; };
template<> template<>
struct wxArgNormalizer<std::string> { struct wxArgNormalizer<std::string> {
private: private:
wxArgNormalizer<std::string>(std::string&, wxArgNormalizer(std::string&, const wxFormatString *, unsigned);
const wxFormatString *, unsigned);
std::string get() const; std::string get() const;
}; };
template<> template<>
struct wxArgNormalizer<wxCharBuffer> { struct wxArgNormalizer<wxCharBuffer> {
private: private:
wxArgNormalizer<wxCharBuffer>(wxCharBuffer&, wxArgNormalizer(wxCharBuffer&, const wxFormatString *, unsigned);
const wxFormatString *, unsigned);
std::string get() const; std::string get() const;
}; };
template<> template<>
struct wxArgNormalizer<wxScopedCharBuffer> { struct wxArgNormalizer<wxScopedCharBuffer> {
private: private:
wxArgNormalizer<wxScopedCharBuffer>(wxScopedCharBuffer&, wxArgNormalizer(wxScopedCharBuffer&, const wxFormatString *, unsigned);
const wxFormatString *, unsigned);
std::string get() const; std::string get() const;
}; };
#endif // wxNO_IMPLICIT_WXSTRING_ENCODING #endif // wxNO_IMPLICIT_WXSTRING_ENCODING