diff --git a/include/boost/smart_ptr/allocate_shared_array.hpp b/include/boost/smart_ptr/allocate_shared_array.hpp index 997a5c1..0c0d353 100644 --- a/include/boost/smart_ptr/allocate_shared_array.hpp +++ b/include/boost/smart_ptr/allocate_shared_array.hpp @@ -122,7 +122,7 @@ namespace boost { return boost::shared_ptr(s1, p1); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) template inline typename boost::detail::sp_if_size_array::type allocate_shared(const A& allocator, const T& list) { diff --git a/include/boost/smart_ptr/detail/array_deleter.hpp b/include/boost/smart_ptr/detail/array_deleter.hpp index b43f5fa..4a62f97 100644 --- a/include/boost/smart_ptr/detail/array_deleter.hpp +++ b/include/boost/smart_ptr/detail/array_deleter.hpp @@ -40,7 +40,6 @@ namespace boost { } } #endif -#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) void construct_list(T* memory, std::size_t count, const T* list) { for (object = memory; size < count; size++) { void* p1 = object + size; @@ -53,7 +52,6 @@ namespace boost { ::new(p1) T(list[size % n]); } } -#endif void construct_noinit(T* memory, std::size_t count) { for (object = memory; size < count; size++) { void* p1 = object + size; @@ -98,7 +96,6 @@ namespace boost { } } #endif -#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) void construct_list(T* memory, const T* list) { object = memory; for (std::size_t i = 0; i < N; i++) { @@ -113,7 +110,6 @@ namespace boost { ::new(p1) T(list[i % n]); } } -#endif void construct_noinit(T* memory) { object = memory; for (std::size_t i = 0; i < N; i++) { diff --git a/include/boost/smart_ptr/make_shared_array.hpp b/include/boost/smart_ptr/make_shared_array.hpp index bf9e95f..af59689 100644 --- a/include/boost/smart_ptr/make_shared_array.hpp +++ b/include/boost/smart_ptr/make_shared_array.hpp @@ -121,7 +121,7 @@ namespace boost { return boost::shared_ptr(s1, p1); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) template inline typename boost::detail::sp_if_size_array::type make_shared(const T& list) { diff --git a/make_shared_array.html b/make_shared_array.html index f638555..c5a9797 100644 --- a/make_shared_array.html +++ b/make_shared_array.html @@ -63,7 +63,7 @@ shared_ptr<T[][N]> allocate_shared(const A& allocator, size_t size, initializer_list<T> list); #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) template<typename T, typename... Args> shared_ptr<T[N]> make_shared(const T (&list)[N]); diff --git a/test/allocate_shared_array_init_test.cpp b/test/allocate_shared_array_init_test.cpp index 8ca0d78..1ff437f 100644 --- a/test/allocate_shared_array_init_test.cpp +++ b/test/allocate_shared_array_init_test.cpp @@ -50,7 +50,7 @@ int main() { BOOST_TEST(a1[3].value == 3); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) { boost::shared_ptr a1 = boost::allocate_shared(std::allocator(), { 0, 1, 2, 3 }); BOOST_TEST(a1[0] == 0); diff --git a/test/allocate_shared_arrays_create_test.cpp b/test/allocate_shared_arrays_create_test.cpp index 8f7e052..f764569 100644 --- a/test/allocate_shared_arrays_create_test.cpp +++ b/test/allocate_shared_arrays_create_test.cpp @@ -40,7 +40,7 @@ int main() { BOOST_TEST(a1[1][1][1] == 3); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) { boost::shared_ptr a1 = boost::allocate_shared(std::allocator(), {0, 1, 2, 3}); BOOST_TEST(a1[0] == 0); diff --git a/test/make_shared_array_init_test.cpp b/test/make_shared_array_init_test.cpp index 528c26f..fd61caf 100644 --- a/test/make_shared_array_init_test.cpp +++ b/test/make_shared_array_init_test.cpp @@ -50,7 +50,7 @@ int main() { BOOST_TEST(a1[3].value == 3); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) { boost::shared_ptr a1 = boost::make_shared({ 0, 1, 2, 3 }); BOOST_TEST(a1[0] == 0); diff --git a/test/make_shared_arrays_create_test.cpp b/test/make_shared_arrays_create_test.cpp index c1ef6b9..cc637d1 100644 --- a/test/make_shared_arrays_create_test.cpp +++ b/test/make_shared_arrays_create_test.cpp @@ -41,7 +41,7 @@ int main() { BOOST_TEST(a1[1][1][1] == 3); } #endif -#ifndef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX +#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX) { boost::shared_ptr a1 = boost::make_shared({0, 1, 2, 3}); BOOST_TEST(a1[0] == 0);