|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r86730 - in trunk: boost boost/multi_index boost/multi_index/detail libs/multi_index/test
From: joaquin_at_[hidden]
Date: 2013-11-16 16:23:34
Author: joaquin
Date: 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013)
New Revision: 86730
URL: http://svn.boost.org/trac/boost/changeset/86730
Log:
cleaned -Wshadow warnings
Text files modified:
trunk/boost/multi_index/detail/bucket_array.hpp | 4 +-
trunk/boost/multi_index/detail/rnd_index_loader.hpp | 13 ++++----
trunk/boost/multi_index/detail/rnd_index_ptr_array.hpp | 6 ++--
trunk/boost/multi_index/hashed_index.hpp | 8 ++--
trunk/boost/multi_index/ordered_index.hpp | 8 ++--
trunk/boost/multi_index/random_access_index.hpp | 4 +-
trunk/boost/multi_index/sequenced_index.hpp | 4 +-
trunk/boost/multi_index_container.hpp | 54 ++++++++++++++++++------------------
trunk/libs/multi_index/test/test_list_ops.cpp | 58 ++++++++++++++++++++--------------------
trunk/libs/multi_index/test/test_serialization3.cpp | 6 ++--
trunk/libs/multi_index/test/test_update.cpp | 14 ++++----
11 files changed, 90 insertions(+), 89 deletions(-)
Modified: trunk/boost/multi_index/detail/bucket_array.hpp
==============================================================================
--- trunk/boost/multi_index/detail/bucket_array.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/detail/bucket_array.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -137,8 +137,8 @@
typedef typename base_node_impl_type::base_pointer base_pointer;
typedef typename base_node_impl_type::pointer pointer;
- bucket_array(const Allocator& al,pointer end_,std::size_t size):
- size_index_(super::size_index(size)),
+ bucket_array(const Allocator& al,pointer end_,std::size_t size_):
+ size_index_(super::size_index(size_)),
spc(al,super::sizes[size_index_]+1)
{
clear(end_);
Modified: trunk/boost/multi_index/detail/rnd_index_loader.hpp
==============================================================================
--- trunk/boost/multi_index/detail/rnd_index_loader.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/detail/rnd_index_loader.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -82,14 +82,14 @@
}
}
- void rearrange(node_impl_pointer position,node_impl_pointer x)
+ void rearrange(node_impl_pointer position_,node_impl_pointer x)
{
preprocess(); /* only incur this penalty if rearrange() is ever called */
- if(position==node_impl_pointer(0))position=header;
+ if(position_==node_impl_pointer(0))position_=header;
next(prev(x))=next(x);
prev(next(x))=prev(x);
- prev(x)=position;
- next(x)=next(position);
+ prev(x)=position_;
+ next(x)=next(position_);
next(prev(x))=prev(next(x))=x;
}
@@ -157,9 +157,10 @@
super(al_,ptrs_)
{}
- void rearrange(Node* position,Node *x)
+ void rearrange(Node* position_,Node *x)
{
- super::rearrange(position?position->impl():node_impl_pointer(0),x->impl());
+ super::rearrange(
+ position_?position_->impl():node_impl_pointer(0),x->impl());
}
};
Modified: trunk/boost/multi_index/detail/rnd_index_ptr_array.hpp
==============================================================================
--- trunk/boost/multi_index/detail/rnd_index_ptr_array.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/detail/rnd_index_ptr_array.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -46,9 +46,9 @@
>::type::pointer pointer;
random_access_index_ptr_array(
- const Allocator& al,value_type end_,std::size_t size):
- size_(size),
- capacity_(size),
+ const Allocator& al,value_type end_,std::size_t sz):
+ size_(sz),
+ capacity_(sz),
spc(al,capacity_+1)
{
*end()=end_;
Modified: trunk/boost/multi_index/hashed_index.hpp
==============================================================================
--- trunk/boost/multi_index/hashed_index.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/hashed_index.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -393,7 +393,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify(iterator position,Modifier mod,Rollback back)
+ bool modify(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -410,7 +410,7 @@
#endif
return this->final_modify_(
- mod,back,static_cast<final_node_type*>(position.get_node()));
+ mod,back_,static_cast<final_node_type*>(position.get_node()));
}
template<typename Modifier>
@@ -425,7 +425,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify_key(iterator position,Modifier mod,Rollback back)
+ bool modify_key(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -434,7 +434,7 @@
return modify(
position,
modify_key_adaptor<Modifier,value_type,KeyFromValue>(mod,key),
- modify_key_adaptor<Rollback,value_type,KeyFromValue>(back,key));
+ modify_key_adaptor<Rollback,value_type,KeyFromValue>(back_,key));
}
void clear()BOOST_NOEXCEPT
Modified: trunk/boost/multi_index/ordered_index.hpp
==============================================================================
--- trunk/boost/multi_index/ordered_index.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/ordered_index.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -422,7 +422,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify(iterator position,Modifier mod,Rollback back)
+ bool modify(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -439,7 +439,7 @@
#endif
return this->final_modify_(
- mod,back,static_cast<final_node_type*>(position.get_node()));
+ mod,back_,static_cast<final_node_type*>(position.get_node()));
}
template<typename Modifier>
@@ -454,7 +454,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify_key(iterator position,Modifier mod,Rollback back)
+ bool modify_key(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -463,7 +463,7 @@
return modify(
position,
modify_key_adaptor<Modifier,value_type,KeyFromValue>(mod,key),
- modify_key_adaptor<Rollback,value_type,KeyFromValue>(back,key));
+ modify_key_adaptor<Rollback,value_type,KeyFromValue>(back_,key));
}
void swap(ordered_index<KeyFromValue,Compare,SuperMeta,TagList,Category>& x)
Modified: trunk/boost/multi_index/random_access_index.hpp
==============================================================================
--- trunk/boost/multi_index/random_access_index.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/random_access_index.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -456,7 +456,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify(iterator position,Modifier mod,Rollback back)
+ bool modify(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -473,7 +473,7 @@
#endif
return this->final_modify_(
- mod,back,static_cast<final_node_type*>(position.get_node()));
+ mod,back_,static_cast<final_node_type*>(position.get_node()));
}
void swap(random_access_index<SuperMeta,TagList>& x)
Modified: trunk/boost/multi_index/sequenced_index.hpp
==============================================================================
--- trunk/boost/multi_index/sequenced_index.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index/sequenced_index.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -411,7 +411,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify(iterator position,Modifier mod,Rollback back)
+ bool modify(iterator position,Modifier mod,Rollback back_)
{
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position);
BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position);
@@ -428,7 +428,7 @@
#endif
return this->final_modify_(
- mod,back,static_cast<final_node_type*>(position.get_node()));
+ mod,back_,static_cast<final_node_type*>(position.get_node()));
}
void swap(sequenced_index<SuperMeta,TagList>& x)
Modified: trunk/boost/multi_index_container.hpp
==============================================================================
--- trunk/boost/multi_index_container.hpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/boost/multi_index_container.hpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -423,7 +423,7 @@
template<int N,typename IteratorType>
typename nth_index_iterator<N>::type project(IteratorType it)
{
- typedef typename nth_index<N>::type index;
+ typedef typename nth_index<N>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
BOOST_STATIC_ASSERT(
@@ -434,13 +434,13 @@
BOOST_MULTI_INDEX_CHECK_IS_OWNER(
it,static_cast<typename IteratorType::container_type&>(*this));
- return index::make_iterator(static_cast<node_type*>(it.get_node()));
+ return index_type::make_iterator(static_cast<node_type*>(it.get_node()));
}
template<int N,typename IteratorType>
typename nth_index_const_iterator<N>::type project(IteratorType it)const
{
- typedef typename nth_index<N>::type index;
+ typedef typename nth_index<N>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
BOOST_STATIC_ASSERT((
@@ -451,7 +451,7 @@
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
BOOST_MULTI_INDEX_CHECK_IS_OWNER(
it,static_cast<const typename IteratorType::container_type&>(*this));
- return index::make_iterator(static_cast<node_type*>(it.get_node()));
+ return index_type::make_iterator(static_cast<node_type*>(it.get_node()));
}
#endif
@@ -473,7 +473,7 @@
template<typename Tag,typename IteratorType>
typename index_iterator<Tag>::type project(IteratorType it)
{
- typedef typename index<Tag>::type index;
+ typedef typename index<Tag>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
BOOST_STATIC_ASSERT(
@@ -483,13 +483,13 @@
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
BOOST_MULTI_INDEX_CHECK_IS_OWNER(
it,static_cast<typename IteratorType::container_type&>(*this));
- return index::make_iterator(static_cast<node_type*>(it.get_node()));
+ return index_type::make_iterator(static_cast<node_type*>(it.get_node()));
}
template<typename Tag,typename IteratorType>
typename index_const_iterator<Tag>::type project(IteratorType it)const
{
- typedef typename index<Tag>::type index;
+ typedef typename index<Tag>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */
BOOST_STATIC_ASSERT((
@@ -500,7 +500,7 @@
BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it);
BOOST_MULTI_INDEX_CHECK_IS_OWNER(
it,static_cast<const typename IteratorType::container_type&>(*this));
- return index::make_iterator(static_cast<node_type*>(it.get_node()));
+ return index_type::make_iterator(static_cast<node_type*>(it.get_node()));
}
#endif
@@ -829,7 +829,7 @@
}
template<typename Modifier,typename Rollback>
- bool modify_(Modifier& mod,Rollback& back,node_type* x)
+ bool modify_(Modifier& mod,Rollback& back_,node_type* x)
{
mod(const_cast<value_type&>(x->value()));
@@ -839,7 +839,7 @@
}
BOOST_CATCH(...){
BOOST_TRY{
- back(const_cast<value_type&>(x->value()));
+ back_(const_cast<value_type&>(x->value()));
BOOST_RETHROW;
}
BOOST_CATCH(...){
@@ -852,7 +852,7 @@
BOOST_TRY{
if(!b){
- back(const_cast<value_type&>(x->value()));
+ back_(const_cast<value_type&>(x->value()));
return false;
}
else return true;
@@ -987,7 +987,7 @@
multi_index_container<
Value,IndexSpecifierList,Allocator>,
N
- >::type index;
+ >::type index_type;
BOOST_STATIC_ASSERT(N>=0&&
N<
@@ -995,7 +995,7 @@
BOOST_DEDUCED_TYPENAME multi_index_type::index_type_list
>::type::value);
- return detail::converter<multi_index_type,index>::index(m);
+ return detail::converter<multi_index_type,index_type>::index(m);
}
template<int N,typename Value,typename IndexSpecifierList,typename Allocator>
@@ -1011,7 +1011,7 @@
multi_index_container<
Value,IndexSpecifierList,Allocator>,
N
- >::type index;
+ >::type index_type;
BOOST_STATIC_ASSERT(N>=0&&
N<
@@ -1019,7 +1019,7 @@
BOOST_DEDUCED_TYPENAME multi_index_type::index_type_list
>::type::value);
- return detail::converter<multi_index_type,index>::index(m);
+ return detail::converter<multi_index_type,index_type>::index(m);
}
/* retrieval of indices by tag */
@@ -1055,9 +1055,9 @@
multi_index_container<
Value,IndexSpecifierList,Allocator>,
Tag
- >::type index;
+ >::type index_type;
- return detail::converter<multi_index_type,index>::index(m);
+ return detail::converter<multi_index_type,index_type>::index(m);
}
template<
@@ -1075,9 +1075,9 @@
multi_index_container<
Value,IndexSpecifierList,Allocator>,
Tag
- >::type index;
+ >::type index_type;
- return detail::converter<multi_index_type,index>::index(m);
+ return detail::converter<multi_index_type,index_type>::index(m);
}
/* projection of iterators by number */
@@ -1105,7 +1105,7 @@
{
typedef multi_index_container<
Value,IndexSpecifierList,Allocator> multi_index_type;
- typedef typename nth_index<multi_index_type,N>::type index;
+ typedef typename nth_index<multi_index_type,N>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */
BOOST_STATIC_ASSERT((
@@ -1123,7 +1123,7 @@
BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m));
#endif
- return detail::converter<multi_index_type,index>::iterator(
+ return detail::converter<multi_index_type,index_type>::iterator(
m,static_cast<typename multi_index_type::node_type*>(it.get_node()));
}
@@ -1138,7 +1138,7 @@
{
typedef multi_index_container<
Value,IndexSpecifierList,Allocator> multi_index_type;
- typedef typename nth_index<multi_index_type,N>::type index;
+ typedef typename nth_index<multi_index_type,N>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */
BOOST_STATIC_ASSERT((
@@ -1159,7 +1159,7 @@
BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m));
#endif
- return detail::converter<multi_index_type,index>::const_iterator(
+ return detail::converter<multi_index_type,index_type>::const_iterator(
m,static_cast<typename multi_index_type::node_type*>(it.get_node()));
}
@@ -1191,7 +1191,7 @@
typedef multi_index_container<
Value,IndexSpecifierList,Allocator> multi_index_type;
typedef typename ::boost::multi_index::index<
- multi_index_type,Tag>::type index;
+ multi_index_type,Tag>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */
BOOST_STATIC_ASSERT((
@@ -1209,7 +1209,7 @@
BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m));
#endif
- return detail::converter<multi_index_type,index>::iterator(
+ return detail::converter<multi_index_type,index_type>::iterator(
m,static_cast<typename multi_index_type::node_type*>(it.get_node()));
}
@@ -1225,7 +1225,7 @@
typedef multi_index_container<
Value,IndexSpecifierList,Allocator> multi_index_type;
typedef typename ::boost::multi_index::index<
- multi_index_type,Tag>::type index;
+ multi_index_type,Tag>::type index_type;
#if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* Sun C++ 5.7 fails */
BOOST_STATIC_ASSERT((
@@ -1246,7 +1246,7 @@
BOOST_MULTI_INDEX_CHECK_IS_OWNER(it,converter::index(m));
#endif
- return detail::converter<multi_index_type,index>::const_iterator(
+ return detail::converter<multi_index_type,index_type>::const_iterator(
m,static_cast<typename multi_index_type::node_type*>(it.get_node()));
}
Modified: trunk/libs/multi_index/test/test_list_ops.cpp
==============================================================================
--- trunk/libs/multi_index/test/test_list_ops.cpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/libs/multi_index/test/test_list_ops.cpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -198,37 +198,37 @@
* http://lists.boost.org/boost-users/2006/09/22604.php
*/
{
- Sequence ss,ss2;
- ss.push_back(0);
- ss2.push_back(0);
- ss.splice(ss.end(),ss2,ss2.begin());
- CHECK_EQUAL(ss,(0)(0));
- BOOST_TEST(ss2.empty());
-
- ss.clear();
- ss2.clear();
- ss.push_back(0);
- ss2.push_back(0);
- ss.splice(ss.end(),ss2,ss2.begin(),ss2.end());
- CHECK_EQUAL(ss,(0)(0));
- BOOST_TEST(ss2.empty());
-
- ss.clear();
- ss2.clear();
- ss.push_back(0);
- ss2.push_back(0);
- ss.merge(ss2);
- CHECK_EQUAL(ss,(0)(0));
- BOOST_TEST(ss2.empty());
+ Sequence ss_,ss2_;
+ ss_.push_back(0);
+ ss2_.push_back(0);
+ ss_.splice(ss_.end(),ss2_,ss2_.begin());
+ CHECK_EQUAL(ss_,(0)(0));
+ BOOST_TEST(ss2_.empty());
+
+ ss_.clear();
+ ss2_.clear();
+ ss_.push_back(0);
+ ss2_.push_back(0);
+ ss_.splice(ss_.end(),ss2_,ss2_.begin(),ss2_.end());
+ CHECK_EQUAL(ss_,(0)(0));
+ BOOST_TEST(ss2_.empty());
+
+ ss_.clear();
+ ss2_.clear();
+ ss_.push_back(0);
+ ss2_.push_back(0);
+ ss_.merge(ss2_);
+ CHECK_EQUAL(ss_,(0)(0));
+ BOOST_TEST(ss2_.empty());
typedef typename Sequence::value_type value_type;
- ss.clear();
- ss2.clear();
- ss.push_back(0);
- ss2.push_back(0);
- ss.merge(ss2,std::less<value_type>());
- CHECK_EQUAL(ss,(0)(0));
- BOOST_TEST(ss2.empty());
+ ss_.clear();
+ ss2_.clear();
+ ss_.push_back(0);
+ ss2_.push_back(0);
+ ss_.merge(ss2_,std::less<value_type>());
+ CHECK_EQUAL(ss_,(0)(0));
+ BOOST_TEST(ss2_.empty());
}
}
Modified: trunk/libs/multi_index/test/test_serialization3.cpp
==============================================================================
--- trunk/libs/multi_index/test/test_serialization3.cpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/libs/multi_index/test/test_serialization3.cpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -141,10 +141,10 @@
for(std::size_t buc=0;buc<hs2.bucket_count();++buc){
for(std::size_t k=0;k<hs2.bucket_size(buc);++k){
int n;
- local_iterator it;
+ local_iterator it_;
ia>>n;
- ia>>it;
- BOOST_TEST(*it==n);
+ ia>>it_;
+ BOOST_TEST(*it_==n);
}
local_iterator it2;
ia>>it2;
Modified: trunk/libs/multi_index/test/test_update.cpp
==============================================================================
--- trunk/libs/multi_index/test/test_update.cpp Sat Nov 16 15:39:09 2013 (r86729)
+++ trunk/libs/multi_index/test/test_update.cpp 2013-11-16 16:23:34 EST (Sat, 16 Nov 2013) (r86730)
@@ -176,16 +176,16 @@
BOOST_TEST(!iis.modify_key(iis.begin(),increment_int));
BOOST_TEST(iis.size()==2);
- nth_index_iterator<int_int_set,1>::type it=ii1.find(5);
- BOOST_TEST(ii1.modify_key(it,increment_int));
- BOOST_TEST(ii1.modify_key(it,increment_int));
- BOOST_TEST(ii1.modify_key(it,increment_int,decrement_int));
- BOOST_TEST(ii1.modify_key(it,increment_int));
+ nth_index_iterator<int_int_set,1>::type it_=ii1.find(5);
+ BOOST_TEST(ii1.modify_key(it_,increment_int));
+ BOOST_TEST(ii1.modify_key(it_,increment_int));
+ BOOST_TEST(ii1.modify_key(it_,increment_int,decrement_int));
+ BOOST_TEST(ii1.modify_key(it_,increment_int));
- BOOST_TEST(!ii1.modify_key(it,increment_int,decrement_int));
+ BOOST_TEST(!ii1.modify_key(it_,increment_int,decrement_int));
BOOST_TEST(ii1.size()==2);
- BOOST_TEST(!ii1.modify_key(it,increment_int));
+ BOOST_TEST(!ii1.modify_key(it_,increment_int));
BOOST_TEST(ii1.size()==1);
}
{
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk