AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove HAVE_PARTIAL_SPECIALIZATION and HAVE_TEMPLATE_OVERLOAD_RESOLUTION macros

Browse Source 
See #17655.
This commit is contained in:
ARATA Mizuki 2016-08-30 18:13:02 +09:00
parent 32666e8d4f
commit affbcfa6c4
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/defs.h
View File

@ -443,31 +443,6 @@ typedef short int WXTYPE;
#undef wxNO_WOSTREAM #undef wxNO_WOSTREAM
#endif /* HAVE_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 */ /* portable calling conventions macros */
/* ---------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------- */

6
include/wx/strvararg.h
View File

@ -362,17 +362,12 @@ struct wxFormatStringSpecifier
// //
// Furthermore, if the compiler doesn't have partial template // Furthermore, if the compiler doesn't have partial template
// specialization, we didn't cover pointers either. // specialization, we didn't cover pointers either.
#ifdef HAVE_PARTIAL_SPECIALIZATION
enum { value = wxFormatString::Arg_Int }; enum { value = wxFormatString::Arg_Int };
#else
enum { value = wxFormatString::Arg_Int | wxFormatString::Arg_Pointer };
#endif
}; };
#endif // HAVE_TR1_TYPE_TRAITS/!HAVE_TR1_TYPE_TRAITS #endif // HAVE_TR1_TYPE_TRAITS/!HAVE_TR1_TYPE_TRAITS
#ifdef HAVE_PARTIAL_SPECIALIZATION
template<typename T> template<typename T>
struct wxFormatStringSpecifier<T*> struct wxFormatStringSpecifier<T*>
{ {
@ -384,7 +379,6 @@ struct wxFormatStringSpecifier<const T*>
{ {
enum { value = wxFormatString::Arg_Pointer }; enum { value = wxFormatString::Arg_Pointer };
}; };
#endif // !HAVE_PARTIAL_SPECIALIZATION
#define wxFORMAT_STRING_SPECIFIER(T, arg) \ #define wxFORMAT_STRING_SPECIFIER(T, arg) \