diff --git a/include/boost/container/allocator.hpp b/include/boost/container/allocator.hpp index 3d82f71..ddb96be 100644 --- a/include/boost/container/allocator.hpp +++ b/include/boost/container/allocator.hpp @@ -116,7 +116,7 @@ class allocator allocator& operator=(const allocator&); 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 )); diff --git a/include/boost/container/detail/copy_move_algo.hpp b/include/boost/container/detail/copy_move_algo.hpp index 2081d67..6224003 100644 --- a/include/boost/container/detail/copy_move_algo.hpp +++ b/include/boost/container/detail/copy_move_algo.hpp @@ -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(dest_raw), beg_raw, sizeof(value_type)*n); r += static_cast(n); } return r; @@ -955,7 +955,7 @@ inline typename dtl::enable_if_memtransfer_copy_assignable::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((boost::movelib::iterator_to_raw_pointer)(r)), (boost::movelib::iterator_to_raw_pointer)(f), sizeof(value_type)*n); } return r; } diff --git a/include/boost/container/detail/pair.hpp b/include/boost/container/detail/pair.hpp index 0e84ffb..388a567 100644 --- a/include/boost/container/detail/pair.hpp +++ b/include/boost/container/detail/pair.hpp @@ -555,7 +555,7 @@ template struct is_trivially_copy_assignable > { - BOOST_STATIC_CONSTEXPR bool value = false ; + BOOST_STATIC_CONSTEXPR bool value = false; }; template @@ -593,7 +593,7 @@ template struct is_trivially_destructible > { BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_destructible::value && - boost::move_detail::is_trivially_destructible::value ; + boost::move_detail::is_trivially_destructible::value; }; diff --git a/include/boost/container/list.hpp b/include/boost/container/list.hpp index 1061446..1346537 100644 --- a/include/boost/container/list.hpp +++ b/include/boost/container/list.hpp @@ -90,7 +90,7 @@ struct intrusive_list_type , dtl::bi::size_type >::type container_type; - typedef container_type type ; + typedef container_type type; }; } //namespace dtl { diff --git a/include/boost/container/new_allocator.hpp b/include/boost/container/new_allocator.hpp index 1dadb2b..009fce0 100644 --- a/include/boost/container/new_allocator.hpp +++ b/include/boost/container/new_allocator.hpp @@ -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); diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp index 54ef5bd..70bac81 100644 --- a/include/boost/container/slist.hpp +++ b/include/boost/container/slist.hpp @@ -94,7 +94,7 @@ struct intrusive_slist_type , dtl::bi::size_type >::type container_type; - typedef container_type type ; + typedef container_type type; }; } //namespace dtl { diff --git a/test/allocator_argument_tester.hpp b/test/allocator_argument_tester.hpp index 584d2b7..909204f 100644 --- a/test/allocator_argument_tester.hpp +++ b/test/allocator_argument_tester.hpp @@ -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); diff --git a/test/dummy_test_allocator.hpp b/test/dummy_test_allocator.hpp index 8688647..986c771 100644 --- a/test/dummy_test_allocator.hpp +++ b/test/dummy_test_allocator.hpp @@ -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); diff --git a/test/explicit_inst_vector_test.cpp b/test/explicit_inst_vector_test.cpp index fadb651..415761b 100644 --- a/test/explicit_inst_vector_test.cpp +++ b/test/explicit_inst_vector_test.cpp @@ -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);