Skip to content

Commit 1ef175a

Browse files
committed
Fix -Wcast-qual warnings.
1 parent 7ba8bae commit 1ef175a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

include/boost/container/allocator_traits.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ namespace dtl {
9191
template<class T, class ...Args>
9292
BOOST_CONTAINER_FORCEINLINE void construct_type(T *p, BOOST_FWD_REF(Args) ...args)
9393
{
94-
::new((void*)p, boost_container_new_t()) T(::boost::forward<Args>(args)...);
94+
::new(const_cast<void*>(static_cast<const volatile void*>(p)), boost_container_new_t()) T(::boost::forward<Args>(args)...);
9595
}
9696

9797
#else
@@ -102,7 +102,7 @@ BOOST_CONTAINER_FORCEINLINE \
102102
typename dtl::disable_if_c<dtl::is_pair<T>::value, void >::type \
103103
construct_type(T *p BOOST_MOVE_I##N BOOST_MOVE_UREF##N)\
104104
{\
105-
::new((void*)p, boost_container_new_t()) T( BOOST_MOVE_FWD##N );\
105+
::new(const_cast<void*>(static_cast<const volatile void*>(p)), boost_container_new_t()) T( BOOST_MOVE_FWD##N );\
106106
}\
107107
//
108108
BOOST_MOVE_ITERATE_0TO8(BOOST_CONTAINER_ALLOCATOR_TRAITS_CONSTRUCT_TYPEJ)

include/boost/container/string.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ class basic_string_base
274274
//active representation is short or long
275275
short_header hdr;
276276
BOOST_CONTAINER_STATIC_ASSERT((sizeof(short_header) == 1));
277-
*(unsigned char*)&hdr = *(unsigned char*)&this->members_.m_repr;
277+
*(unsigned char*)&hdr = *static_cast<const unsigned char*>(static_cast<const void *>(&this->members_.m_repr));
278278
return hdr.is_short != 0;
279279
}
280280

0 commit comments

Comments
 (0)