Subject: [Boost-commit] svn:boost r85660 - in trunk: boost/container libs/container/doc
From: igaztanaga_at_[hidden]
Date: 2013-09-12 18:00:51
Author: igaztanaga
Date: 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013)
New Revision: 85660
URL: http://svn.boost.org/trac/boost/changeset/85660
Log:
Fixes #9009
Text files modified:
trunk/boost/container/deque.hpp | 2 +-
trunk/boost/container/flat_set.hpp | 4 ++--
trunk/boost/container/list.hpp | 2 +-
trunk/boost/container/set.hpp | 4 ++--
trunk/boost/container/slist.hpp | 4 ++--
trunk/boost/container/stable_vector.hpp | 2 +-
trunk/boost/container/vector.hpp | 6 +++---
trunk/libs/container/doc/container.qbk | 1 +
8 files changed, 13 insertions(+), 12 deletions(-)
Modified: trunk/boost/container/deque.hpp
==============================================================================
--- trunk/boost/container/deque.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/deque.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -1301,7 +1301,7 @@
//! Linear time otherwise.
iterator insert(const_iterator position, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: pos must be a valid iterator of *this.
Modified: trunk/boost/container/flat_set.hpp
==============================================================================
--- trunk/boost/container/flat_set.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/flat_set.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -512,7 +512,7 @@
//! <b>Note</b>: If an element is inserted it might invalidate elements.
iterator insert(const_iterator position, value_type &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: first, last are not iterators into *this.
@@ -1189,7 +1189,7 @@
//! <b>Note</b>: If an element is inserted it might invalidate elements.
iterator insert(const_iterator position, value_type &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: first, last are not iterators into *this.
Modified: trunk/boost/container/list.hpp
==============================================================================
--- trunk/boost/container/list.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/list.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -777,7 +777,7 @@
//! <b>Complexity</b>: Amortized constant time.
iterator insert(const_iterator position, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: p must be a valid iterator of *this.
Modified: trunk/boost/container/set.hpp
==============================================================================
--- trunk/boost/container/set.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/set.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -457,7 +457,7 @@
//! <b>Complexity</b>: Logarithmic.
iterator insert(const_iterator position, value_type &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: first, last are not iterators into *this.
@@ -1077,7 +1077,7 @@
//! is inserted right before p.
iterator insert(const_iterator position, value_type &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, value_type, iterator, this->priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: first, last are not iterators into *this.
Modified: trunk/boost/container/slist.hpp
==============================================================================
--- trunk/boost/container/slist.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/slist.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -753,7 +753,7 @@
//! previous values.
iterator insert_after(const_iterator prev_pos, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert_after, T, iterator, priv_insert_after, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert_after, T, iterator, priv_insert_after, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: prev_pos must be a valid iterator of *this.
@@ -1266,7 +1266,7 @@
//! <b>Complexity</b>: Linear to the elements before p.
iterator insert(const_iterator prev_pos, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: p must be a valid iterator of *this.
Modified: trunk/boost/container/stable_vector.hpp
==============================================================================
--- trunk/boost/container/stable_vector.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/stable_vector.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -1306,7 +1306,7 @@
//! Linear time otherwise.
iterator insert(const_iterator position, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: pos must be a valid iterator of *this.
Modified: trunk/boost/container/vector.hpp
==============================================================================
--- trunk/boost/container/vector.hpp Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/boost/container/vector.hpp 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -1347,7 +1347,7 @@
//! Linear time otherwise.
iterator insert(const_iterator position, T &&x);
#else
- BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator)
+ BOOST_MOVE_CONVERSION_AWARE_CATCH_1ARG(insert, T, iterator, priv_insert, const_iterator, const_iterator)
#endif
//! <b>Requires</b>: p must be a valid iterator of *this.
@@ -1636,7 +1636,7 @@
( this->m_holder.alloc(), raw_beg, sz, container_detail::to_raw_pointer(p) );
if(this->m_holder.capacity()){
if(!value_traits::trivial_dctr_after_move)
- boost::container::destroy_alloc_n(this->m_holder.alloc(), raw_beg, sz);
+ boost::container::destroy_alloc_n(this->m_holder.alloc(), raw_beg, sz);
this->m_holder.deallocate(this->m_holder.start(), this->m_holder.capacity());
}
this->m_holder.start(p);
@@ -1690,7 +1690,7 @@
( this->m_holder.alloc(), raw_beg, sz, container_detail::to_raw_pointer(ret.first) );
if(this->m_holder.capacity()){
if(!value_traits::trivial_dctr_after_move)
- boost::container::destroy_alloc_n(this->m_holder.alloc(), raw_beg, sz);
+ boost::container::destroy_alloc_n(this->m_holder.alloc(), raw_beg, sz);
this->m_holder.deallocate(this->m_holder.start(), this->m_holder.capacity());
}
this->m_holder.start(ret.first);
Modified: trunk/libs/container/doc/container.qbk
==============================================================================
--- trunk/libs/container/doc/container.qbk Thu Sep 12 17:56:02 2013 (r85659)
+++ trunk/libs/container/doc/container.qbk 2013-09-12 18:00:51 EDT (Thu, 12 Sep 2013) (r85660)
@@ -720,6 +720,7 @@
* Fixed bugs [@https://svn.boost.org/trac/boost/ticket/8269 #8269],
[@https://svn.boost.org/trac/boost/ticket/8473 #8473],
[@https://svn.boost.org/trac/boost/ticket/8892 #8892],
+ [@https://svn.boost.org/trac/boost/ticket/9009 #9009],
[@https://svn.boost.org/trac/boost/ticket/9064 #9064],
[@https://svn.boost.org/trac/boost/ticket/9092 #9092],
[@https://svn.boost.org/trac/boost/ticket/9108 #9108].