Use const T (&)[N] for fixed size arrays instead of std::initializer<T> in overloads of make_shared and allocate_shared for arrays.

[SVN r81641]

include/boost/smart_ptr/allocate_shared_array.hpp

@@ -60,9 +60,11 @@ namespace boost {
     allocate_shared(const A& allocator, Args&&... args) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
+        enum { 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
@@ -97,21 +99,21 @@ namespace boost {
     }
     template<typename T, typename A>
     inline typename boost::detail::sp_if_size_array<T>::type
-    allocate_shared(const A& allocator, 
+    allocate_shared(const A& allocator, const T& list) {
-        std::initializer_list<typename boost::detail::array_inner<T>::type> list) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
-        BOOST_ASSERT(list.size() == boost::detail::array_size<T>::size);
+        enum { 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
         boost::detail::array_deleter<T2[N]>* d2;
-        p3 = reinterpret_cast<T3*>(list.begin());
+        p3 = reinterpret_cast<T3*>(list);
         p1 = reinterpret_cast<T1*>(p2);
         d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
         d2->construct_list(p2, p3);
@@ -124,10 +126,12 @@ namespace boost {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
+        enum { 
+            M = boost::detail::array_total<T1>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        enum { M = boost::detail::array_total<T1>::size };
         std::size_t n1 = M * list.size();
         boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
         boost::detail::array_deleter<T2[]> d1;
@@ -142,21 +146,22 @@ namespace boost {
     template<typename T, typename A>
     inline typename boost::detail::sp_if_size_array<T>::type
     allocate_shared(const A& allocator, 
-        std::initializer_list<typename boost::detail::arrays_inner<T>::type> list) {
+        const typename boost::detail::array_inner<T>::type& list) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
-        BOOST_ASSERT(list.size() == boost::detail::array_size<T1>::size);
+        enum { 
+            M = boost::detail::array_total<T1>::size, 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
-        T3* p3 = 0;
+        T3* p3 = 0;        
-        enum { M = boost::detail::array_total<T1>::size };
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
         boost::detail::array_deleter<T2[N]>* d2;
-        p3 = reinterpret_cast<T3*>(list.begin());
+        p3 = reinterpret_cast<T3*>(list);
         p1 = reinterpret_cast<T1*>(p2);
         d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
         d2->construct_list(p2, p3, M);

include/boost/smart_ptr/detail/array_traits.hpp

@@ -22,8 +22,7 @@ namespace boost {
             typedef typename array_base<T>::type type;
         };
         template<typename T>
-        struct array_size {
+        struct array_size;
-        };
         template<typename T, std::size_t N>
         struct array_size<T[N]> {
             enum {
@@ -43,8 +42,7 @@ namespace boost {
             };
         };
         template<typename T> 
-        struct array_inner {
+        struct array_inner;
-        };
         template<typename T>
         struct array_inner<T[]> {
             typedef T type;
@@ -54,16 +52,11 @@ namespace boost {
             typedef T type;
         };
         template<typename T> 
-        struct arrays_inner {
+        struct arrays_inner;
-        };
         template<typename T, std::size_t N> 
         struct arrays_inner<T[][N]> {
             typedef T type;
         };
-        template<typename T, std::size_t M, std::size_t N> 
-        struct arrays_inner<T[M][N]> {
-            typedef T type;
-        };
     }
 }
 

include/boost/smart_ptr/make_shared_array.hpp

@@ -60,9 +60,11 @@ namespace boost {
     make_shared(Args&&... args) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
+        enum { 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::make_array_helper<T2[N]> a1(&p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
@@ -93,23 +95,24 @@ namespace boost {
         d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
         d2->construct_list(p2, n1, p3);
         return boost::shared_ptr<T>(s1, p1);
-    }
+    }    
     template<typename T>
     inline typename boost::detail::sp_if_size_array<T>::type
-    make_shared(std::initializer_list<typename boost::detail::array_inner<T>::type> list) {
+    make_shared(const T& list) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
-        BOOST_ASSERT(list.size() == boost::detail::array_size<T>::size);
+        enum { 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::make_array_helper<T2[N]> a1(&p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
         boost::detail::array_deleter<T2[N]>* d2;        
-        p3 = reinterpret_cast<T3*>(list.begin());
+        p3 = reinterpret_cast<T3*>(list);
         p1 = reinterpret_cast<T1*>(p2);
         d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
         d2->construct_list(p2, p3);
@@ -122,10 +125,12 @@ namespace boost {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
+        enum { 
+            M = boost::detail::array_total<T1>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        enum { M = boost::detail::array_total<T1>::size };
         std::size_t n1 = M * size;
         boost::detail::make_array_helper<T2[]> a1(n1, &p2);
         boost::detail::array_deleter<T2[]> d1;
@@ -139,21 +144,22 @@ namespace boost {
     }
     template<typename T>
     inline typename boost::detail::sp_if_size_array<T>::type
-    make_shared(std::initializer_list<typename boost::detail::arrays_inner<T>::type> list) {
+    make_shared(const typename boost::detail::array_inner<T>::type& list) {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
         typedef const T2 T3;
-        BOOST_ASSERT(list.size() == boost::detail::array_size<T1>::size);
+        enum { 
+            M = boost::detail::array_total<T1>::size,
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        enum { M = boost::detail::array_total<T1>::size };
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::make_array_helper<T2[N]> a1(&p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);
         boost::detail::array_deleter<T2[N]>* d2;        
-        p3 = reinterpret_cast<T3*>(list.begin());
+        p3 = reinterpret_cast<T3*>(list);
         p1 = reinterpret_cast<T1*>(p2);
         d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
         d2->construct_list(p2, p3, M);
@@ -182,9 +188,11 @@ namespace boost {
     make_shared_noinit() {
         typedef typename boost::detail::array_inner<T>::type T1;
         typedef typename boost::detail::array_base<T1>::type T2;
+        enum { 
+            N = boost::detail::array_total<T>::size 
+        };
         T1* p1 = 0;
         T2* p2 = 0;
-        enum { N = boost::detail::array_total<T>::size };
         boost::detail::make_array_helper<T2[N]> a1(&p2);
         boost::detail::array_deleter<T2[N]> d1;
         boost::shared_ptr<T> s1(p1, d1, a1);

make_shared_array.html

@@ -54,25 +54,25 @@
     shared_ptr&lt;T[]&gt; <a href="#functions">make_shared</a>(initializer_list&lt;T&gt; list);
 
     template&lt;typename T, typename... Args&gt;
-    shared_ptr&lt;T[N]&gt; <a href="#functions">make_shared</a>(initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[N]&gt; <a href="#functions">make_shared</a>(const T (&amp;list)[N]);
 
     template&lt;typename T, typename... Args&gt;
     shared_ptr&lt;T[][N]&gt; <a href="#functions">make_shared</a>(size_t size, initializer_list&lt;T&gt; list);
 
     template&lt;typename T, typename... Args&gt;
-    shared_ptr&lt;T[M][N]&gt; <a href="#functions">make_shared</a>(initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[M][N]&gt; <a href="#functions">make_shared</a>(const T (&amp;list)[N]);
 
     template&lt;typename T, typename A, typename... Args&gt;
     shared_ptr&lt;T[]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, initializer_list&lt;T&gt; list);
 
     template&lt;typename T, typename A, typename... Args&gt;
-    shared_ptr&lt;T[N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, const T (&amp;list)[N]);
 
     template&lt;typename T, typename A, typename... Args&gt;
     shared_ptr&lt;T[][N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, size_t size, initializer_list&lt;T&gt; list);
 
     template&lt;typename T, typename A, typename... Args&gt;
-    shared_ptr&lt;T[M][N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[M][N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, const T (&amp;list)[N]);
 #endif
 
     template&lt;typename T&gt;
@@ -141,9 +141,9 @@ template&lt;typename T, typename A, typename... Args&gt;
         from the initializer list.</p>
     </blockquote>
     <pre>template&lt;typename T, typename... Args&gt;
-    shared_ptr&lt;T[N]&gt; make_shared(initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[N]&gt; make_shared(const T (&amp;list)[N]);
 template&lt;typename T, typename A, typename... Args&gt;
-    shared_ptr&lt;T[N]&gt; allocate_shared(const A&amp; allocator, initializer_list&lt;T&gt; list);</pre>
+    shared_ptr&lt;T[N]&gt; allocate_shared(const A&amp; allocator, const T (&amp;list)[N]);</pre>
     <blockquote>
       <p><b>Description:</b> These overloads of the utilities above are for a 
         fixed size array.</p>
@@ -157,9 +157,9 @@ template&lt;typename T, typename A, typename... Args&gt;
         from the initializer list.</p>
     </blockquote>
     <pre>template&lt;typename T, typename... Args&gt;
-    shared_ptr&lt;T[M][N]&gt; make_shared(initializer_list&lt;T&gt; list);
+    shared_ptr&lt;T[M][N]&gt; make_shared(const T (&amp;list)[N]);
 template&lt;typename T, typename A, typename... Args&gt;
-    shared_ptr&lt;T[M][N]&gt; allocate_shared(const A&amp; allocator, initializer_list&lt;T&gt; list);</pre>
+    shared_ptr&lt;T[M][N]&gt; allocate_shared(const A&amp; allocator, const T (&amp;list)[N]);</pre>
     <blockquote>
       <p><b>Description:</b> These overloads of the utilities above are for a 
         fixed size array.</p>

test/allocate_shared_arrays_create_test.cpp

@@ -11,6 +11,20 @@
 
 int main() {
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+    {
+        boost::shared_ptr<int[]> a1 = boost::allocate_shared<int[]>(std::allocator<int>(), {0, 1, 2, 3});
+        BOOST_TEST(a1[0] == 0);
+        BOOST_TEST(a1[1] == 1);
+        BOOST_TEST(a1[2] == 2);
+        BOOST_TEST(a1[3] == 3);
+    }
+    {
+        boost::shared_ptr<int[4]> a1 = boost::allocate_shared<int[4]>(std::allocator<int>(), {0, 1, 2, 3});
+        BOOST_TEST(a1[0] == 0);
+        BOOST_TEST(a1[1] == 1);
+        BOOST_TEST(a1[2] == 2);
+        BOOST_TEST(a1[3] == 3);
+    }
     {
         boost::shared_ptr<int[][2]> a1 = boost::allocate_shared<int[][2]>(std::allocator<int>(), { {0, 1}, {2, 3} });
         BOOST_TEST(a1[0][0] == 0);

test/make_shared_arrays_create_test.cpp

@@ -12,6 +12,20 @@
 
 int main() {
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
+    {
+        boost::shared_ptr<int[]> a1 = boost::make_shared<int[]>({0, 1, 2, 3});
+        BOOST_TEST(a1[0] == 0);
+        BOOST_TEST(a1[1] == 1);
+        BOOST_TEST(a1[2] == 2);
+        BOOST_TEST(a1[3] == 3);
+    }
+    {
+        boost::shared_ptr<int[4]> a1 = boost::make_shared<int[4]>({0, 1, 2, 3});
+        BOOST_TEST(a1[0] == 0);
+        BOOST_TEST(a1[1] == 1);
+        BOOST_TEST(a1[2] == 2);
+        BOOST_TEST(a1[3] == 3);
+    }
     {
         boost::shared_ptr<int[][2]> a1 = boost::make_shared<int[][2]>({ {0, 1}, {2, 3} });
         BOOST_TEST(a1[0][0] == 0);