From 11bfbe66b2ba9296324d4ce46c330776182d332f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sat, 5 Jan 2013 16:53:17 +0000 Subject: [PATCH] Fix unused variable warnings in tests [SVN r82364] --- example/doc_any_hook.cpp | 4 ++-- example/doc_avl_set.cpp | 4 ++-- example/doc_how_to_use.cpp | 4 ++-- example/doc_list.cpp | 4 ++-- example/doc_set.cpp | 4 ++-- example/doc_sg_set.cpp | 4 ++-- example/doc_slist.cpp | 4 ++-- example/doc_splay_set.cpp | 6 +++--- example/doc_treap_set.cpp | 4 ++-- example/doc_unordered_set.cpp | 3 +-- test/any_test.cpp | 4 ++-- test/test_container.hpp | 4 ++-- 12 files changed, 24 insertions(+), 25 deletions(-) diff --git a/example/doc_any_hook.cpp b/example/doc_any_hook.cpp index 64c0956..a04de14 100644 --- a/example/doc_any_hook.cpp +++ b/example/doc_any_hook.cpp @@ -50,8 +50,8 @@ int main() base_slist.push_front(*it), member_list.push_back(*it); //Now test lists - BaseSList::iterator bit(base_slist.begin()), bitend(base_slist.end()); - MemberList::reverse_iterator mrit(member_list.rbegin()), mritend(member_list.rend()); + BaseSList::iterator bit(base_slist.begin()); + MemberList::reverse_iterator mrit(member_list.rbegin()); std::vector::reverse_iterator rit(values.rbegin()), ritend(values.rend()); //Test the objects inserted in the base hook list diff --git a/example/doc_avl_set.cpp b/example/doc_avl_set.cpp index f3fab35..1baba57 100644 --- a/example/doc_avl_set.cpp +++ b/example/doc_avl_set.cpp @@ -69,8 +69,8 @@ int main() //Now test avl_sets { - BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend()); - MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end()); + BaseSet::reverse_iterator rbit(baseset.rbegin()); + MemberMultiset::iterator mit(membermultiset.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook avl_set diff --git a/example/doc_how_to_use.cpp b/example/doc_how_to_use.cpp index 7e1bbc2..834c4f8 100644 --- a/example/doc_how_to_use.cpp +++ b/example/doc_how_to_use.cpp @@ -57,8 +57,8 @@ int main() //Now test lists { - BaseList::reverse_iterator rbit(baselist.rbegin()), rbitend(baselist.rend()); - MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end()); + BaseList::reverse_iterator rbit(baselist.rbegin()); + MemberList::iterator mit(memberlist.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook list diff --git a/example/doc_list.cpp b/example/doc_list.cpp index 08a3f70..3ec6876 100644 --- a/example/doc_list.cpp +++ b/example/doc_list.cpp @@ -58,8 +58,8 @@ int main() //Now test lists { - BaseList::reverse_iterator rbit(baselist.rbegin()), rbitend(baselist.rend()); - MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end()); + BaseList::reverse_iterator rbit(baselist.rbegin()); + MemberList::iterator mit(memberlist.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook list diff --git a/example/doc_set.cpp b/example/doc_set.cpp index 528ff84..e5a1d51 100644 --- a/example/doc_set.cpp +++ b/example/doc_set.cpp @@ -69,8 +69,8 @@ int main() //Now test sets { - BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend()); - MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end()); + BaseSet::reverse_iterator rbit(baseset.rbegin()); + MemberMultiset::iterator mit(membermultiset.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook set diff --git a/example/doc_sg_set.cpp b/example/doc_sg_set.cpp index 1c3bbaa..3ca3145 100644 --- a/example/doc_sg_set.cpp +++ b/example/doc_sg_set.cpp @@ -68,8 +68,8 @@ int main() //Now test sg_sets { - BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend()); - MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end()); + BaseSet::reverse_iterator rbit(baseset.rbegin()); + MemberMultiset::iterator mit(membermultiset.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook sg_set diff --git a/example/doc_slist.cpp b/example/doc_slist.cpp index 3ebc561..be8398e 100644 --- a/example/doc_slist.cpp +++ b/example/doc_slist.cpp @@ -60,8 +60,8 @@ int main() //Now test lists { - BaseList::iterator bit(baselist.begin()), bitend(baselist.end()); - MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end()); + BaseList::iterator bit(baselist.begin()); + MemberList::iterator mit(memberlist.begin()); VectRit rit(values.rbegin()), ritend(values.rend()); VectIt it(values.begin()), itend(values.end()); diff --git a/example/doc_splay_set.cpp b/example/doc_splay_set.cpp index 19c9d6c..f3467f5 100644 --- a/example/doc_splay_set.cpp +++ b/example/doc_splay_set.cpp @@ -72,9 +72,9 @@ int main() //Now test sets { - BaseSplaySet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend()); - BaseBsSplaySet::iterator bsit(bsbaseset.begin()), bsitend(bsbaseset.end()); - MemberSplayMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end()); + BaseSplaySet::reverse_iterator rbit(baseset.rbegin()); + BaseBsSplaySet::iterator bsit(bsbaseset.begin()); + MemberSplayMultiset::iterator mit(membermultiset.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook set diff --git a/example/doc_treap_set.cpp b/example/doc_treap_set.cpp index dc8b7a9..ebba369 100644 --- a/example/doc_treap_set.cpp +++ b/example/doc_treap_set.cpp @@ -79,8 +79,8 @@ int main() //Now test treap_sets { - BaseSet::reverse_iterator rbit(baseset.rbegin()), rbitend(baseset.rend()); - MemberMultiset::iterator mit(membermultiset.begin()), mitend(membermultiset.end()); + BaseSet::reverse_iterator rbit(baseset.rbegin()); + MemberMultiset::iterator mit(membermultiset.begin()); VectIt it(values.begin()), itend(values.end()); //Test the objects inserted in the base hook treap_set diff --git a/example/doc_unordered_set.cpp b/example/doc_unordered_set.cpp index 70ff299..fc3403f 100644 --- a/example/doc_unordered_set.cpp +++ b/example/doc_unordered_set.cpp @@ -71,8 +71,7 @@ int main() base_set.insert(*it); //Now insert values's and values2's elements in the unordered_multiset - for(VectIt it(values.begin()), itend(values.end()), - it2(values2.begin()),itend2(values2.end()) + for(VectIt it(values.begin()), itend(values.end()), it2(values2.begin()) ; it != itend; ++it, ++it2){ member_multi_set.insert(*it); member_multi_set.insert(*it2); diff --git a/test/any_test.cpp b/test/any_test.cpp index 61dee2c..f173264 100644 --- a/test/any_test.cpp +++ b/test/any_test.cpp @@ -164,8 +164,8 @@ bool simple_slist_test() //Now test lists { - BaseList::iterator bit(baselist.begin()), bitend(baselist.end()); - MemberList::iterator mit(memberlist.begin()), mitend(memberlist.end()); + BaseList::iterator bit(baselist.begin()); + MemberList::iterator mit(memberlist.begin()); VectRit rit(values.rbegin()), ritend(values.rend()); VectIt it(values.begin()), itend(values.end()); diff --git a/test/test_container.hpp b/test/test_container.hpp index 3743fef..e46083a 100644 --- a/test/test_container.hpp +++ b/test/test_container.hpp @@ -57,7 +57,7 @@ void test_container( Container & c ) for(i = 0; i < num_elem; ++i){ ++it; } - BOOST_TEST( it == c.end() ); + BOOST_TEST( it == itend ); BOOST_TEST( c.size() == i ); } @@ -69,7 +69,7 @@ void test_container( Container & c ) for(i = 0; i < num_elem; ++i){ ++it; } - BOOST_TEST( it == c.cend() ); + BOOST_TEST( it == itend ); BOOST_TEST( c.size() == i ); } }