Attempt to fix the Appveyor build

Naios · Aug 18, 2018 · ce2ed01 · ce2ed01
1 parent f31bdd5
commit ce2ed01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,7 +14,7 @@ clone_script:
   - cmd: git submodule update --init --recursive
 
 before_build:
-  - cmd: cmake -H. -Bbuild -A%PLATFORM%
+  - cmd: cmake -H. -Bbuild -A%PLATFORM% -DCMAKE_CXX_FLAGS="/std:c++17"
 
 build_script:
   - cmd: cmake --build build --config %CONFIGURATION% --target ALL_BUILD -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal /maxcpucount:2 /nologo

diff --git a/test/noexcept-test.cpp b/test/noexcept-test.cpp
@@ -22,8 +22,7 @@ TYPED_TEST(AllNoExceptTests, CallAbortsIfEmpty) {
 }
 #endif // TESTS_NO_DEATH_TESTS
 
-#ifndef FU2_HAS_CXX17_NOEXCEPT_FUNCTION_TYPE
-
+#ifdef FU2_HAS_CXX17_NOEXCEPT_FUNCTION_TYPE
 TYPED_TEST(AllNoExceptTests, NoExceptCallSuceeds) {
   typename TestFixture::template left_t<int() noexcept> left = []() noexcept {
     return 12345;
@@ -37,5 +36,4 @@ TYPED_TEST(AllNoExceptTests, CallAbortsIfEmptyAndNoExcept) {
   EXPECT_DEATH(left(), "");
 }
 #endif // TESTS_NO_DEATH_TESTS
-
 #endif // FU2_HAS_CXX17_NOEXCEPT_FUNCTION_TYPE