This commit is contained in:
Denis Blank 2017-03-19 17:39:43 +01:00
parent 6e04f0d389
commit 89559468e7
2 changed files with 11 additions and 10 deletions

@ -1 +1 @@
Subproject commit 8220501d0db1bcdd28a11c958f623c079c243000 Subproject commit 354f96609502fc0b0fb1d77680427fcea81dfebe

View File

@ -24,14 +24,14 @@
#ifndef TEST_CONTINUABLE_HPP__ #ifndef TEST_CONTINUABLE_HPP__
#define TEST_CONTINUABLE_HPP__ #define TEST_CONTINUABLE_HPP__
#if UNIT_TEST_STEP == 4 #if UNIT_TEST_STEP >= 3
#define THIRD_PARTY_TESTS #define THIRD_PARTY_TESTS
#endif #endif
#ifdef THIRD_PARTY_TESTS #ifdef THIRD_PARTY_TESTS
#if _MSC_VER // #if _MSC_VER
#pragma warning(push, 0) // #pragma warning(push, 0)
#endif // #endif
#endif // THIRD_PARTY_TESTS #endif // THIRD_PARTY_TESTS
#include <cassert> #include <cassert>
@ -198,15 +198,16 @@ using single_types = ::testing::Types<
provide_continuation_and_right<provide_unique>, provide_continuation_and_right<provide_unique>,
provide_continuation_and_left<provide_erasure<cti::continuable>> provide_continuation_and_left<provide_erasure<cti::continuable>>
#elif UNIT_TEST_STEP == 2 #elif UNIT_TEST_STEP == 2
provide_continuation_and_left<provide_erasure<cti::unique_continuable>> provide_continuation_and_left<provide_erasure<cti::unique_continuable>>,
#elif UNIT_TEST_STEP == 3
provide_continuation_seq_right<provide_unique> provide_continuation_seq_right<provide_unique>
#elif UNIT_TEST_STEP == 3
#define NO_ERASURE_TESTS
provide_erasure<cxx_unique_continuable>
#elif UNIT_TEST_STEP == 4 #elif UNIT_TEST_STEP == 4
#define NO_ERASURE_TESTS #define NO_ERASURE_TESTS
#define NO_FUTURE_TESTS #define NO_FUTURE_TESTS
provide_erasure<std_continuable> provide_erasure<std_continuable>,
// provide_erasure<cxx_continuable>, provide_erasure<cxx_continuable>
// provide_erasure<cxx_unique_continuable>
#endif #endif
>; >;
// clang-format on // clang-format on