diff --git a/include/boost/container/deque.hpp b/include/boost/container/deque.hpp index d77398b..a2baf04 100644 --- a/include/boost/container/deque.hpp +++ b/include/boost/container/deque.hpp @@ -985,8 +985,6 @@ class deque : protected deque_base } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() - //! allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/flat_map.hpp b/include/boost/container/flat_map.hpp index bb35ce2..bec26e3 100644 --- a/include/boost/container/flat_map.hpp +++ b/include/boost/container/flat_map.hpp @@ -436,7 +436,6 @@ class flat_map } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -454,7 +453,7 @@ class flat_map //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. std::pair insert(const value_type& x) { return container_detail::force >( m_flat_tree.insert_unique(container_detail::force(x))); } @@ -469,7 +468,7 @@ class flat_map //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. std::pair insert(BOOST_RV_REF(value_type) x) { return container_detail::force >( m_flat_tree.insert_unique(boost::move(container_detail::force(x)))); } @@ -484,7 +483,7 @@ class flat_map //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. std::pair insert(BOOST_RV_REF(impl_value_type) x) { return container_detail::force > @@ -501,7 +500,7 @@ class flat_map //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, const value_type& x) { return container_detail::force_copy( m_flat_tree.insert_unique(container_detail::force(position), container_detail::force(x))); } @@ -514,7 +513,7 @@ class flat_map //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(value_type) x) { return container_detail::force_copy( m_flat_tree.insert_unique(container_detail::force(position), boost::move(container_detail::force(x)))); } @@ -527,7 +526,7 @@ class flat_map //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(impl_value_type) x) { return container_detail::force_copy( @@ -542,7 +541,7 @@ class flat_map //! Complexity: At most N log(size()+N) (N is the distance from first to last) //! search time plus N*size() insertion time. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template void insert(InputIterator first, InputIterator last) { m_flat_tree.insert_unique(first, last); } @@ -560,7 +559,7 @@ class flat_map //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace(Args&&... args) { return container_detail::force_copy(m_flat_tree.emplace_unique(boost::forward(args)...)); } @@ -576,7 +575,7 @@ class flat_map //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace_hint(const_iterator hint, Args&&... args) { return container_detail::force_copy(m_flat_tree.emplace_hint_unique(container_detail::force(hint), boost::forward(args)...)); } @@ -1103,7 +1102,6 @@ class flat_multimap { return m_flat_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -1117,7 +1115,7 @@ class flat_multimap //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const value_type& x) { return container_detail::force_copy(m_flat_tree.insert_equal(container_detail::force(x))); } @@ -1127,7 +1125,7 @@ class flat_multimap //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(BOOST_RV_REF(value_type) x) { return container_detail::force_copy(m_flat_tree.insert_equal(boost::move(x))); } @@ -1137,7 +1135,7 @@ class flat_multimap //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(BOOST_RV_REF(impl_value_type) x) { return container_detail::force_copy(m_flat_tree.insert_equal(boost::move(x))); } @@ -1151,7 +1149,7 @@ class flat_multimap //! is to be inserted before p) plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, const value_type& x) { return container_detail::force_copy(m_flat_tree.insert_equal(container_detail::force(position), container_detail::force(x))); } @@ -1165,7 +1163,7 @@ class flat_multimap //! is to be inserted before p) plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(value_type) x) { return container_detail::force_copy @@ -1183,7 +1181,7 @@ class flat_multimap //! is to be inserted before p) plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(impl_value_type) x) { return container_detail::force_copy( @@ -1197,7 +1195,7 @@ class flat_multimap //! Complexity: At most N log(size()+N) (N is the distance from first to last) //! search time plus N*size() insertion time. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template void insert(InputIterator first, InputIterator last) { m_flat_tree.insert_equal(first, last); } @@ -1211,7 +1209,7 @@ class flat_multimap //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace(Args&&... args) { return container_detail::force_copy(m_flat_tree.emplace_equal(boost::forward(args)...)); } @@ -1227,7 +1225,7 @@ class flat_multimap //! is to be inserted before p) plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace_hint(const_iterator hint, Args&&... args) { diff --git a/include/boost/container/flat_set.hpp b/include/boost/container/flat_set.hpp index 07e1f1f..9d40bdd 100644 --- a/include/boost/container/flat_set.hpp +++ b/include/boost/container/flat_set.hpp @@ -324,7 +324,6 @@ class flat_set { return m_flat_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -342,7 +341,7 @@ class flat_set //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. std::pair insert(insert_const_ref_type x) { return priv_insert(x); } @@ -365,7 +364,7 @@ class flat_set //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. std::pair insert(BOOST_RV_REF(value_type) x) { return m_flat_tree.insert_unique(boost::move(x)); } @@ -379,7 +378,7 @@ class flat_set //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } @@ -400,7 +399,7 @@ class flat_set //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(value_type) x) { return m_flat_tree.insert_unique(position, boost::move(x)); } @@ -412,7 +411,7 @@ class flat_set //! Complexity: At most N log(size()+N) (N is the distance from first to last) //! search time plus N*size() insertion time. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template void insert(InputIterator first, InputIterator last) { m_flat_tree.insert_unique(first, last); } @@ -430,7 +429,7 @@ class flat_set //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace(Args&&... args) { return m_flat_tree.emplace_unique(boost::forward(args)...); } @@ -446,7 +445,7 @@ class flat_set //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace_hint(const_iterator hint, Args&&... args) { return m_flat_tree.emplace_hint_unique(hint, boost::forward(args)...); } @@ -929,7 +928,6 @@ class flat_multiset { return m_flat_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -943,7 +941,7 @@ class flat_multiset //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(insert_const_ref_type x) { return priv_insert(x); } @@ -962,7 +960,7 @@ class flat_multiset //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(BOOST_RV_REF(value_type) x) { return m_flat_tree.insert_equal(boost::move(x)); } @@ -975,7 +973,7 @@ class flat_multiset //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator p, insert_const_ref_type x) { return priv_insert(p, x); } @@ -997,7 +995,7 @@ class flat_multiset //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. iterator insert(const_iterator position, BOOST_RV_REF(value_type) x) { return m_flat_tree.insert_equal(position, boost::move(x)); } @@ -1008,7 +1006,7 @@ class flat_multiset //! Complexity: At most N log(size()+N) (N is the distance from first to last) //! search time plus N*size() insertion time. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template void insert(InputIterator first, InputIterator last) { m_flat_tree.insert_equal(first, last); } @@ -1022,7 +1020,7 @@ class flat_multiset //! Complexity: Logarithmic search time plus linear insertion //! to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace(Args&&... args) { return m_flat_tree.emplace_equal(boost::forward(args)...); } @@ -1037,7 +1035,7 @@ class flat_multiset //! Complexity: Logarithmic search time (constant if x is inserted //! right before p) plus insertion linear to the elements with bigger keys than x. //! - //! Note: If an element it's inserted it might invalidate elements. + //! Note: If an element is inserted it might invalidate elements. template iterator emplace_hint(const_iterator hint, Args&&... args) { return m_flat_tree.emplace_hint_equal(hint, boost::forward(args)...); } diff --git a/include/boost/container/list.hpp b/include/boost/container/list.hpp index 03ba7f1..6df999b 100644 --- a/include/boost/container/list.hpp +++ b/include/boost/container/list.hpp @@ -701,8 +701,6 @@ class list } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() - //! allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/map.hpp b/include/boost/container/map.hpp index 63717d9..f77dfa8 100644 --- a/include/boost/container/map.hpp +++ b/include/boost/container/map.hpp @@ -376,7 +376,6 @@ class map } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -1019,7 +1018,6 @@ class multimap { return m_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/set.hpp b/include/boost/container/set.hpp index 485f64d..3cf22b5 100644 --- a/include/boost/container/set.hpp +++ b/include/boost/container/set.hpp @@ -317,7 +317,6 @@ class set { return m_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! @@ -884,7 +883,6 @@ class multiset { return m_tree.max_size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/slist.hpp b/include/boost/container/slist.hpp index ffa538e..a3c6dd9 100644 --- a/include/boost/container/slist.hpp +++ b/include/boost/container/slist.hpp @@ -596,8 +596,6 @@ class slist { return !this->size(); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() - //! allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/stable_vector.hpp b/include/boost/container/stable_vector.hpp index 2d25fbe..f4ea541 100644 --- a/include/boost/container/stable_vector.hpp +++ b/include/boost/container/stable_vector.hpp @@ -1226,8 +1226,6 @@ class stable_vector { return priv_erase(first, last, alloc_version()); } //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() - //! allocators are also swapped. //! //! Throws: Nothing. //! diff --git a/include/boost/container/vector.hpp b/include/boost/container/vector.hpp index 7a2aa4f..d7b2978 100644 --- a/include/boost/container/vector.hpp +++ b/include/boost/container/vector.hpp @@ -1080,8 +1080,6 @@ class vector : private container_detail::vector_alloc_holder #endif //#ifdef BOOST_CONTAINER_PERFECT_FORWARDING //! Effects: Swaps the contents of *this and x. - //! If this->allocator_type() != x.allocator_type() - //! allocators are also swapped. //! //! Throws: Nothing. //!