boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-03 14:34:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced incorrect "&*iterator" expressions (which fails with value_types with overloaded "operator&") with "iterator_to_raw_pointer" or "iterator_to_pointer" utilities.

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-06-12 10:01:52 +02:00
parent bf5c140180
commit ac7fb5a86b
5 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/container/deque.hpp
View File

@@ -1683,7 +1683,7 @@ class deque : protected deque_base<Allocator>
for(;p != p2; ++p){ for(;p != p2; ++p){
allocator_traits_type::destroy allocator_traits_type::destroy
( this->alloc() ( this->alloc()
, container_detail::to_raw_pointer(&*p) , container_detail::to_raw_pointer(container_detail::iterator_to_pointer(p))
); );
} }
} }
@@ -1693,7 +1693,7 @@ class deque : protected deque_base<Allocator>
for(;p != p2; ++p){ for(;p != p2; ++p){
allocator_traits_type::destroy allocator_traits_type::destroy
( this->alloc() ( this->alloc()
, container_detail::to_raw_pointer(&*p) , container_detail::to_raw_pointer(container_detail::iterator_to_pointer(p))
); );
} }
} }

2
include/boost/container/detail/adaptive_node_pool_impl.hpp
View File

@@ -482,7 +482,7 @@ class private_adaptive_node_pool_impl
free_nodes_iterator itf(nodes.begin()), itbf(itbb); free_nodes_iterator itf(nodes.begin()), itbf(itbb);
size_type splice_node_count = size_type(-1); size_type splice_node_count = size_type(-1);
while(itf != ite){ while(itf != ite){
void *pElem = container_detail::to_raw_pointer(&*itf); void *pElem = container_detail::to_raw_pointer(container_detail::iterator_to_pointer(itf));
block_info_t &block_info = *this->priv_block_from_node(pElem); block_info_t &block_info = *this->priv_block_from_node(pElem);
BOOST_ASSERT(block_info.free_nodes.size() < m_real_num_node); BOOST_ASSERT(block_info.free_nodes.size() < m_real_num_node);
++splice_node_count; ++splice_node_count;

15
include/boost/container/detail/advanced_insert_int.hpp
View File

@@ -138,7 +138,7 @@ struct insert_copy_proxy
void uninitialized_copy_n_and_update(A &a, Iterator p, size_type n) const void uninitialized_copy_n_and_update(A &a, Iterator p, size_type n) const
{ {
BOOST_ASSERT(n == 1); (void)n; BOOST_ASSERT(n == 1); (void)n;
alloc_traits::construct( a, container_detail::to_raw_pointer(&*p), v_); alloc_traits::construct( a, iterator_to_raw_pointer(p), v_);
} }
void copy_n_and_update(A &, Iterator p, size_type n) const void copy_n_and_update(A &, Iterator p, size_type n) const
@@ -165,10 +165,7 @@ struct insert_move_proxy
void uninitialized_copy_n_and_update(A &a, Iterator p, size_type n) const void uninitialized_copy_n_and_update(A &a, Iterator p, size_type n) const
{ {
BOOST_ASSERT(n == 1); (void)n; BOOST_ASSERT(n == 1); (void)n;
alloc_traits::construct( a alloc_traits::construct( a, iterator_to_raw_pointer(p), ::boost::move(v_) );
, container_detail::to_raw_pointer(&*p)
, ::boost::move(v_)
);
} }
void copy_n_and_update(A &, Iterator p, size_type n) const void copy_n_and_update(A &, Iterator p, size_type n) const
@@ -226,10 +223,7 @@ struct insert_non_movable_emplace_proxy
void priv_uninitialized_copy_some_and_update(A &a, const index_tuple<IdxPack...>&, Iterator p, size_type n) void priv_uninitialized_copy_some_and_update(A &a, const index_tuple<IdxPack...>&, Iterator p, size_type n)
{ {
BOOST_ASSERT(n == 1); (void)n; BOOST_ASSERT(n == 1); (void)n;
alloc_traits::construct( a alloc_traits::construct( a, iterator_to_raw_pointer(p), ::boost::forward<Args>(get<IdxPack>(this->args_))... );
, container_detail::to_raw_pointer(&*p)
, ::boost::forward<Args>(get<IdxPack>(this->args_))...
);
} }
protected: protected:
@@ -303,8 +297,7 @@ struct BOOST_PP_CAT(insert_non_movable_emplace_proxy_arg, N)
{ \ { \
BOOST_ASSERT(n == 1); (void)n; \ BOOST_ASSERT(n == 1); (void)n; \
alloc_traits::construct \ alloc_traits::construct \
( a \ ( a, iterator_to_raw_pointer(p) \
, container_detail::to_raw_pointer(&*p) \
BOOST_PP_ENUM_TRAILING(N, BOOST_CONTAINER_PP_MEMBER_FORWARD, _) \ BOOST_PP_ENUM_TRAILING(N, BOOST_CONTAINER_PP_MEMBER_FORWARD, _) \
); \ ); \
} \ } \

2
include/boost/container/detail/node_alloc_holder.hpp
View File

@@ -261,7 +261,7 @@ struct node_alloc_holder
Deallocator node_deallocator(NodePtr(), nalloc); Deallocator node_deallocator(NodePtr(), nalloc);
container_detail::scoped_destructor<NodeAlloc> sdestructor(nalloc, 0); container_detail::scoped_destructor<NodeAlloc> sdestructor(nalloc, 0);
while(n--){ while(n--){
p = container_detail::to_raw_pointer(&*itbeg); p = container_detail::to_raw_pointer(iterator_to_pointer(itbeg));
node_deallocator.set(p); node_deallocator.set(p);
++itbeg; ++itbeg;
//This can throw //This can throw

56
include/boost/container/detail/utilities.hpp
View File

@@ -164,6 +164,22 @@ inline typename boost::intrusive::pointer_traits<Pointer>::element_type*
to_raw_pointer(const Pointer &p) to_raw_pointer(const Pointer &p)
{ return boost::container::container_detail::to_raw_pointer(p.operator->()); } { return boost::container::container_detail::to_raw_pointer(p.operator->()); }
template <class T>
inline T* iterator_to_pointer(T* i)
{ return i; }
template <class Iterator>
inline typename std::iterator_traits<Iterator>::pointer
iterator_to_pointer(const Iterator &i)
{ return i.operator->(); }
template <class Iterator>
inline
typename boost::intrusive::pointer_traits
<typename std::iterator_traits<Iterator>::pointer>::element_type*
iterator_to_raw_pointer(const Iterator &i)
{ return to_raw_pointer(iterator_to_pointer(i)); }
template<class AllocatorType> template<class AllocatorType>
inline void swap_alloc(AllocatorType &, AllocatorType &, container_detail::false_type) inline void swap_alloc(AllocatorType &, AllocatorType &, container_detail::false_type)
@@ -399,13 +415,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (f != l) { while (f != l) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), boost::move(*f)); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), boost::move(*f));
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -444,13 +460,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), boost::move(*f)); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), boost::move(*f));
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -489,13 +505,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), boost::move(*f)); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), boost::move(*f));
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -534,13 +550,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (f != l) { while (f != l) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), *f); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), *f);
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -579,13 +595,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), *f); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), *f);
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -624,13 +640,13 @@ inline typename container_detail::disable_if_memtransfer_copy_constructible<I, F
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), *f); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), *f);
++f; ++r; ++f; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -667,13 +683,13 @@ inline F uninitialized_value_init_alloc_n(A &a, typename allocator_traits<A>::di
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r)); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r));
++r; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -702,13 +718,13 @@ inline F uninitialized_default_init_alloc_n(A &a, typename allocator_traits<A>::
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), default_init); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), default_init);
++r; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -738,13 +754,13 @@ inline void uninitialized_fill_alloc(A &a, F f, F l, const T &t)
F back = f; F back = f;
BOOST_TRY{ BOOST_TRY{
while (f != l) { while (f != l) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*f), t); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(f), t);
++f; ++f;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != l; ++back){ for (; back != l; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }
@@ -774,13 +790,13 @@ inline F uninitialized_fill_alloc_n(A &a, const T &v, typename allocator_traits<
F back = r; F back = r;
BOOST_TRY{ BOOST_TRY{
while (n--) { while (n--) {
allocator_traits<A>::construct(a, container_detail::to_raw_pointer(&*r), v); allocator_traits<A>::construct(a, container_detail::iterator_to_raw_pointer(r), v);
++r; ++r;
} }
} }
BOOST_CATCH(...){ BOOST_CATCH(...){
for (; back != r; ++back){ for (; back != r; ++back){
allocator_traits<A>::destroy(a, container_detail::to_raw_pointer(&*back)); allocator_traits<A>::destroy(a, container_detail::iterator_to_raw_pointer(back));
} }
BOOST_RETHROW; BOOST_RETHROW;
} }