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

Use Boost.Align for alignment

Browse Source
This commit is contained in:
Glen Fernandes
2014-05-04 08:14:26 -07:00
parent 1968d17d2f
commit d523c3423e
2 changed files with 11 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,9 +9,9 @@
#ifndef BOOST_SMART_PTR_DETAIL_ARRAY_ALLOCATOR_HPP #ifndef BOOST_SMART_PTR_DETAIL_ARRAY_ALLOCATOR_HPP
#define BOOST_SMART_PTR_DETAIL_ARRAY_ALLOCATOR_HPP #define BOOST_SMART_PTR_DETAIL_ARRAY_ALLOCATOR_HPP
#include <boost/align/align.hpp>
#include <boost/smart_ptr/detail/array_traits.hpp> #include <boost/smart_ptr/detail/array_traits.hpp>
#include <boost/smart_ptr/detail/array_utility.hpp> #include <boost/smart_ptr/detail/array_utility.hpp>
#include <boost/smart_ptr/detail/sp_align.hpp>
#include <boost/type_traits/alignment_of.hpp> #include <boost/type_traits/alignment_of.hpp>
namespace boost { namespace boost {
@@ -125,20 +125,17 @@ namespace boost {
data(other.data) { data(other.data) {
} }
pointer allocate(size_type count, const_void_pointer hint = 0) { pointer allocate(size_type count, const_void_pointer = 0) {
enum { enum {
M = boost::alignment_of<type>::value M = boost::alignment_of<type>::value
}; };
std::size_t n1 = count * sizeof(value_type); std::size_t n1 = count * sizeof(value_type);
std::size_t n2 = data.size * sizeof(type) + M; std::size_t n2 = data.size * sizeof(type);
std::size_t n3 = n2 + M;
CA ca(allocator()); CA ca(allocator());
#if !defined(BOOST_NO_CXX11_ALLOCATOR) void* p1 = ca.allocate(n1 + n3);
void* p1 = CT::allocate(ca, n1 + n2, hint);
#else
void* p1 = ca.allocate(n1 + n2, hint);
#endif
void* p2 = static_cast<char*>(p1) + n1; void* p2 = static_cast<char*>(p1) + n1;
p2 = sp_align(M, p2); (void)boost::alignment::align(M, n2, p2, n3);
*data.result = static_cast<type*>(p2); *data.result = static_cast<type*>(p2);
return static_cast<value_type*>(p1); return static_cast<value_type*>(p1);
} }
@@ -243,10 +240,11 @@ namespace boost {
M = boost::alignment_of<type>::value M = boost::alignment_of<type>::value
}; };
std::size_t n1 = count * sizeof(Y); std::size_t n1 = count * sizeof(Y);
std::size_t n2 = data.size * sizeof(type) + M; std::size_t n2 = data.size * sizeof(type);
void* p1 = ::operator new(n1 + n2); std::size_t n3 = n2 + M;
void* p1 = ::operator new(n1 + n3);
void* p2 = static_cast<char*>(p1) + n1; void* p2 = static_cast<char*>(p1) + n1;
p2 = sp_align(M, p2); (void)boost::alignment::align(M, n2, p2, n3);
*data.result = static_cast<type*>(p2); *data.result = static_cast<type*>(p2);
return static_cast<Y*>(p1); return static_cast<Y*>(p1);
} }
@@ -278,6 +276,7 @@ namespace boost {
} }
void destroy(pointer memory) { void destroy(pointer memory) {
(void)memory;
memory->~Y(); memory->~Y();
} }
#endif #endif

26
include/boost/smart_ptr/detail/sp_align.hpp
View File

@@ -1,26 +0,0 @@
/*
* Copyright (c) 2014 Glen Joseph Fernandes
* glenfe at live dot com
*
* Distributed under the Boost Software License,
* Version 1.0. (See accompanying file LICENSE_1_0.txt
* or copy at http://boost.org/LICENSE_1_0.txt)
*/
#ifndef BOOST_SMART_PTR_DETAIL_SP_ALIGN_HPP
#define BOOST_SMART_PTR_DETAIL_SP_ALIGN_HPP
#include <cstddef>
namespace boost {
namespace detail {
inline void* sp_align(std::size_t alignment, void* ptr) {
std::size_t n1 = (std::size_t)ptr % alignment;
if (n1 != 0) {
ptr = (char*)ptr + alignment - n1;
}
return ptr;
}
}
}
#endif