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

Fix use of rebind_traits and rebind_alloc

Browse Source
This commit is contained in:
Glen Fernandes
2014-02-04 08:43:36 -08:00
parent 154a274916
commit e8595a05af
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,16 +46,13 @@ namespace boost {
#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<Y>::other YA; template rebind_alloc<Y> YA;
typedef typename std::allocator_traits<A>:: typedef typename std::allocator_traits<A>::
template rebind_alloc<char>::other CA; template rebind_alloc<char> CA;
typedef typename std::allocator_traits<A>:: typedef typename std::allocator_traits<A>::
template rebind_traits<Y>::other YT; template rebind_traits<Y> YT;
typedef typename std::allocator_traits<A>:: typedef typename std::allocator_traits<A>::
template rebind_traits<char>::other CT; template rebind_traits<char> CT;
#else #else
typedef typename A::template rebind<Y>::other YA; typedef typename A::template rebind<Y>::other YA;
typedef typename A::template rebind<char>::other CA; typedef typename A::template rebind<char>::other CA;

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

@ -90,10 +90,9 @@ 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>::other TA; template rebind_alloc<type> TA;
typedef typename std::allocator_traits<A>:: typedef typename std::allocator_traits<A>::
template rebind_traits<type>::other TT; template rebind_traits<type> TT;
#endif #endif
void destroy(type*, std::size_t, boost::true_type) { void destroy(type*, std::size_t, boost::true_type) {