setlocale is in global namespace on mac os

LinuxDevon · Jan 28, 2024 · 38f6284 · 38f6284
1 parent 70d1711
commit 38f6284
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -8,7 +8,7 @@ env:
 
 jobs:
   linux-builds:
-    name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
+    name: linux ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -104,9 +104,10 @@ jobs:
         shell: cmd
 
   macos-builds:
-    name: ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
+    name: macos ${{matrix.cxx}}, C++${{matrix.std}}, ${{matrix.build_type}}
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
         cxx:
           - g++

diff --git a/test/locale_testing/test_locale_main.cpp b/test/locale_testing/test_locale_main.cpp
@@ -13,7 +13,8 @@ class testRunListener : public Catch::EventListenerBase {
 	using Catch::EventListenerBase::EventListenerBase;
 
 	void testRunStarting(Catch::TestRunInfo const&) override {
-		prev_loc = std::setlocale(LC_ALL, nullptr);
+		// Mac OS uses global and c++ standard uses the std. Using this to remove ambiguity between the two.
+		prev_loc = ::setlocale(LC_ALL, nullptr);
 		// Set the locale to something that has , instead of . for floats
 		std::locale::global(std::locale("de_DE.UTF-8"));
 	}