boost/container
2
0
Fork 0
mirror of https://github.com/boostorg/container.git synced 2026-01-19 04:02:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:boostorg/container into develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2025-09-06 12:40:34 +02:00
parent 9ad078f9b3 f0708dedc9
commit ada5ee3076
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/container/allocator.hpp
View File

@@ -116,7 +116,7 @@ class allocator
allocator& operator=(const allocator<T2, Version2, AllocationDisableMask2>&);
BOOST_STATIC_CONSTEXPR unsigned int ForbiddenMask =
BOOST_CONTAINER_ALLOCATE_NEW | BOOST_CONTAINER_EXPAND_BWD | BOOST_CONTAINER_EXPAND_FWD ;
BOOST_CONTAINER_ALLOCATE_NEW | BOOST_CONTAINER_EXPAND_BWD | BOOST_CONTAINER_EXPAND_FWD;
//The mask can't disable all the allocation types
BOOST_CONTAINER_STATIC_ASSERT(( (AllocationDisableMask & ForbiddenMask) != ForbiddenMask ));

4
include/boost/container/detail/copy_move_algo.hpp
View File

@@ -228,7 +228,7 @@ inline F memmove(I f, I l, F r) BOOST_NOEXCEPT_OR_NOTHROW
const value_type *const end_raw = boost::movelib::iterator_to_raw_pointer(l);
if(BOOST_LIKELY(beg_raw != end_raw && dest_raw && beg_raw)){
const std::size_t n = std::size_t(end_raw - beg_raw) ;
std::memmove(dest_raw, beg_raw, sizeof(value_type)*n);
std::memmove(reinterpret_cast<void *>(dest_raw), beg_raw, sizeof(value_type)*n);
r += static_cast<r_difference_type>(n);
}
return r;
@@ -955,7 +955,7 @@ inline typename dtl::enable_if_memtransfer_copy_assignable<I, F, F>::type
const std::size_t n = boost::container::iterator_udistance(f, l);
if (BOOST_LIKELY(n != 0)){
r -= n;
std::memmove((boost::movelib::iterator_to_raw_pointer)(r), (boost::movelib::iterator_to_raw_pointer)(f), sizeof(value_type)*n);
std::memmove(reinterpret_cast<void *>((boost::movelib::iterator_to_raw_pointer)(r)), (boost::movelib::iterator_to_raw_pointer)(f), sizeof(value_type)*n);
}
return r;
}

4
include/boost/container/detail/pair.hpp
View File

@@ -555,7 +555,7 @@ template<class A, class B>
struct is_trivially_copy_assignable
<boost::container::dtl::pair<A,B> >
{
BOOST_STATIC_CONSTEXPR bool value = false ;
BOOST_STATIC_CONSTEXPR bool value = false;
};
template<class T>
@@ -593,7 +593,7 @@ template<class A, class B>
struct is_trivially_destructible<boost::container::dtl::pair<A,B> >
{
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_destructible<A>::value &&
boost::move_detail::is_trivially_destructible<B>::value ;
boost::move_detail::is_trivially_destructible<B>::value;
};

2
include/boost/container/list.hpp
View File

@@ -90,7 +90,7 @@ struct intrusive_list_type
, dtl::bi::size_type
<typename allocator_traits_type::size_type>
>::type container_type;
typedef container_type type ;
typedef container_type type;
};
} //namespace dtl {

2
include/boost/container/new_allocator.hpp
View File

@@ -163,7 +163,7 @@ class new_allocator
void deallocate(pointer ptr, size_type n) BOOST_NOEXCEPT_OR_NOTHROW
{
(void)n;
# if __cpp_sized_deallocation
# if defined(__cpp_sized_deallocation)
::operator delete((void*)ptr, n * sizeof(T));
#else
::operator delete((void*)ptr);

2
include/boost/container/slist.hpp
View File

@@ -94,7 +94,7 @@ struct intrusive_slist_type
, dtl::bi::size_type
<typename allocator_traits_type::size_type>
>::type container_type;
typedef container_type type ;
typedef container_type type;
};
} //namespace dtl {

2
test/allocator_argument_tester.hpp
View File

@@ -74,7 +74,7 @@ class propagation_test_allocator
void deallocate(value_type *ptr, std::size_t n)
{
(void)n;
# if __cpp_sized_deallocation
# if defined(__cpp_sized_deallocation)
::operator delete((void*)ptr, n * sizeof(value_type));
#else
::operator delete((void*)ptr);

4
test/dummy_test_allocator.hpp
View File

@@ -65,7 +65,7 @@ class simple_allocator
void deallocate(T *ptr, std::size_t n) BOOST_NOEXCEPT_OR_NOTHROW
{
(void)n;
# if __cpp_sized_deallocation
# if defined(__cpp_sized_deallocation)
::operator delete((void*)ptr, n * sizeof(T));
#else
::operator delete((void*)ptr);
@@ -187,7 +187,7 @@ class propagation_test_allocator
void deallocate(T *ptr, std::size_t n) BOOST_NOEXCEPT_OR_NOTHROW
{
(void)n;
# if __cpp_sized_deallocation
# if defined(__cpp_sized_deallocation)
::operator delete((void*)ptr, n * sizeof(T));
#else
::operator delete((void*)ptr);

2
test/explicit_inst_vector_test.cpp
View File

@@ -38,7 +38,7 @@ class CustomAllocator
void deallocate(pointer ptr, size_type n)
{
(void)n;
# if __cpp_sized_deallocation
# if defined(__cpp_sized_deallocation)
::operator delete((void*)ptr, n * sizeof(value_type));
#else
::operator delete((void*)ptr);