From 6e269872df83e8be2939c90bd8c4afd3ca61ea22 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Tue, 11 Dec 2012 18:04:09 +0000
Subject: [PATCH] Explicitly name detail array construct overloads for
 different parameter types.

[SVN r81859]
---
 include/boost/smart_ptr/detail/array_deleter.hpp | 8 ++++----
 include/boost/smart_ptr/detail/array_utility.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boost/smart_ptr/detail/array_deleter.hpp b/include/boost/smart_ptr/detail/array_deleter.hpp
index 8ef0d11..7909265 100644
--- a/include/boost/smart_ptr/detail/array_deleter.hpp
+++ b/include/boost/smart_ptr/detail/array_deleter.hpp
@@ -34,13 +34,13 @@ namespace boost {
             }
 #if defined(BOOST_HAS_RVALUE_REFS)
             void construct(T* memory, T&& value) {
-                array_construct(memory, size, sp_forward<T>(value));
+                array_construct_value(memory, size, sp_forward<T>(value));
                 object = memory;                
             }
 #if defined(BOOST_HAS_VARIADIC_TMPL)
             template<typename... Args>
             void construct(T* memory, Args&&... args) {
-                array_construct(memory, size, sp_forward<Args>(args)...);
+                array_construct_args(memory, size, sp_forward<Args>(args)...);
                 object = memory;
             }
 #endif
@@ -85,13 +85,13 @@ namespace boost {
             }
 #if defined(BOOST_HAS_RVALUE_REFS)
             void construct(T* memory, T&& value) {
-                array_construct(memory, N, sp_forward<T>(value));
+                array_construct_value(memory, N, sp_forward<T>(value));
                 object = memory;                
             }
 #if defined(BOOST_HAS_VARIADIC_TMPL)
             template<typename... Args>
             void construct(T* memory, Args&&... args) {
-                array_construct(memory, N, sp_forward<Args>(args)...);
+                array_construct_args(memory, N, sp_forward<Args>(args)...);
                 object = memory;
             }
 #endif
diff --git a/include/boost/smart_ptr/detail/array_utility.hpp b/include/boost/smart_ptr/detail/array_utility.hpp
index b584599..3b685ad 100644
--- a/include/boost/smart_ptr/detail/array_utility.hpp
+++ b/include/boost/smart_ptr/detail/array_utility.hpp
@@ -55,7 +55,7 @@ namespace boost {
         }
 #if defined(BOOST_HAS_RVALUE_REFS)
         template<typename T>
-        inline void array_construct(T* memory, std::size_t size, T&& value) {
+        inline void array_construct_value(T* memory, std::size_t size, T&& value) {
             std::size_t i = 0;
             try {
                 for (; i < size; i++) {
@@ -69,7 +69,7 @@ namespace boost {
         }
 #if defined(BOOST_HAS_VARIADIC_TMPL)
         template<typename T, typename... Args>
-        inline void array_construct(T* memory, std::size_t size, Args&&... args) {
+        inline void array_construct_args(T* memory, std::size_t size, Args&&... args) {
             std::size_t i = 0;
             try {
                 for (; i < size; i++) {