update boost on linux
This commit is contained in:
@@ -48,11 +48,11 @@ namespace ipcdetail {
|
||||
|
||||
template<class VoidPointer>
|
||||
class basic_multiallocation_chain
|
||||
: public boost::container::container_detail::
|
||||
: public boost::container::dtl::
|
||||
basic_multiallocation_chain<VoidPointer>
|
||||
{
|
||||
BOOST_MOVABLE_BUT_NOT_COPYABLE(basic_multiallocation_chain)
|
||||
typedef boost::container::container_detail::
|
||||
typedef boost::container::dtl::
|
||||
basic_multiallocation_chain<VoidPointer> base_t;
|
||||
public:
|
||||
|
||||
|
||||
@@ -72,11 +72,11 @@ class simple_seq_fit_impl
|
||||
typedef MutexFamily mutex_family;
|
||||
//!Pointer type to be used with the rest of the Interprocess framework
|
||||
typedef VoidPointer void_pointer;
|
||||
typedef boost::container::container_detail::
|
||||
typedef boost::container::dtl::
|
||||
basic_multiallocation_chain<VoidPointer> multiallocation_chain;
|
||||
|
||||
typedef typename boost::intrusive::pointer_traits<char_ptr>::difference_type difference_type;
|
||||
typedef typename boost::container::container_detail::make_unsigned<difference_type>::type size_type;
|
||||
typedef typename boost::container::dtl::make_unsigned<difference_type>::type size_type;
|
||||
|
||||
|
||||
private:
|
||||
@@ -270,8 +270,8 @@ class simple_seq_fit_impl
|
||||
void priv_mark_new_allocated_block(block_ctrl *block);
|
||||
|
||||
public:
|
||||
static const size_type Alignment = ::boost::container::container_detail::alignment_of
|
||||
< ::boost::container::container_detail::max_align_t>::value;
|
||||
static const size_type Alignment = ::boost::container::dtl::alignment_of
|
||||
< ::boost::container::dtl::max_align_t>::value;
|
||||
private:
|
||||
static const size_type BlockCtrlBytes = ipcdetail::ct_rounded_size<sizeof(block_ctrl), Alignment>::value;
|
||||
static const size_type BlockCtrlUnits = BlockCtrlBytes/Alignment;
|
||||
@@ -590,7 +590,7 @@ inline T* simple_seq_fit_impl<MutexFamily, VoidPointer>::
|
||||
void *raw_reuse = reuse_ptr;
|
||||
void * const ret = priv_allocation_command
|
||||
(command, limit_size, prefer_in_recvd_out_size, raw_reuse, sizeof(T));
|
||||
BOOST_ASSERT(0 == ((std::size_t)ret % ::boost::container::container_detail::alignment_of<T>::value));
|
||||
BOOST_ASSERT(0 == ((std::size_t)ret % ::boost::container::dtl::alignment_of<T>::value));
|
||||
reuse_ptr = static_cast<T*>(raw_reuse);
|
||||
return static_cast<T*>(ret);
|
||||
}
|
||||
|
||||
@@ -94,7 +94,7 @@ class rbtree_best_fit
|
||||
typedef ipcdetail::basic_multiallocation_chain<VoidPointer> multiallocation_chain;
|
||||
|
||||
typedef typename boost::intrusive::pointer_traits<char_ptr>::difference_type difference_type;
|
||||
typedef typename boost::container::container_detail::make_unsigned<difference_type>::type size_type;
|
||||
typedef typename boost::container::dtl::make_unsigned<difference_type>::type size_type;
|
||||
|
||||
#if !defined(BOOST_INTERPROCESS_DOXYGEN_INVOKED)
|
||||
|
||||
@@ -109,7 +109,7 @@ class rbtree_best_fit
|
||||
{
|
||||
//!This block's memory size (including block_ctrl
|
||||
//!header) in Alignment units
|
||||
size_type m_prev_size : sizeof(size_type)*CHAR_BIT;
|
||||
size_type m_prev_size;
|
||||
size_type m_size : sizeof(size_type)*CHAR_BIT - 2;
|
||||
size_type m_prev_allocated : 1;
|
||||
size_type m_allocated : 1;
|
||||
@@ -331,8 +331,8 @@ class rbtree_best_fit
|
||||
public:
|
||||
|
||||
static const size_type Alignment = !MemAlignment
|
||||
? size_type(::boost::container::container_detail::alignment_of
|
||||
< ::boost::container::container_detail::max_align_t>::value)
|
||||
? size_type(::boost::container::dtl::alignment_of
|
||||
< ::boost::container::dtl::max_align_t>::value)
|
||||
: size_type(MemAlignment)
|
||||
;
|
||||
|
||||
@@ -340,7 +340,7 @@ class rbtree_best_fit
|
||||
//Due to embedded bits in size, Alignment must be at least 4
|
||||
BOOST_STATIC_ASSERT((Alignment >= 4));
|
||||
//Due to rbtree size optimizations, Alignment must have at least pointer alignment
|
||||
BOOST_STATIC_ASSERT((Alignment >= ::boost::container::container_detail::alignment_of<void_pointer>::value));
|
||||
BOOST_STATIC_ASSERT((Alignment >= ::boost::container::dtl::alignment_of<void_pointer>::value));
|
||||
static const size_type AlignmentMask = (Alignment - 1);
|
||||
static const size_type BlockCtrlBytes = ipcdetail::ct_rounded_size<sizeof(block_ctrl), Alignment>::value;
|
||||
static const size_type BlockCtrlUnits = BlockCtrlBytes/Alignment;
|
||||
@@ -692,7 +692,7 @@ inline T* rbtree_best_fit<MutexFamily, VoidPointer, MemAlignment>::
|
||||
void* raw_reuse = reuse;
|
||||
void* const ret = priv_allocation_command(command, limit_size, prefer_in_recvd_out_size, raw_reuse, sizeof(T));
|
||||
reuse = static_cast<T*>(raw_reuse);
|
||||
BOOST_ASSERT(0 == ((std::size_t)ret % ::boost::container::container_detail::alignment_of<T>::value));
|
||||
BOOST_ASSERT(0 == ((std::size_t)ret % ::boost::container::dtl::alignment_of<T>::value));
|
||||
return static_cast<T*>(ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user