From affbcfa6c4261e27c208123ebc237b1d9f963bfa Mon Sep 17 00:00:00 2001
From: ARATA Mizuki <minorinoki@gmail.com>
Date: Tue, 30 Aug 2016 18:13:02 +0900
Subject: [PATCH] Remove HAVE_PARTIAL_SPECIALIZATION and
 HAVE_TEMPLATE_OVERLOAD_RESOLUTION macros

See #17655.
---
 include/wx/defs.h      | 25 -------------------------
 include/wx/strvararg.h |  6 ------
 2 files changed, 31 deletions(-)

diff --git a/include/wx/defs.h b/include/wx/defs.h
index eece8810a2..1a35a67ba7 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -443,31 +443,6 @@ typedef short int WXTYPE;
     #undef wxNO_WOSTREAM
 #endif /* HAVE_WOSTREAM */
 
-/*  ---------------------------------------------------------------------------- */
-/*  other C++ features */
-/*  ---------------------------------------------------------------------------- */
-
-#ifndef HAVE_PARTIAL_SPECIALIZATION
-    /* be optimistic by default */
-    #define HAVE_PARTIAL_SPECIALIZATION
-#endif
-
-#ifdef __VISUALC__
-    #if __VISUALC__ < 1310
-        #undef HAVE_PARTIAL_SPECIALIZATION
-    #endif
-#endif /* __VISUALC__ */
-
-
-#ifndef HAVE_TEMPLATE_OVERLOAD_RESOLUTION
-    /* assume the compiler can use type or const expressions as template
-       arguments if it supports partial specialization -- except if it's a
-       Borland one which can't */
-    #if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__)
-        #define HAVE_TEMPLATE_OVERLOAD_RESOLUTION
-    #endif /* (HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__) */
-#endif /* !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION) */
-
 /*  ---------------------------------------------------------------------------- */
 /*  portable calling conventions macros */
 /*  ---------------------------------------------------------------------------- */
diff --git a/include/wx/strvararg.h b/include/wx/strvararg.h
index 468cbf8bbb..57429045d4 100644
--- a/include/wx/strvararg.h
+++ b/include/wx/strvararg.h
@@ -362,17 +362,12 @@ struct wxFormatStringSpecifier
     //
     // Furthermore, if the compiler doesn't have partial template
     // specialization, we didn't cover pointers either.
-#ifdef HAVE_PARTIAL_SPECIALIZATION
     enum { value = wxFormatString::Arg_Int };
-#else
-    enum { value = wxFormatString::Arg_Int | wxFormatString::Arg_Pointer };
-#endif
 };
 
 #endif // HAVE_TR1_TYPE_TRAITS/!HAVE_TR1_TYPE_TRAITS
 
 
-#ifdef HAVE_PARTIAL_SPECIALIZATION
 template<typename T>
 struct wxFormatStringSpecifier<T*>
 {
@@ -384,7 +379,6 @@ struct wxFormatStringSpecifier<const T*>
 {
     enum { value = wxFormatString::Arg_Pointer };
 };
-#endif // !HAVE_PARTIAL_SPECIALIZATION
 
 
 #define wxFORMAT_STRING_SPECIFIER(T, arg)                                   \