compilation fix after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -477,11 +477,9 @@ typedef short int WXTYPE;
|
|||||||
// assume the compiler can use type or const expressions as template
|
// assume the compiler can use type or const expressions as template
|
||||||
// arguments if it supports partial specialization -- except if it's a
|
// arguments if it supports partial specialization -- except if it's a
|
||||||
// Borland one which can't
|
// Borland one which can't
|
||||||
#ifdef HAVE_PARTIAL_SPECIALIZATION && !defined(__BORLANDC__)
|
#if defined(HAVE_PARTIAL_SPECIALIZATION) && !defined(__BORLANDC__)
|
||||||
#define HAVE_TEMPLATE_OVERLOAD_RESOLUTION
|
#define HAVE_TEMPLATE_OVERLOAD_RESOLUTION
|
||||||
#endif
|
#endif // __BORLANDC__
|
||||||
#endif // __BORLANDC__
|
|
||||||
|
|
||||||
#endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION)
|
#endif // !defined(HAVE_TEMPLATE_OVERLOAD_RESOLUTION)
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------- */
|
||||||
|
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
// this library is only available for PocketPC targets using recent SDK and is
|
// this library is only available for PocketPC targets using recent SDK and is
|
||||||
// needed for RTTI support
|
// needed for RTTI support
|
||||||
#if (_WIN32_WCE >= 400) && !defined(__WINCE_NET__) !defined(wxNO_RTTI)
|
#if (_WIN32_WCE >= 400) && !defined(__WINCE_NET__) && !defined(wxNO_RTTI)
|
||||||
#pragma comment(lib,"ccrtrtti.lib")
|
#pragma comment(lib,"ccrtrtti.lib")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user