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

wxStrcoll_String compilation fixes for Dmars and Borland compilers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-07-03 21:26:35 +00:00
parent 4e0a055757
commit 30f3757b50
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/wx/wxcrt.h
View File

@ -415,17 +415,16 @@ inline int wxStricmp_String(const wxString& s1, const T& s2)
WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) 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 // GCC 3.3 and other compilers have a bug that causes it to fail compilation if
// implementation uses overloaded function declared later (see the wxStrcoll() // the template's implementation uses overloaded function declared later (see
// call in wxStrcoll_String<T>()), so we have to forward-declare the template // the wxStrcoll() call in wxStrcoll_String<T>()), so we have to
// and implement it below WX_STRCMP_FUNC. OTOH, this fails to compile with VC6, // forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH,
// so we do it for GCC only. // this fails to compile with VC6, so don't do it for VC.
// The same is needed for HP CXX on OpenVMS #if !defined(__VISUALC__)
#if defined( __GNUG__ ) || defined( __VMS )
template<typename T> template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2); inline int wxStrcoll_String(const wxString& s1, const T& s2);
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif // __GNUG__ or __VMS #endif // !__VISUALC__
template<typename T> template<typename T>
inline int wxStrcoll_String(const wxString& s1, const T& s2) 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 #endif
} }
#if !defined( __GNUG__ ) && !defined( __VMS ) #if defined(__VISUALC__)
// this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<> // this is exactly the same WX_STRCMP_FUNC line as above wxStrcoll_String<>
WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String) WX_STRCMP_FUNC(wxStrcoll, wxCRT_StrcollA, wxCRT_StrcollW, wxStrcoll_String)
#endif #endif