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

Make detail::as_allocator template C++11 friendly

Browse Source
This commit is contained in:
Glen Fernandes
2014-02-04 14:57:34 -08:00
parent af5141d492
commit 3ac6dbbf08
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/boost/smart_ptr/detail/array_allocator.hpp
View File

@ -143,21 +143,32 @@ namespace boost {
#endif #endif
} }
void construct(pointer memory, const Y& value) {
#if !defined(BOOST_NO_CXX11_ALLOCATOR) #if !defined(BOOST_NO_CXX11_ALLOCATOR)
YT::construct(pair, memory, value); #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
!defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template<typename U, typename... Args>
void construct(U* memory, Args&&... args) {
YT::construct(pair, memory, std::forward<Args>(args)...);
}
#else #else
pair.construct(memory, value); template<typename U>
void construct(U* memory, const Y& value) {
YT::construct(pair, memory, value);
}
#endif #endif
template<typename U>
void destroy(U* memory) {
YT::destroy(pair, memory);
}
#else
void construct(pointer memory, const Y& value) {
pair.construct(memory, value);
} }
void destroy(pointer memory) { void destroy(pointer memory) {
#if !defined(BOOST_NO_CXX11_ALLOCATOR)
YT::destroy(pair, memory);
#else
pair.destroy(memory); pair.destroy(memory);
#endif
} }
#endif
template<typename U> template<typename U>
bool operator==(const as_allocator<T, A, U>& other) const { bool operator==(const as_allocator<T, A, U>& other) const {

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

@ -74,7 +74,6 @@ namespace boost {
} }
private: private:
#if !defined(BOOST_NO_CXX11_ALLOCATOR) #if !defined(BOOST_NO_CXX11_ALLOCATOR)
typedef typename std::allocator_traits<A>:: typedef typename std::allocator_traits<A>::
template rebind_alloc<type> TA; template rebind_alloc<type> TA;
@ -314,7 +313,6 @@ namespace boost {
#endif #endif
} }
private:
type* object; type* object;
}; };
} }