Fixed build with GCC, Clang for standard C++17 and later

Also CMAKE_CXX_STANDARD in workflow yml
OleErikPeistorpet · Sep 28, 2023 · 41cb40f · 41cb40f
1 parent a75e32c
commit 41cb40f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -10,17 +10,40 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
-      fail-fast: false
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations.
+      fail-fast: true
 
       matrix:
         os: [ubuntu-20.04, ubuntu-latest, macos-latest]
-        mem_bound_debug: [off, on]
+        cpp_standard: [17, 20]
+        mem_bound_debug: [off]
         include:
           - os: ubuntu-20.04
             gcc_version: 7
+            cpp_standard: 17
+          - os: ubuntu-20.04
+            gcc_version: 8
+            cpp_standard: 14
+            mem_bound_debug: on
+          - os: ubuntu-20.04
+            gcc_version: 9
+            cpp_standard: 20
+          - os: ubuntu-latest
+            gcc_version: 10
+            cpp_standard: 20
+            mem_bound_debug: on
+          - os: ubuntu-latest
+            gcc_version: 11
+            cpp_standard: 17
           - os: ubuntu-latest
             gcc_version: 12
+            cpp_standard: 20
+          - os: macos-latest
+            cpp_standard: 14
+            mem_bound_debug: on
+        exclude:
+          - os: macos-latest
+            cpp_standard: 17
 
     steps:
     - if: runner.os == 'Linux'
@@ -39,6 +62,7 @@ jobs:
       run: >
         cmake -B ${{ github.workspace }}/build
         -D CMAKE_BUILD_TYPE=Release
+        -D CMAKE_CXX_STANDARD=${{ matrix.cpp_standard }}
         -D MEM_BOUND_DEBUG=${{ matrix.mem_bound_debug }}
         -S ${{ github.workspace }}/unit_test
 

diff --git a/unit_test/test_classes.h b/unit_test/test_classes.h
@@ -24,7 +24,7 @@ class MemoryLeakDetector;
 extern MemoryLeakDetector* leakDetector;
 
 
-#if __cpp_lib_ranges >= 201911
+#if (defined _MSC_VER and __cpp_lib_ranges >= 201911) or __cpp_lib_ranges > 202000
 
 #include <ranges>
 

diff --git a/unit_test/view_gtest.cpp b/unit_test/view_gtest.cpp
@@ -118,7 +118,7 @@ constexpr auto multBy2(StdArrInt2 a)
 	StdArrInt2 res{};
 	struct
 	{	constexpr auto operator()(int i) const { return 2 * i; }
-	} mult2;
+	} mult2{};
 	auto v = view::transform(a, mult2);
 	std::ptrdiff_t i{};
 	for (auto val : v)

diff --git a/view/counted.h b/view/counted.h
@@ -45,8 +45,8 @@ class counted_view
 
 	constexpr bool empty() const noexcept   { return 0 == _size; }
 
-	constexpr decltype(auto) operator[](difference_type index) const   OEL_ALWAYS_INLINE
-		OEL_REQUIRES(iter_is_random_access<Iterator>)          { return _begin[index]; }
+	constexpr decltype(auto) operator[](difference_type index) const
+		OEL_REQUIRES(iter_is_random_access<Iterator>)          OEL_ALWAYS_INLINE { return _begin[index]; }
 
 protected:
 	Iterator       _begin;

diff --git a/view/subrange.h b/view/subrange.h
@@ -39,8 +39,8 @@ class basic_view
 
 	constexpr bool empty() const   { return _begin == _end; }
 
-	constexpr decltype(auto) operator[](difference_type index) const   OEL_ALWAYS_INLINE
-		OEL_REQUIRES(iter_is_random_access<Iterator>)          { return _begin[index]; }
+	constexpr decltype(auto) operator[](difference_type index) const
+		OEL_REQUIRES(iter_is_random_access<Iterator>)          OEL_ALWAYS_INLINE { return _begin[index]; }
 
 protected:
 	Iterator _begin;