From 198635ad6894e59697f57f5b152aa786c1a9af6f Mon Sep 17 00:00:00 2001 From: PB Date: Thu, 17 Sep 2020 18:32:21 +0200 Subject: [PATCH] Fix linking issue with wxCmpNatural() in static build 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. --- src/common/arrstr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/arrstr.cpp b/src/common/arrstr.cpp index dc3befbb68..a914cedbd4 100644 --- a/src/common/arrstr.cpp +++ b/src/common/arrstr.cpp @@ -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 // 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__ ) return StrCmpLogicalW(s1.wc_str(), s2.wc_str());