From 7f246330de8ad310dad7527ef00eee9192abdf1b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Apr 2021 18:02:19 +0200
Subject: [PATCH] Remove wrong template arguments from wxArgNormalized ctors

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.
---
 include/wx/strvararg.h | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
index 0abf59b1b3..a565079771 100644
--- a/include/wx/strvararg.h
+++ b/include/wx/strvararg.h
@@ -295,7 +295,7 @@ struct wxFormatStringArgumentFinder<wxScopedCharBuffer>
     : public wxFormatStringArgumentFinder<const wxScopedCharBuffer&> {
 #ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
 private:
-    wxFormatStringArgumentFinder<wxScopedCharBuffer>(); // Disabled
+    wxFormatStringArgumentFinder(); // Disabled
 #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
 };
 
@@ -308,7 +308,7 @@ struct wxFormatStringArgumentFinder<wxCharBuffer>
     : public wxFormatStringArgumentFinder<const wxCharBuffer&> {
 #ifdef wxNO_IMPLICIT_WXSTRING_ENCODING
 private:
-    wxFormatStringArgumentFinder<wxCharBuffer>(); // Disabled
+    wxFormatStringArgumentFinder(); // Disabled
 #endif // wxNO_IMPLICIT_WXSTRING_ENCODING
 };
 
@@ -409,7 +409,7 @@ struct wxFormatStringSpecifier<const T*>
     template<> struct wxFormatStringSpecifier<T>                            \
     {                                                                       \
     private:                                                                \
-        wxFormatStringSpecifier<T>(); /* Disabled */                        \
+        wxFormatStringSpecifier(); /* Disabled */                           \
     };
 
 wxFORMAT_STRING_SPECIFIER(bool, wxFormatString::Arg_Int)
@@ -689,42 +689,37 @@ struct wxArgNormalizerWchar<const wchar_t*>
 template<>
 struct wxArgNormalizer<const char*> {
 private:
-    wxArgNormalizer<const char*>(const char*, const wxFormatString *,
-                                 unsigned);
+    wxArgNormalizer(const char*, const wxFormatString *, unsigned);
     const char *get() const;
 };
 template<>
 struct wxArgNormalizer<char*> {
 private:
-    wxArgNormalizer<char*>(const char*, const wxFormatString *, unsigned);
+    wxArgNormalizer(const char*, const wxFormatString *, unsigned);
     char *get() const;
 };
 template<>
 struct wxArgNormalizer<const std::string> {
 private:
-    wxArgNormalizer<const std::string>(const std::string&,
-                                        const wxFormatString *, unsigned);
+    wxArgNormalizer(const std::string&, const wxFormatString *, unsigned);
     std::string get() const;
 };
 template<>
 struct wxArgNormalizer<std::string> {
 private:
-    wxArgNormalizer<std::string>(std::string&,
-                                 const wxFormatString *, unsigned);
+    wxArgNormalizer(std::string&, const wxFormatString *, unsigned);
     std::string get() const;
 };
 template<>
 struct wxArgNormalizer<wxCharBuffer> {
 private:
-    wxArgNormalizer<wxCharBuffer>(wxCharBuffer&,
-                                  const wxFormatString *, unsigned);
+    wxArgNormalizer(wxCharBuffer&, const wxFormatString *, unsigned);
     std::string get() const;
 };
 template<>
 struct wxArgNormalizer<wxScopedCharBuffer> {
 private:
-    wxArgNormalizer<wxScopedCharBuffer>(wxScopedCharBuffer&,
-                                        const wxFormatString *, unsigned);
+    wxArgNormalizer(wxScopedCharBuffer&, const wxFormatString *, unsigned);
     std::string get() const;
 };
 #endif // wxNO_IMPLICIT_WXSTRING_ENCODING