Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r76113 - trunk/boost/container
From: igaztanaga_at_[hidden]
Date: 2011-12-23 06:47:58

Next message: igaztanaga_at_[hidden]: "[Boost-commit] svn:boost r76114 - in trunk/boost: container interprocess"
Previous message: igaztanaga_at_[hidden]: "[Boost-commit] svn:boost r76112 - trunk/boost/intrusive"

Author: igaztanaga
Date: 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
New Revision: 76113
URL: http://svn.boost.org/trac/boost/changeset/76113

Log:
Bug #6205
Text files modified:
   trunk/boost/container/deque.hpp | 2 --
   trunk/boost/container/flat_map.hpp | 38 ++++++++++++++++++--------------------
   trunk/boost/container/flat_set.hpp | 30 ++++++++++++++----------------
   trunk/boost/container/list.hpp | 2 --
   trunk/boost/container/map.hpp | 2 --
   trunk/boost/container/set.hpp | 2 --
   trunk/boost/container/slist.hpp | 2 --
   trunk/boost/container/stable_vector.hpp | 2 --
   trunk/boost/container/vector.hpp | 2 --
   9 files changed, 32 insertions(+), 50 deletions(-)

Modified: trunk/boost/container/deque.hpp
==============================================================================
--- trunk/boost/container/deque.hpp (original)
+++ trunk/boost/container/deque.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -985,8 +985,6 @@
 }

 //! Effects: Swaps the contents of *this and x.
- //! If this->allocator_type() != x.allocator_type()
- //! allocators are also swapped.
 //!
 //! Throws: Nothing.
 //!

Modified: trunk/boost/container/flat_map.hpp
==============================================================================
--- trunk/boost/container/flat_map.hpp (original)
+++ trunk/boost/container/flat_map.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -436,7 +436,6 @@
 }

 //! 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 @@
 //! 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<iterator,bool> insert(const value_type& x)
 { return container_detail::force<std::pair<iterator,bool> >(
 m_flat_tree.insert_unique(container_detail::force<impl_value_type>(x))); }
@@ -469,7 +468,7 @@
 //! 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<iterator,bool> insert(BOOST_RV_REF(value_type) x)
 { return container_detail::force<std::pair<iterator,bool> >(
 m_flat_tree.insert_unique(boost::move(container_detail::force<impl_value_type>(x)))); }
@@ -484,7 +483,7 @@
 //! 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<iterator,bool> insert(BOOST_RV_REF(impl_value_type) x)
 {
 return container_detail::force<std::pair<iterator,bool> >
@@ -501,7 +500,7 @@
 //! 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<iterator>(
 m_flat_tree.insert_unique(container_detail::force<impl_const_iterator>(position), container_detail::force<impl_value_type>(x))); }
@@ -514,7 +513,7 @@
 //! 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<iterator>(
 m_flat_tree.insert_unique(container_detail::force<impl_const_iterator>(position), boost::move(container_detail::force<impl_value_type>(x)))); }
@@ -527,7 +526,7 @@
 //! 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<iterator>(
@@ -542,7 +541,7 @@
 //! 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 <class InputIterator>
 void insert(InputIterator first, InputIterator last)
 { m_flat_tree.insert_unique(first, last); }
@@ -560,7 +559,7 @@
 //! 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 <class... Args>
 iterator emplace(Args&&... args)
 { return container_detail::force_copy<iterator>(m_flat_tree.emplace_unique(boost::forward<Args>(args)...)); }
@@ -576,7 +575,7 @@
 //! 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 <class... Args>
 iterator emplace_hint(const_iterator hint, Args&&... args)
 { return container_detail::force_copy<iterator>(m_flat_tree.emplace_hint_unique(container_detail::force<impl_const_iterator>(hint), boost::forward<Args>(args)...)); }
@@ -1103,7 +1102,6 @@
 { 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 @@
 //! 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<iterator>(m_flat_tree.insert_equal(container_detail::force<impl_value_type>(x))); }

@@ -1127,7 +1125,7 @@
 //! 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<iterator>(m_flat_tree.insert_equal(boost::move(x))); }

@@ -1137,7 +1135,7 @@
 //! 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<iterator>(m_flat_tree.insert_equal(boost::move(x))); }

@@ -1151,7 +1149,7 @@
 //! 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<iterator>(m_flat_tree.insert_equal(container_detail::force<impl_const_iterator>(position), container_detail::force<impl_value_type>(x))); }

@@ -1165,7 +1163,7 @@
 //! 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<iterator>
@@ -1183,7 +1181,7 @@
 //! 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<iterator>(
@@ -1197,7 +1195,7 @@
 //! 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 <class InputIterator>
 void insert(InputIterator first, InputIterator last)
 { m_flat_tree.insert_equal(first, last); }
@@ -1211,7 +1209,7 @@
 //! 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 <class... Args>
 iterator emplace(Args&&... args)
 { return container_detail::force_copy<iterator>(m_flat_tree.emplace_equal(boost::forward<Args>(args)...)); }
@@ -1227,7 +1225,7 @@
 //! 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 <class... Args>
 iterator emplace_hint(const_iterator hint, Args&&... args)
 {

Modified: trunk/boost/container/flat_set.hpp
==============================================================================
--- trunk/boost/container/flat_set.hpp (original)
+++ trunk/boost/container/flat_set.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -324,7 +324,6 @@
 { 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 @@
 //! 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<iterator, bool> insert(insert_const_ref_type x)
 { return priv_insert(x); }

@@ -365,7 +364,7 @@
 //! 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<iterator,bool> insert(BOOST_RV_REF(value_type) x)
 { return m_flat_tree.insert_unique(boost::move(x)); }

@@ -379,7 +378,7 @@
 //! 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 @@
 //! 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 @@
 //! 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 <class InputIterator>
 void insert(InputIterator first, InputIterator last)
 { m_flat_tree.insert_unique(first, last); }
@@ -430,7 +429,7 @@
 //! 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 <class... Args>
 iterator emplace(Args&&... args)
 { return m_flat_tree.emplace_unique(boost::forward<Args>(args)...); }
@@ -446,7 +445,7 @@
 //! 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 <class... Args>
 iterator emplace_hint(const_iterator hint, Args&&... args)
 { return m_flat_tree.emplace_hint_unique(hint, boost::forward<Args>(args)...); }
@@ -929,7 +928,6 @@
 { 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 @@
 //! 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 @@
 //! 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 @@
 //! 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 @@
 //! 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 @@
 //! 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 <class InputIterator>
 void insert(InputIterator first, InputIterator last)
 { m_flat_tree.insert_equal(first, last); }
@@ -1022,7 +1020,7 @@
 //! 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 <class... Args>
 iterator emplace(Args&&... args)
 { return m_flat_tree.emplace_equal(boost::forward<Args>(args)...); }
@@ -1037,7 +1035,7 @@
 //! 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 <class... Args>
 iterator emplace_hint(const_iterator hint, Args&&... args)
 { return m_flat_tree.emplace_hint_equal(hint, boost::forward<Args>(args)...); }

Modified: trunk/boost/container/list.hpp
==============================================================================
--- trunk/boost/container/list.hpp (original)
+++ trunk/boost/container/list.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -701,8 +701,6 @@
 }

 //! Effects: Swaps the contents of *this and x.
- //! If this->allocator_type() != x.allocator_type()
- //! allocators are also swapped.
 //!
 //! Throws: Nothing.
 //!

Modified: trunk/boost/container/map.hpp
==============================================================================
--- trunk/boost/container/map.hpp (original)
+++ trunk/boost/container/map.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -376,7 +376,6 @@
 }

 //! 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 @@
 { 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.
 //!

Modified: trunk/boost/container/set.hpp
==============================================================================
--- trunk/boost/container/set.hpp (original)
+++ trunk/boost/container/set.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -317,7 +317,6 @@
 { 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 @@
 { 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.
 //!

Modified: trunk/boost/container/slist.hpp
==============================================================================
--- trunk/boost/container/slist.hpp (original)
+++ trunk/boost/container/slist.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -596,8 +596,6 @@
 { return !this->size(); }

 //! Effects: Swaps the contents of *this and x.
- //! If this->allocator_type() != x.allocator_type()
- //! allocators are also swapped.
 //!
 //! Throws: Nothing.
 //!

Modified: trunk/boost/container/stable_vector.hpp
==============================================================================
--- trunk/boost/container/stable_vector.hpp (original)
+++ trunk/boost/container/stable_vector.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -1226,8 +1226,6 @@
 { 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.
 //!

Modified: trunk/boost/container/vector.hpp
==============================================================================
--- trunk/boost/container/vector.hpp (original)
+++ trunk/boost/container/vector.hpp 2011-12-23 06:47:56 EST (Fri, 23 Dec 2011)
@@ -1080,8 +1080,6 @@
 #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.
 //!

Next message: igaztanaga_at_[hidden]: "[Boost-commit] svn:boost r76114 - in trunk/boost: container interprocess"
Previous message: igaztanaga_at_[hidden]: "[Boost-commit] svn:boost r76112 - trunk/boost/intrusive"

Date view	Thread view	Subject view	Author view

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