boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-08-01 21:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Glen Fernandes
2017-03-05 22:09:34 -05:00
parent 494c0cd2c0 6ef791c715
commit 79e675c727
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,37 +350,36 @@ sp_array_default(T* storage, std::size_t size)
} }
#endif #endif
template<class T, class U> template<class T, std::size_t N>
struct sp_less_align { struct sp_less_align {
enum { enum {
value = (boost::alignment_of<T>::value) < value = (boost::alignment_of<T>::value) < N
(boost::alignment_of<U>::value)
}; };
}; };
template<class T> template<class T, std::size_t N>
BOOST_CONSTEXPR inline std::size_t
sp_objects(std::size_t size) BOOST_NOEXCEPT
{
return size / sizeof(T);
}
template<class T, class U>
BOOST_CONSTEXPR inline BOOST_CONSTEXPR inline
typename sp_enable<sp_less_align<T, U>::value, std::size_t>::type typename sp_enable<sp_less_align<T, N>::value, std::size_t>::type
sp_align(std::size_t size) BOOST_NOEXCEPT sp_align(std::size_t size) BOOST_NOEXCEPT
{ {
return (sizeof(T) * size + sizeof(U) - 1) & ~(sizeof(U) - 1); return (sizeof(T) * size + N - 1) & ~(N - 1);
} }
template<class T, class U> template<class T, std::size_t N>
BOOST_CONSTEXPR inline BOOST_CONSTEXPR inline
typename sp_enable<!sp_less_align<T, U>::value, std::size_t>::type typename sp_enable<!sp_less_align<T, N>::value, std::size_t>::type
sp_align(std::size_t size) BOOST_NOEXCEPT sp_align(std::size_t size) BOOST_NOEXCEPT
{ {
return sizeof(T) * size; return sizeof(T) * size;
} }
template<class T>
BOOST_CONSTEXPR inline std::size_t
sp_types(std::size_t size) BOOST_NOEXCEPT
{
return (size + sizeof(T) - 1) / sizeof(T);
}
template<class T, std::size_t N> template<class T, std::size_t N>
class sp_size_array_deleter { class sp_size_array_deleter {
public: public:
@@ -667,19 +666,17 @@ public:
value_type* allocate(std::size_t count) { value_type* allocate(std::size_t count) {
type_allocator allocator(allocator_); type_allocator allocator(allocator_);
std::size_t head = sp_align<value_type, type>(count); std::size_t node = sp_align<value_type, alignment>(count);
std::size_t tail = sp_align<T, type>(size_); std::size_t size = sp_types<type>(node + sizeof(T) * size_);
std::size_t size = sp_objects<type>(head + tail);
type* address = allocator.allocate(size); type* address = allocator.allocate(size);
*result_ = address + sp_objects<type>(head); *result_ = reinterpret_cast<char*>(address) + node;
return reinterpret_cast<value_type*>(address); return reinterpret_cast<value_type*>(address);
} }
void deallocate(value_type* value, std::size_t count) { void deallocate(value_type* value, std::size_t count) {
type_allocator allocator(allocator_); type_allocator allocator(allocator_);
std::size_t head = sp_align<value_type, type>(count); std::size_t node = sp_align<value_type, alignment>(count);
std::size_t tail = sp_align<T, type>(size_); std::size_t size = sp_types<type>(node + sizeof(T) * size_);
std::size_t size = sp_objects<type>(head + tail);
allocator.deallocate(reinterpret_cast<type*>(value), size); allocator.deallocate(reinterpret_cast<type*>(value), size);
} }