From 30f3757b5049e1db7bbadce98c91654e87039daa Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 3 Jul 2007 21:26:35 +0000 Subject: [PATCH] wxStrcoll_String compilation fixes for Dmars and Borland compilers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrt.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 4a1f226134..e6116d0752 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -415,17 +415,16 @@ inline int wxStricmp_String(const wxString& s1, const T& s2) WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) -// GCC 3.3 has a bug that causes it to fail compilation if the template's -// implementation uses overloaded function declared later (see the wxStrcoll() -// call in wxStrcoll_String()), so we have to forward-declare the template -// and implement it below WX_STRCMP_FUNC. OTOH, this fails to compile with VC6, -// so we do it for GCC only. -// The same is needed for HP CXX on OpenVMS -#if defined( __GNUG__ ) || defined( __VMS ) +// GCC 3.3 and other compilers have a bug that causes it to fail compilation if +// the template's implementation uses overloaded function declared later (see +// the wxStrcoll() call in wxStrcoll_String()), so we have to +// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, +// this fails to compile with VC6, so don't do it for VC. +#if !defined(__VISUALC__) template inline int wxStrcoll_String(const wxString& s1, const T& s2); WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) -#endif // __GNUG__ or __VMS +#endif // !__VISUALC__ template inline int wxStrcoll_String(const wxString& s1, const T& s2) @@ -441,7 +440,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2) #endif } -#if !defined( __GNUG__ ) && !defined( __VMS ) +#if defined(__VISUALC__) // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<> WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) #endif -- 2.45.2