feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Two detail utility functions identifier renaming reverted

Browse Source 
[SVN r81887]
This commit is contained in:
Glen Fernandes
2012-12-13 04:20:23 +00:00
parent 4ba8d879f1
commit 619b168614
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/smart_ptr/allocate_shared_array.hpp
View File

@@ -51,7 +51,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[]>* D2; typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename A, typename... Args> template<typename T, typename A, typename... Args>
@@ -70,7 +70,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[N]>* D2; typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif
@@ -184,7 +184,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[]>* D2; typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename A> template<typename T, typename A>
@@ -204,7 +204,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[N]>* D2; typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif

8
include/boost/smart_ptr/detail/array_deleter.hpp
View File

@@ -33,13 +33,13 @@ namespace boost {
object = memory; object = memory;
} }
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) #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)); array_init_value(memory, size, sp_forward<T>(value));
object = memory; object = memory;
} }
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args> 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)...); array_init_args(memory, size, sp_forward<Args>(args)...);
object = memory; object = memory;
} }
@@ -84,13 +84,13 @@ namespace boost {
object = memory; object = memory;
} }
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) #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)); array_init_value(memory, N, sp_forward<T>(value));
object = memory; object = memory;
} }
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args> 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)...); array_init_args(memory, N, sp_forward<Args>(args)...);
object = memory; object = memory;
} }

8
include/boost/smart_ptr/make_shared_array.hpp
View File

@@ -51,7 +51,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[]>* D2; typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename... Args> template<typename T, typename... Args>
@@ -70,7 +70,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[N]>* D2; typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif
@@ -182,7 +182,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[]>* D2; typedef boost::detail::array_deleter<T2[]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T> template<typename T>
@@ -201,7 +201,7 @@ namespace boost {
typedef boost::detail::array_deleter<T2[N]>* D2; typedef boost::detail::array_deleter<T2[N]>* D2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter()); 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); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif