From 645c90b11dc072de55c3f6fa18f9600cad83b670 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 24 May 2020 06:55:02 +0300 Subject: [PATCH] Enable constexpr tests on msvc-14.2 (where __cplusplus is still 199711L) --- test/construct_from_tuple_cx.cpp | 2 +- test/mp_for_each.cpp | 2 +- test/tuple_apply_cx.cpp | 2 +- test/tuple_for_each_cx.cpp | 2 +- test/tuple_transform_cx.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/construct_from_tuple_cx.cpp b/test/construct_from_tuple_cx.cpp index 4820a86..8962d3e 100644 --- a/test/construct_from_tuple_cx.cpp +++ b/test/construct_from_tuple_cx.cpp @@ -16,7 +16,7 @@ // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++ -#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) +#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined(_MSC_VER) && !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) int main() {} diff --git a/test/mp_for_each.cpp b/test/mp_for_each.cpp index d727e02..1842d5a 100644 --- a/test/mp_for_each.cpp +++ b/test/mp_for_each.cpp @@ -76,7 +76,7 @@ int main() #endif -#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) +#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined(_MSC_VER) && !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) #else static_assert( mp_for_each>( 11 ) == 11, "mp_for_each>( 11 ) == 11" ); diff --git a/test/tuple_apply_cx.cpp b/test/tuple_apply_cx.cpp index 6f2f4e5..bcd2677 100644 --- a/test/tuple_apply_cx.cpp +++ b/test/tuple_apply_cx.cpp @@ -16,7 +16,7 @@ // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++ -#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) +#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined(_MSC_VER) && !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) int main() {} diff --git a/test/tuple_for_each_cx.cpp b/test/tuple_for_each_cx.cpp index f511e81..7316f30 100644 --- a/test/tuple_for_each_cx.cpp +++ b/test/tuple_for_each_cx.cpp @@ -16,7 +16,7 @@ // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++ -#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) +#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined(_MSC_VER) && !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) int main() {} diff --git a/test/tuple_transform_cx.cpp b/test/tuple_transform_cx.cpp index a51ca52..f5e7dbd 100644 --- a/test/tuple_transform_cx.cpp +++ b/test/tuple_transform_cx.cpp @@ -9,7 +9,7 @@ // Technically std::tuple isn't constexpr enabled in C++11, but it works with libstdc++ -#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) || BOOST_MP11_WORKAROUND( BOOST_MP11_GCC, < 40800 ) +#if defined( BOOST_MP11_NO_CONSTEXPR ) || ( !defined(_MSC_VER) && !defined( __GLIBCXX__ ) && __cplusplus < 201400L ) || BOOST_MP11_WORKAROUND( BOOST_MP11_GCC, < 40800 ) int main() {}