From a95d18b8a8e18a40e6256d92acf0838e48b34aaf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Jan 2010 00:59:49 +0000 Subject: [PATCH] Apply workaround for wxStrcoll() template for g++ to 3.4 too. At least mingw32 version of g++ 3.4.5 needs the same workaround to be able to compile wx. Closes #11605. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 9eccfe4cb0..34e8fbc968 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -471,13 +471,13 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) #if defined(wxCRT_StrcollA) && defined(wxCRT_StrcollW) -// GCC 3.3 and other compilers have a bug that causes it to fail compilation if +// GCC 3.4 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. It also causes // problems with GCC visibility in newer GCC versions. -#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4)) +#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5)) template inline int wxStrcoll_String(const wxString& s1, const T& s2); WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) @@ -497,7 +497,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2) #endif } -#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4) +#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,5) // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<> WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) #endif