Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix linking issue with wxCmpNatural() in static build

Browse Source 
wxCmpNatural() had "inline" function specifier in a .cpp file
which made the function inaccessible outside that file in static builds.

Fix this by removing "inline", the function character is such that the
overhead by a function call should have negligible impact on its
performance.

Closes https://github.com/wxWidgets/wxWidgets/pull/2050

Closes #18919.
This commit is contained in:
PB
2020-09-17 18:32:21 +02:00
committed by Vadim Zeitlin
parent 43249151dd
commit 198635ad68
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/arrstr.cpp
View File

@@ -912,7 +912,7 @@ int wxCMPFUNC_CONV wxCmpNaturalGeneric(const wxString& s1, const wxString& s2)
// //
// If a native version of Natural sort is available, then use that, otherwise // If a native version of Natural sort is available, then use that, otherwise
// use the generic version. // use the generic version.
inline int wxCMPFUNC_CONV wxCmpNatural(const wxString& s1, const wxString& s2) int wxCMPFUNC_CONV wxCmpNatural(const wxString& s1, const wxString& s2)
{ {
#if defined( __WINDOWS__ ) #if defined( __WINDOWS__ )
return StrCmpLogicalW(s1.wc_str(), s2.wc_str()); return StrCmpLogicalW(s1.wc_str(), s2.wc_str());