From 8cc50a5ce996d669574fa50f2a6f9ee23907a606 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Fri, 9 Nov 2012 18:01:39 +0000
Subject: [PATCH] Add assertion to overload of make_shared and allocate_shared
 for T[N] with initializer lists. Rename detail type to be more intuitive.

[SVN r81267]
---
 include/boost/smart_ptr/allocate_shared_array.hpp | 11 ++++++-----
 include/boost/smart_ptr/detail/array_traits.hpp   | 14 +++++++++++---
 include/boost/smart_ptr/detail/sp_if_array.hpp    |  2 +-
 include/boost/smart_ptr/make_shared_array.hpp     | 15 ++++++++-------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/include/boost/smart_ptr/allocate_shared_array.hpp b/include/boost/smart_ptr/allocate_shared_array.hpp
index f151c00..c3ca93e 100644
--- a/include/boost/smart_ptr/allocate_shared_array.hpp
+++ b/include/boost/smart_ptr/allocate_shared_array.hpp
@@ -23,7 +23,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = size * detail::array_size<T1>::size;
+        size_t n1 = size * detail::array_total<T1>::size;
         detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -41,7 +41,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = size * detail::array_size<T1>::size;
+        size_t n1 = size * detail::array_total<T1>::size;
         detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -58,7 +58,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = detail::array_size<T>::size;
+        size_t n1 = detail::array_total<T>::size;
         detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -79,7 +79,7 @@ namespace boost {
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        size_t n1 = list.size() * detail::array_size<T1>::size;
+        size_t n1 = list.size() * detail::array_total<T1>::size;
         detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -93,13 +93,14 @@ namespace boost {
     template<typename T, typename A>
     inline typename detail::sp_if_size_array<T>::type
     allocate_shared(const A& allocator, typename detail::array_list<T>::type list) {
+        BOOST_ASSERT(list.size() == detail::array_size<T>::size);
         typedef typename detail::array_inner<T>::type T1;
         typedef typename detail::array_base<T1>::type T2;
         typedef const T2 T3;
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        size_t n1 = detail::array_size<T>::size;
+        size_t n1 = detail::array_total<T>::size;
         detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
diff --git a/include/boost/smart_ptr/detail/array_traits.hpp b/include/boost/smart_ptr/detail/array_traits.hpp
index d80798f..6343f71 100644
--- a/include/boost/smart_ptr/detail/array_traits.hpp
+++ b/include/boost/smart_ptr/detail/array_traits.hpp
@@ -13,7 +13,6 @@
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
 #endif
-#include <cstddef>
 
 namespace boost {
     namespace detail {
@@ -27,14 +26,23 @@ namespace boost {
         };
         template<typename T>
         struct array_size {
+        };
+        template<typename T, size_t N>
+        struct array_size<T[N]> {
+            enum {
+                size = N
+            };
+        };
+        template<typename T>
+        struct array_total {
             enum {
                 size = 1
             };
         };
         template<typename T, std::size_t N>
-        struct array_size<T[N]> {
+        struct array_total<T[N]> {
             enum {
-                size = N * array_size<T>::size
+                size = N * array_total<T>::size
             };
         };
         template<typename T> 
diff --git a/include/boost/smart_ptr/detail/sp_if_array.hpp b/include/boost/smart_ptr/detail/sp_if_array.hpp
index 96819b5..3ba3a0e 100644
--- a/include/boost/smart_ptr/detail/sp_if_array.hpp
+++ b/include/boost/smart_ptr/detail/sp_if_array.hpp
@@ -23,7 +23,7 @@ namespace boost {
         template<typename T>
         struct sp_if_size_array {
         };
-        template<typename T, size_t N>
+        template<typename T, std::size_t N>
         struct sp_if_size_array<T[N]> {
             typedef boost::shared_ptr<T[N]> type;
         };
diff --git a/include/boost/smart_ptr/make_shared_array.hpp b/include/boost/smart_ptr/make_shared_array.hpp
index a1a9f40..9e96412 100644
--- a/include/boost/smart_ptr/make_shared_array.hpp
+++ b/include/boost/smart_ptr/make_shared_array.hpp
@@ -23,7 +23,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = size * detail::array_size<T1>::size;
+        size_t n1 = size * detail::array_total<T1>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -41,7 +41,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = size * detail::array_size<T1>::size;
+        size_t n1 = size * detail::array_total<T1>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -58,7 +58,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = detail::array_size<T>::size;
+        size_t n1 = detail::array_total<T>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -79,7 +79,7 @@ namespace boost {
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        size_t n1 = list.size() * detail::array_size<T1>::size;
+        size_t n1 = list.size() * detail::array_total<T1>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -93,13 +93,14 @@ namespace boost {
     template<typename T>
     inline typename detail::sp_if_size_array<T>::type
     make_shared(typename detail::array_list<T>::type list) {
+        BOOST_ASSERT(list.size() == detail::array_size<T>::size);
         typedef typename detail::array_inner<T>::type T1;
         typedef typename detail::array_base<T1>::type T2;
         typedef const T2 T3;
         T1* p1 = 0;
         T2* p2 = 0;
         T3* p3 = 0;
-        size_t n1 = detail::array_size<T>::size;
+        size_t n1 = detail::array_total<T>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -118,7 +119,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = size * detail::array_size<T1>::size;
+        size_t n1 = size * detail::array_total<T1>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);
@@ -135,7 +136,7 @@ namespace boost {
         typedef typename detail::array_base<T1>::type T2;
         T1* p1 = 0;
         T2* p2 = 0;
-        size_t n1 = detail::array_size<T>::size;
+        size_t n1 = detail::array_total<T>::size;
         detail::make_array_helper<T2> a1(n1, &p2);
         detail::array_deleter<T2> d1;
         shared_ptr<T> s1(p1, d1, a1);