Merge branch 'master' into dev/jomaples/LWG3255

tests/CMakeLists.txt

@@ -110,7 +110,14 @@ else()
           >
         >
         $<$<CXX_COMPILER_ID:Clang>:
-          $<$<CXX_COMPILER_VERSION:5.0.2>:-Wno-undefined-func-template>
+          $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,4.99>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,6>>:
+            $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template>
+          >
+        >
+        $<$<CXX_COMPILER_ID:AppleClang>:
+          $<$<AND:$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,9.1>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,10>>:
+            $<$<EQUAL:${GSL_CXX_STANDARD},17>:-Wno-undefined-func-template>
+          >
         >
         $<$<CXX_COMPILER_ID:GNU>:
           -Wdouble-promotion # float implicit to double

tests/multi_span_tests.cpp

@@ -1042,7 +1042,10 @@ TEST(multi_span_test, subspan)
         EXPECT_TRUE(av.subspan(1).length() == 4);
         EXPECT_TRUE(av.subspan(4).length() == 1);
         EXPECT_TRUE(av.subspan(5).length() == 0);
+        // Disabled test instead of fixing since multi_span is deprecated. (PR#835)
+#if !(defined(__GNUC__) && __GNUC__ == 8 && __GNUC_MINOR__ == 3)
         EXPECT_DEATH(av.subspan(6).length(), deathstring);
+#endif
         auto av2 = av.subspan(1);
         for (int i = 0; i < 4; ++i) EXPECT_TRUE(av2[i] == i + 2);
     }