Subject: [Boost-commit] svn:boost r81887 - in trunk/boost/smart_ptr: . detail
From: glenfe_at_[hidden]
Date: 2012-12-12 23:20:25
Author: glenfe
Date: 2012-12-12 23:20:23 EST (Wed, 12 Dec 2012)
New Revision: 81887
URL: http://svn.boost.org/trac/boost/changeset/81887
Log:
Two detail utility functions identifier renaming reverted
Text files modified:
trunk/boost/smart_ptr/allocate_shared_array.hpp | 8 ++++----
trunk/boost/smart_ptr/detail/array_deleter.hpp | 8 ++++----
trunk/boost/smart_ptr/make_shared_array.hpp | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
Modified: trunk/boost/smart_ptr/allocate_shared_array.hpp
==============================================================================
--- trunk/boost/smart_ptr/allocate_shared_array.hpp (original)
+++ trunk/boost/smart_ptr/allocate_shared_array.hpp 2012-12-12 23:20:23 EST (Wed, 12 Dec 2012)
@@ -51,7 +51,7 @@
typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_args(p2, boost::detail::sp_forward<Args>(args)...);
+ d2->init(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1);
}
template<typename T, typename A, typename... Args>
@@ -70,7 +70,7 @@
typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_args(p2, boost::detail::sp_forward<Args>(args)...);
+ d2->init(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1);
}
#endif
@@ -184,7 +184,7 @@
typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_value(p2, boost::detail::sp_forward<T2>(value));
+ d2->init(p2, boost::detail::sp_forward<T2>(value));
return boost::shared_ptr<T>(s1, p1);
}
template<typename T, typename A>
@@ -204,7 +204,7 @@
typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_value(p2, boost::detail::sp_forward<T2>(value));
+ d2->init(p2, boost::detail::sp_forward<T2>(value));
return boost::shared_ptr<T>(s1, p1);
}
#endif
Modified: trunk/boost/smart_ptr/detail/array_deleter.hpp
==============================================================================
--- trunk/boost/smart_ptr/detail/array_deleter.hpp (original)
+++ trunk/boost/smart_ptr/detail/array_deleter.hpp 2012-12-12 23:20:23 EST (Wed, 12 Dec 2012)
@@ -33,13 +33,13 @@
object = memory;
}
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- void init_value(T* memory, T&& value) {
+ void init(T* memory, T&& value) {
array_init_value(memory, size, sp_forward<T>(value));
object = memory;
}
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args>
- void init_args(T* memory, Args&&... args) {
+ void init(T* memory, Args&&... args) {
array_init_args(memory, size, sp_forward<Args>(args)...);
object = memory;
}
@@ -84,13 +84,13 @@
object = memory;
}
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
- void init_value(T* memory, T&& value) {
+ void init(T* memory, T&& value) {
array_init_value(memory, N, sp_forward<T>(value));
object = memory;
}
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args>
- void init_args(T* memory, Args&&... args) {
+ void init(T* memory, Args&&... args) {
array_init_args(memory, N, sp_forward<Args>(args)...);
object = memory;
}
Modified: trunk/boost/smart_ptr/make_shared_array.hpp
==============================================================================
--- trunk/boost/smart_ptr/make_shared_array.hpp (original)
+++ trunk/boost/smart_ptr/make_shared_array.hpp 2012-12-12 23:20:23 EST (Wed, 12 Dec 2012)
@@ -51,7 +51,7 @@
typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_args(p2, boost::detail::sp_forward<Args>(args)...);
+ d2->init(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1);
}
template<typename T, typename... Args>
@@ -70,7 +70,7 @@
typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_args(p2, boost::detail::sp_forward<Args>(args)...);
+ d2->init(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1);
}
#endif
@@ -182,7 +182,7 @@
typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_value(p2, boost::detail::sp_forward<T2>(value));
+ d2->init(p2, boost::detail::sp_forward<T2>(value));
return boost::shared_ptr<T>(s1, p1);
}
template<typename T>
@@ -201,7 +201,7 @@
typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
- d2->init_value(p2, boost::detail::sp_forward<T2>(value));
+ d2->init(p2, boost::detail::sp_forward<T2>(value));
return boost::shared_ptr<T>(s1, p1);
}
#endif