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

Support allocation_ptr of const and volatile types

Browse Source
This commit is contained in:
Glen Fernandes
2019-05-04 08:37:15 -04:00
parent 872bf10347
commit 4742143605
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/smart_ptr/allocation_ptr.hpp
View File

@ -10,6 +10,7 @@ Distributed under the Boost Software License, Version 1.0.
#include <boost/smart_ptr/detail/sp_noexcept.hpp> #include <boost/smart_ptr/detail/sp_noexcept.hpp>
#include <boost/smart_ptr/detail/sp_nullptr_t.hpp> #include <boost/smart_ptr/detail/sp_nullptr_t.hpp>
#include <boost/type_traits/remove_cv.hpp>
#include <boost/assert.hpp> #include <boost/assert.hpp>
#if !defined(BOOST_NO_CXX11_ALLOCATOR) #if !defined(BOOST_NO_CXX11_ALLOCATOR)
#include <memory> #include <memory>
@ -18,15 +19,19 @@ Distributed under the Boost Software License, Version 1.0.
namespace boost { namespace boost {
namespace detail { namespace detail {
#if !defined(BOOST_NO_CXX11_ALLOCATOR)
template<class T, class A> template<class T, class A>
struct sp_allocation_ptr { struct sp_allocation_ptr {
#if !defined(BOOST_NO_CXX11_ALLOCATOR)
typedef typename std::allocator_traits<A>::template typedef typename std::allocator_traits<A>::template
rebind_traits<T>::pointer type; rebind_traits<typename boost::remove_cv<T>::type>::pointer type;
#else
typedef typename A::template rebind<T>::other::pointer type;
#endif
}; };
#else
template<class T, class A>
struct sp_allocation_ptr {
typedef typename A::template
rebind<typename boost::remove_cv<T>::type>::other::pointer type;
};
#endif
} /* detail */ } /* detail */

18
test/allocation_ptr_test.cpp
View File

@ -17,18 +17,36 @@ void test_pointer(scalar)
{ {
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int, BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int,
boost::default_allocator<void> >::pointer, int*); boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int,
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int,
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int,
boost::default_allocator<void> >::pointer, int*);
} }
void test_pointer(unbounded_array) void test_pointer(unbounded_array)
{ {
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[], BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[],
boost::default_allocator<void> >::pointer, int*); boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int[],
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int[],
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int[],
boost::default_allocator<void> >::pointer, int*);
} }
void test_pointer(bounded_array) void test_pointer(bounded_array)
{ {
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[5], BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<int[5],
boost::default_allocator<void> >::pointer, int*); boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const int[5],
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<const volatile int[5],
boost::default_allocator<void> >::pointer, int*);
BOOST_TEST_TRAIT_SAME(boost::allocation_ptr<volatile int[5],
boost::default_allocator<void> >::pointer, int*);
} }
void test_element_type(scalar) void test_element_type(scalar)