diff --git a/test/deque_test.cpp b/test/deque_test.cpp index 849699e..023cfc0 100644 --- a/test/deque_test.cpp +++ b/test/deque_test.cpp @@ -104,7 +104,6 @@ public: recursive_deque & operator=(const recursive_deque &x) { this->deque_ = x.deque_; return *this; } - int id_; deque deque_; deque::iterator it_; deque::const_iterator cit_; diff --git a/test/devector_test.cpp b/test/devector_test.cpp index 23327d4..6b7fecd 100644 --- a/test/devector_test.cpp +++ b/test/devector_test.cpp @@ -3881,7 +3881,6 @@ class recursive_devector recursive_devector & operator=(const recursive_devector &x) { this->devector_ = x.devector_; return *this; } - int id_; devector devector_; devector::iterator it_; devector::const_iterator cit_; diff --git a/test/flat_map_test.cpp b/test/flat_map_test.cpp index 7908d85..84f5b3e 100644 --- a/test/flat_map_test.cpp +++ b/test/flat_map_test.cpp @@ -32,17 +32,15 @@ class recursive_flat_map { public: recursive_flat_map(const recursive_flat_map &c) - : id_(c.id_), map_(c.map_) + : map_(c.map_) {} recursive_flat_map & operator =(const recursive_flat_map &c) { - id_ = c.id_; map_= c.map_; return *this; } - int id_; flat_map map_; flat_map::iterator it_; flat_map::const_iterator cit_; @@ -50,7 +48,7 @@ class recursive_flat_map flat_map::const_reverse_iterator crit_; friend bool operator< (const recursive_flat_map &a, const recursive_flat_map &b) - { return a.id_ < b.id_; } + { return a.map_ < b.map_; } }; @@ -58,16 +56,14 @@ class recursive_flat_multimap { public: recursive_flat_multimap(const recursive_flat_multimap &c) - : id_(c.id_), map_(c.map_) + : map_(c.map_) {} recursive_flat_multimap & operator =(const recursive_flat_multimap &c) { - id_ = c.id_; map_= c.map_; return *this; } - int id_; flat_multimap map_; flat_multimap::iterator it_; flat_multimap::const_iterator cit_; @@ -75,7 +71,7 @@ public: flat_multimap::const_reverse_iterator crit_; friend bool operator< (const recursive_flat_multimap &a, const recursive_flat_multimap &b) - { return a.id_ < b.id_; } + { return a.map_ < b.map_; } }; template diff --git a/test/list_test.cpp b/test/list_test.cpp index 3a7f004..0a0d17a 100644 --- a/test/list_test.cpp +++ b/test/list_test.cpp @@ -48,7 +48,6 @@ template class iterator_from_iiterator class recursive_list { public: - int id_; list list_; list::iterator it_; list::const_iterator cit_; diff --git a/test/map_test.cpp b/test/map_test.cpp index a0c1fbe..dd13491 100644 --- a/test/map_test.cpp +++ b/test/map_test.cpp @@ -35,9 +35,8 @@ class recursive_map {} recursive_map & operator=(const recursive_map &x) - { id_ = x.id_; map_ = x.map_; return *this; } + { map_ = x.map_; return *this; } - int id_; map map_; map::iterator it_; map::const_iterator cit_; @@ -45,7 +44,7 @@ class recursive_map map::const_reverse_iterator crit_; friend bool operator< (const recursive_map &a, const recursive_map &b) - { return a.id_ < b.id_; } + { return a.map_ < b.map_; } }; class recursive_multimap @@ -59,9 +58,8 @@ class recursive_multimap {} recursive_multimap & operator=(const recursive_multimap &x) - { id_ = x.id_; multimap_ = x.multimap_; return *this; } + { multimap_ = x.multimap_; return *this; } - int id_; multimap multimap_; multimap::iterator it_; multimap::const_iterator cit_; @@ -69,7 +67,7 @@ class recursive_multimap multimap::const_reverse_iterator crit_; friend bool operator< (const recursive_multimap &a, const recursive_multimap &b) - { return a.id_ < b.id_; } + { return a.multimap_ < b.multimap_; } }; template diff --git a/test/set_test.cpp b/test/set_test.cpp index 756138a..35c1d0e 100644 --- a/test/set_test.cpp +++ b/test/set_test.cpp @@ -26,6 +26,7 @@ using namespace boost::container; class recursive_set { public: + recursive_set() {} @@ -34,9 +35,8 @@ public: {} recursive_set & operator=(const recursive_set &x) - { id_ = x.id_; set_ = x.set_; return *this; } + { set_ = x.set_; return *this; } - int id_; set set_; set::iterator it_; set::const_iterator cit_; @@ -44,7 +44,7 @@ public: set::const_reverse_iterator crit_; friend bool operator< (const recursive_set &a, const recursive_set &b) - { return a.id_ < b.id_; } + { return a.set_ < b.set_; } }; //Test recursive structures @@ -59,9 +59,8 @@ class recursive_multiset {} recursive_multiset & operator=(const recursive_multiset &x) - { id_ = x.id_; multiset_ = x.multiset_; return *this; } + { multiset_ = x.multiset_; return *this; } - int id_; multiset multiset_; multiset::iterator it_; multiset::const_iterator cit_; @@ -69,7 +68,7 @@ class recursive_multiset multiset::const_reverse_iterator crit_; friend bool operator< (const recursive_multiset &a, const recursive_multiset &b) - { return a.id_ < b.id_; } + { return a.multiset_ < b.multiset_; } }; template diff --git a/test/slist_test.cpp b/test/slist_test.cpp index ab648a2..87543cf 100644 --- a/test/slist_test.cpp +++ b/test/slist_test.cpp @@ -24,7 +24,6 @@ using namespace boost::container; class recursive_slist { public: - int id_; slist slist_; slist::iterator it_; slist::const_iterator cit_; diff --git a/test/stable_vector_test.cpp b/test/stable_vector_test.cpp index bdbe4cb..2565786 100644 --- a/test/stable_vector_test.cpp +++ b/test/stable_vector_test.cpp @@ -28,7 +28,6 @@ using namespace boost::container; class recursive_vector { public: - int id_; stable_vector vector_; stable_vector::iterator it_; stable_vector::const_iterator cit_; diff --git a/test/vector_test.cpp b/test/vector_test.cpp index 4278b5d..834ba20 100644 --- a/test/vector_test.cpp +++ b/test/vector_test.cpp @@ -91,7 +91,6 @@ class recursive_vector recursive_vector & operator=(const recursive_vector &x) { this->vector_ = x.vector_; return *this; } - int id_; vector vector_; vector::iterator it_; vector::const_iterator cit_;