fixed visibility warning on Fedora
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -419,8 +419,9 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String)
|
|||||||
// the template's implementation uses overloaded function declared later (see
|
// the template's implementation uses overloaded function declared later (see
|
||||||
// the wxStrcoll() call in wxStrcoll_String<T>()), so we have to
|
// the wxStrcoll() call in wxStrcoll_String<T>()), so we have to
|
||||||
// forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH,
|
// 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.
|
// this fails to compile with VC6, so don't do it for VC. It also causes
|
||||||
#if !defined(__VISUALC__)
|
// problems with GCC visibility in newer GCC versions.
|
||||||
|
#if !(defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4))
|
||||||
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)
|
||||||
@@ -440,7 +441,7 @@ inline int wxStrcoll_String(const wxString& s1, const T& s2)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__VISUALC__)
|
#if defined(__VISUALC__) || wxCHECK_GCC_VERSION(3,4)
|
||||||
// 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
|
||||||
|
Reference in New Issue
Block a user