From c1d2d991b41d170f47d7fe0e0af27b32afacec59 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 24 Oct 2018 18:58:23 +0300 Subject: [PATCH] Fix test/variant_copy_construct_cx.cpp --- test/Jamfile | 2 +- test/variant_copy_construct_cx.cpp | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/test/Jamfile b/test/Jamfile index 1402027..459e949 100644 --- a/test/Jamfile +++ b/test/Jamfile @@ -27,7 +27,7 @@ run variant_default_construct.cpp ; compile variant_default_construct_cx.cpp ; run variant_copy_construct.cpp ; -compile variant_copy_construct_cx.cpp ; +compile variant_copy_construct_cx.cpp : msvc-14.0:no ; run variant_move_construct.cpp ; compile variant_move_construct_cx.cpp ; diff --git a/test/variant_copy_construct_cx.cpp b/test/variant_copy_construct_cx.cpp index e208f4e..cd3a7c2 100644 --- a/test/variant_copy_construct_cx.cpp +++ b/test/variant_copy_construct_cx.cpp @@ -6,13 +6,6 @@ // See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt -#if !defined( __cpp_constexpr ) || __cpp_constexpr < 201603 - -// no constexpr lambda support -int main() {} - -#else - #include using namespace boost::variant2; @@ -40,10 +33,9 @@ enum E #define STATIC_ASSERT(...) static_assert(__VA_ARGS__, #__VA_ARGS__) -template constexpr T test( V const& v ) +template constexpr T test( V const v ) { - V v2( v ); - return get(v); + return get( v ); } int main() @@ -118,5 +110,3 @@ int main() #endif } - -#endif // constexpr lambda support