generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chris Jefferson noted that vector iterator ownership can be transferred from source to target under move construction and move assignment. This commit makes that happen for debug mode.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140023 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant
2011-09-19 16:34:29 +00:00
parent be969d7c7d
commit e6125bdeae
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/vector
View File

@@ -1106,8 +1106,8 @@ vector<_Tp, _Allocator>::vector(vector&& __x)
: __base(_VSTD::move(__x.__alloc())) : __base(_VSTD::move(__x.__alloc()))
{ {
#if _LIBCPP_DEBUG_LEVEL >= 2 #if _LIBCPP_DEBUG_LEVEL >= 2
__x.__invalidate_all_iterators();
__get_db()->__insert_c(this); __get_db()->__insert_c(this);
__get_db()->swap(this, &__x);
#endif #endif
this->__begin_ = __x.__begin_; this->__begin_ = __x.__begin_;
this->__end_ = __x.__end_; this->__end_ = __x.__end_;
@@ -1129,7 +1129,9 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const allocator_type& __a)
this->__end_ = __x.__end_; this->__end_ = __x.__end_;
this->__end_cap() = __x.__end_cap(); this->__end_cap() = __x.__end_cap();
__x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr; __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
__x.__invalidate_all_iterators(); #if _LIBCPP_DEBUG_LEVEL >= 2
__get_db()->swap(this, &__x);
#endif
} }
else else
{ {
@@ -1208,6 +1210,9 @@ vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)
this->__end_cap() = __c.__end_cap(); this->__end_cap() = __c.__end_cap();
__base::__move_assign_alloc(__c); __base::__move_assign_alloc(__c);
__c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr; __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr;
#if _LIBCPP_DEBUG_LEVEL >= 2
__get_db()->swap(this, &__c);
#endif
} }
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES