diff --git a/include/boost/smart_ptr/atomic_shared_ptr.hpp b/include/boost/smart_ptr/atomic_shared_ptr.hpp index b185ca4..a4a8745 100644 --- a/include/boost/smart_ptr/atomic_shared_ptr.hpp +++ b/include/boost/smart_ptr/atomic_shared_ptr.hpp @@ -57,8 +57,6 @@ private: public: -#if !defined( BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX ) && !defined( BOOST_NO_CXX11_CONSTEXPR ) - constexpr atomic_shared_ptr() BOOST_SP_NOEXCEPT: l_ BOOST_DETAIL_SPINLOCK_INIT { } @@ -68,23 +66,6 @@ public: { } -#else - - atomic_shared_ptr() BOOST_SP_NOEXCEPT - { - boost::detail::spinlock init = BOOST_DETAIL_SPINLOCK_INIT; - std::memcpy( &l_, &init, sizeof( init ) ); - } - - atomic_shared_ptr( shared_ptr p ) BOOST_SP_NOEXCEPT - : p_( std::move( p ) ) - { - boost::detail::spinlock init = BOOST_DETAIL_SPINLOCK_INIT; - std::memcpy( &l_, &init, sizeof( init ) ); - } - -#endif - atomic_shared_ptr& operator=( shared_ptr r ) BOOST_SP_NOEXCEPT { boost::detail::spinlock::scoped_lock lock( l_ ); diff --git a/test/allocate_shared_arrays_test.cpp b/test/allocate_shared_arrays_test.cpp index a23930c..373586b 100644 --- a/test/allocate_shared_arrays_test.cpp +++ b/test/allocate_shared_arrays_test.cpp @@ -5,10 +5,9 @@ Copyright 2012-2015 Glen Joseph Fernandes Distributed under the Boost Software License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt) */ -#include -#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) -#include #include +#include +#include template struct creator { @@ -83,9 +82,3 @@ int main() } return boost::report_errors(); } -#else -int main() -{ - return 0; -} -#endif diff --git a/test/atomic_sp_constexpr_test.cpp b/test/atomic_sp_constexpr_test.cpp index ea373bf..e0d2ed3 100644 --- a/test/atomic_sp_constexpr_test.cpp +++ b/test/atomic_sp_constexpr_test.cpp @@ -13,12 +13,7 @@ #include #include -#if defined( BOOST_NO_CXX11_CONSTEXPR ) - -BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_NO_CXX11_CONSTEXPR") -int main() {} - -#elif BOOST_WORKAROUND( BOOST_MSVC, < 1930 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1930 ) // MSVC does not implement static initialization for constexpr constructors BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_MSVC < 1930") @@ -36,11 +31,6 @@ int main() {} BOOST_PRAGMA_MESSAGE("Skipping test due to _LIBCPP_VERSION " BOOST_STRINGIZE(_LIBCPP_VERSION)) int main() {} -#elif defined( BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX ) - -BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX") -int main() {} - #else #include diff --git a/test/make_shared_arrays_test.cpp b/test/make_shared_arrays_test.cpp index 598b974..e9d183c 100644 --- a/test/make_shared_arrays_test.cpp +++ b/test/make_shared_arrays_test.cpp @@ -5,10 +5,9 @@ Copyright 2012-2015 Glen Joseph Fernandes Distributed under the Boost Software License, Version 1.0. (http://www.boost.org/LICENSE_1_0.txt) */ -#include -#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) -#include #include +#include +#include int main() { @@ -46,9 +45,3 @@ int main() } return boost::report_errors(); } -#else -int main() -{ - return 0; -} -#endif diff --git a/test/make_unique_value_test.cpp b/test/make_unique_value_test.cpp index b71ae23..9acfd5f 100644 --- a/test/make_unique_value_test.cpp +++ b/test/make_unique_value_test.cpp @@ -29,7 +29,6 @@ int main() BOOST_TEST(result->x == 0); BOOST_TEST(result->y == 0); } -#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) { std::unique_ptr result = boost::make_unique({ 1, 2 }); @@ -44,6 +43,6 @@ int main() BOOST_TEST(result->x == 1); BOOST_TEST(result->y == 2); } -#endif + return boost::report_errors(); }