mirror of
https://github.com/boostorg/intrusive.git
synced 2025-08-04 15:04:43 +02:00
* Fixed GCC -Wshadow warnings.
* Added missing `explicit` keyword in several intrusive container constructors. * Replaced deprecated BOOST_NO_XXXX with newer BOOST_NO_CXX11_XXX macros. [SVN r81517]
This commit is contained in:
@@ -6,7 +6,7 @@
|
|||||||
/]
|
/]
|
||||||
|
|
||||||
[library Boost.Intrusive
|
[library Boost.Intrusive
|
||||||
[quickbook 1.4]
|
[quickbook 1.5]
|
||||||
[authors [Krzikalla, Olaf], [Gaztanaga, Ion]]
|
[authors [Krzikalla, Olaf], [Gaztanaga, Ion]]
|
||||||
[copyright 2005 Olaf Krzikalla, 2006-2012 Ion Gaztanaga]
|
[copyright 2005 Olaf Krzikalla, 2006-2012 Ion Gaztanaga]
|
||||||
[id intrusive]
|
[id intrusive]
|
||||||
@@ -3829,6 +3829,14 @@ all the objects to be inserted in intrusive containers in containers like `std::
|
|||||||
|
|
||||||
[section:release_notes Release Notes]
|
[section:release_notes Release Notes]
|
||||||
|
|
||||||
|
[section:release_notes_boost_1_53_00 Boost 1.53 Release]
|
||||||
|
|
||||||
|
* Fixed GCC -Wshadow warnings.
|
||||||
|
* Added missing `explicit` keyword in several intrusive container constructors.
|
||||||
|
* Replaced deprecated BOOST_NO_XXXX with newer BOOST_NO_CXX11_XXX macros.
|
||||||
|
|
||||||
|
[endsect]
|
||||||
|
|
||||||
[section:release_notes_boost_1_51_00 Boost 1.51 Release]
|
[section:release_notes_boost_1_51_00 Boost 1.51 Release]
|
||||||
|
|
||||||
* Fixed bugs
|
* Fixed bugs
|
||||||
|
@@ -145,11 +145,13 @@ void test_generic_assoc<ValueTraits, ContainerDefiner>::test_insert_erase_burst(
|
|||||||
TEST_INTRUSIVE_SEQUENCE_EXPECTED(testset, testset.begin());
|
TEST_INTRUSIVE_SEQUENCE_EXPECTED(testset, testset.begin());
|
||||||
|
|
||||||
//Ordered erasure
|
//Ordered erasure
|
||||||
|
{
|
||||||
iterator it(testset.begin()), itend(testset.end());
|
iterator it(testset.begin()), itend(testset.end());
|
||||||
for(int i = 0; it != itend; ++i){
|
for(int i = 0; it != itend; ++i){
|
||||||
BOOST_TEST(&*it == &values[i]);
|
BOOST_TEST(&*it == &values[i]);
|
||||||
it = testset.erase(it);
|
it = testset.erase(it);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
BOOST_TEST(testset.empty());
|
BOOST_TEST(testset.empty());
|
||||||
|
|
||||||
|
@@ -233,7 +233,7 @@ void test_generic_multiset<ValueTraits, ContainerDefiner>::test_find(std::vector
|
|||||||
cmp_val_lower.value_ = 1;
|
cmp_val_lower.value_ = 1;
|
||||||
cmp_val_upper.value_ = 2;
|
cmp_val_upper.value_ = 2;
|
||||||
//left-closed, right-closed
|
//left-closed, right-closed
|
||||||
std::pair<iterator,iterator> range = testset.bounded_range (cmp_val_lower, cmp_val_upper, true, true);
|
range = testset.bounded_range (cmp_val_lower, cmp_val_upper, true, true);
|
||||||
BOOST_TEST (range.first->value_ == 1);
|
BOOST_TEST (range.first->value_ == 1);
|
||||||
BOOST_TEST (range.second->value_ == 3);
|
BOOST_TEST (range.second->value_ == 3);
|
||||||
BOOST_TEST (std::distance (range.first, range.second) == 3);
|
BOOST_TEST (std::distance (range.first, range.second) == 3);
|
||||||
|
@@ -305,7 +305,7 @@ void test_generic_set<ValueTraits, ContainerDefiner>::test_find(std::vector<type
|
|||||||
cmp_val_lower.value_ = 1;
|
cmp_val_lower.value_ = 1;
|
||||||
cmp_val_upper.value_ = 2;
|
cmp_val_upper.value_ = 2;
|
||||||
//left-closed, right-closed
|
//left-closed, right-closed
|
||||||
std::pair<iterator,iterator> range = testset.bounded_range (cmp_val_lower, cmp_val_upper, true, true);
|
range = testset.bounded_range (cmp_val_lower, cmp_val_upper, true, true);
|
||||||
BOOST_TEST (range.first->value_ == 1);
|
BOOST_TEST (range.first->value_ == 1);
|
||||||
BOOST_TEST (range.second->value_ == 3);
|
BOOST_TEST (range.second->value_ == 3);
|
||||||
BOOST_TEST (std::distance (range.first, range.second) == 2);
|
BOOST_TEST (std::distance (range.first, range.second) == 2);
|
||||||
|
@@ -20,7 +20,7 @@ class CompleteSmartPtr
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
#if !defined(BOOST_NO_TEMPLATE_ALIASES)
|
#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
|
||||||
template <class U> using rebind = CompleteSmartPtr<U>;
|
template <class U> using rebind = CompleteSmartPtr<U>;
|
||||||
#else
|
#else
|
||||||
template <class U> struct rebind
|
template <class U> struct rebind
|
||||||
|
@@ -53,8 +53,8 @@ struct stateful_value_traits
|
|||||||
|
|
||||||
static const link_mode_type link_mode = normal_link;
|
static const link_mode_type link_mode = normal_link;
|
||||||
|
|
||||||
stateful_value_traits(pointer values, node_ptr node_array)
|
stateful_value_traits(pointer vals, node_ptr node_array)
|
||||||
: values_(values), node_array_(node_array)
|
: values_(vals), node_array_(node_array)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
node_ptr to_node_ptr (value_type &value)
|
node_ptr to_node_ptr (value_type &value)
|
||||||
|
@@ -111,9 +111,9 @@ void test_sequence_container(Container & c, Data & d)
|
|||||||
BOOST_TEST( !c.empty() );
|
BOOST_TEST( !c.empty() );
|
||||||
|
|
||||||
{
|
{
|
||||||
typename Data::iterator i = d.begin();
|
typename Data::iterator di = d.begin();
|
||||||
++++i;
|
++++di;
|
||||||
c.insert( c.begin(), *(i) );
|
c.insert( c.begin(), *(di) );
|
||||||
}
|
}
|
||||||
|
|
||||||
i = c.erase( c.begin(), c.end() );
|
i = c.erase( c.begin(), c.end() );
|
||||||
@@ -361,12 +361,16 @@ void test_unordered_associative_container_invariants(Container & c, Data & d, bo
|
|||||||
std::pair<const_iterator, const_iterator> er = c.equal_range(*di);
|
std::pair<const_iterator, const_iterator> er = c.equal_range(*di);
|
||||||
size_type cnt = std::distance(er.first, er.second);
|
size_type cnt = std::distance(er.first, er.second);
|
||||||
BOOST_TEST( cnt == c.count(*di));
|
BOOST_TEST( cnt == c.count(*di));
|
||||||
if(cnt > 1)
|
if(cnt > 1){
|
||||||
for(const_iterator n = er.first, i = n++, e = er.second; n != e; ++i, ++n){
|
const_iterator n = er.first;
|
||||||
|
i = n++;
|
||||||
|
const_iterator e = er.second;
|
||||||
|
for(; n != e; ++i, ++n){
|
||||||
BOOST_TEST( c.key_eq()(*i, *n) );
|
BOOST_TEST( c.key_eq()(*i, *n) );
|
||||||
BOOST_TEST( c.hash_function()(*i) == c.hash_function()(*n) );
|
BOOST_TEST( c.hash_function()(*i) == c.hash_function()(*n) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
size_type blen = c.bucket_count();
|
size_type blen = c.bucket_count();
|
||||||
size_type total_objects = 0;
|
size_type total_objects = 0;
|
||||||
|
@@ -212,6 +212,7 @@ void test_unordered_multiset<ValueTraits, CacheBegin, CompareHash, Incremental>
|
|||||||
> unordered_multiset_type;
|
> unordered_multiset_type;
|
||||||
typedef typename unordered_multiset_type::bucket_traits bucket_traits;
|
typedef typename unordered_multiset_type::bucket_traits bucket_traits;
|
||||||
typedef typename unordered_multiset_type::iterator iterator;
|
typedef typename unordered_multiset_type::iterator iterator;
|
||||||
|
{
|
||||||
typename unordered_multiset_type::bucket_type buckets [BucketSize];
|
typename unordered_multiset_type::bucket_type buckets [BucketSize];
|
||||||
unordered_multiset_type testset(bucket_traits(
|
unordered_multiset_type testset(bucket_traits(
|
||||||
pointer_traits<typename unordered_multiset_type::bucket_ptr>::
|
pointer_traits<typename unordered_multiset_type::bucket_ptr>::
|
||||||
@@ -326,6 +327,7 @@ void test_unordered_multiset<ValueTraits, CacheBegin, CompareHash, Incremental>
|
|||||||
BOOST_TEST (testset_new.size() == (max -1));
|
BOOST_TEST (testset_new.size() == (max -1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
{
|
{
|
||||||
typename unordered_multiset_type::bucket_type buckets [BucketSize];
|
typename unordered_multiset_type::bucket_type buckets [BucketSize];
|
||||||
const unsigned int NumBucketSize = BucketSize;
|
const unsigned int NumBucketSize = BucketSize;
|
||||||
|
Reference in New Issue
Block a user