Bug 1460055 - Make strimatch static to fix error with GCC about exception handling mangling. r=aklotz
authorChris Pearce <cpearce@mozilla.com>
Wed, 09 May 2018 09:35:03 +1200
changeset 417485 3029b0beea0eb25cb9b81de89aed56f1f95a0b89
parent 417484 2e9ace719b0652f5e6a1db4d3045fd16fc5698f1
child 417486 3c65a2197eadf11fd6f3a87caf7682cc89558cbd
push id33968
push userebalazs@mozilla.com
push dateWed, 09 May 2018 09:32:53 +0000
treeherdermozilla-central@a2eccfbeb0ae [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaklotz
bugs1460055
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1460055 - Make strimatch static to fix error with GCC about exception handling mangling. r=aklotz MozReview-Commit-ID: CLBt2Siasdm
toolkit/xre/CmdLineAndEnvUtils.h
--- a/toolkit/xre/CmdLineAndEnvUtils.h
+++ b/toolkit/xre/CmdLineAndEnvUtils.h
@@ -51,17 +51,17 @@ RemoveArg(int& argc, CharT **argv)
   } while (*argv);
 
   --argc;
 }
 
 namespace internal {
 
 template <typename FuncT, typename CharT>
-inline bool
+static inline bool
 strimatch(FuncT aToLowerFn, const CharT* lowerstr, const CharT* mixedstr)
 {
   while(*lowerstr) {
     if (!*mixedstr) return false; // mixedstr is shorter
     if (static_cast<CharT>(aToLowerFn(*mixedstr)) != *lowerstr) return false; // no match
 
     ++lowerstr;
     ++mixedstr;