diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-05-26 01:27:08 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-05-26 01:27:08 +0000 |
| commit | abaf967ceb45328d868160cb491284f8f7964f07 (patch) | |
| tree | 5931b88a941c11bb4252d968a46bdfe97be4aa20 | |
| parent | 86248d5632ea7d1cbd4e6dc820662381872cb64d (diff) | |
Remove incorrect #ifdef guards around variant tests.
The tests were previously guarded by #if defined(_LIBCPP_VER) || defined(_MSVC_STL_VER),
which is both incorrect (e.g. _LIBCPP_VERSION) and unneeded. Although the tests are
technically non-standard (yet) they are supported by both libc++ and MSVC's STL.
libstdc++ doesn't regularly use the test suite so I'm not concerned about guarding these
tests for them.
llvm-svn: 303953
| -rw-r--r-- | libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp | 3 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp index a695df14ef62..3b20c369c638 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp @@ -149,7 +149,7 @@ constexpr bool test_constexpr_copy_ctor_extension_imp( } void test_constexpr_copy_ctor_extension() { -#if defined(_LIBCPP_VER) || defined(_MSVC_STL_VER) + // NOTE: This test is for not yet standardized behavior. using V = std::variant<long, void*, const int>; #ifdef TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE static_assert(std::is_trivially_destructible<V>::value, ""); @@ -163,7 +163,6 @@ void test_constexpr_copy_ctor_extension() { static_assert(test_constexpr_copy_ctor_extension_imp<0>(V(42l)), ""); static_assert(test_constexpr_copy_ctor_extension_imp<1>(V(nullptr)), ""); static_assert(test_constexpr_copy_ctor_extension_imp<2>(V(101)), ""); -#endif } int main() { diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp index b8ca6f9ef27a..a5de1f77334e 100644 --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp @@ -186,7 +186,7 @@ constexpr bool test_constexpr_ctor_extension_imp( } void test_constexpr_move_ctor_extension() { -#if defined(_LIBCPP_VER) || defined(_MSVC_STL_VER) + // NOTE: This test is for not yet standardized behavior. using V = std::variant<long, void*, const int>; #ifdef TEST_WORKAROUND_C1XX_BROKEN_IS_TRIVIALLY_COPYABLE static_assert(std::is_trivially_destructible<V>::value, ""); @@ -201,7 +201,6 @@ void test_constexpr_move_ctor_extension() { static_assert(test_constexpr_ctor_extension_imp<0>(V(42l)), ""); static_assert(test_constexpr_ctor_extension_imp<1>(V(nullptr)), ""); static_assert(test_constexpr_ctor_extension_imp<2>(V(101)), ""); -#endif } int main() { |