Skip to content

<vector>: Apply append-and-rotate for vector<bool> insertion #3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephanTLavavej merged 7 commits into from
Aug 12, 2022
Merged

<vector>: Apply append-and-rotate for vector<bool> insertion #3021

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b8699d
Apply append-and-rotate for vector<bool> insertion
frederick-vs-ja Aug 10, 2022
ce60c29
Fix format copy-pasta...
frederick-vs-ja Aug 10, 2022
223ad49
Fix a fatal name error
frederick-vs-ja Aug 10, 2022
fbfbf34
Add forgotten guards
frederick-vs-ja Aug 10, 2022
e9b7bf4
RERUN
frederick-vs-ja Aug 10, 2022
ec96a1c
RERUN, again
frederick-vs-ja Aug 10, 2022
6cc56b2
Use for-loops and emplace_back.
StephanTLavavej Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions stl/inc/vector
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3406,11 +3406,14 @@ public:
_Copy_unchecked(_UFirst, _ULast, begin() + _Off);
#endif // __cpp_lib_concepts
} else {
difference_type _Off = _Saved_offset;

for (; _UFirst != _ULast; ++_UFirst, (void) ++_Off) {
insert(begin() + _Off, *_UFirst);
const auto _Old_size = this->_Mysize;
for (; _UFirst != _ULast; ++_UFirst) {
emplace_back(*_UFirst);
}
#if _ITERATOR_DEBUG_LEVEL == 2
_Orphan_range(static_cast<size_type>(_Saved_offset), _Old_size);
#endif // _ITERATOR_DEBUG_LEVEL == 2
_STD rotate(begin() + _Saved_offset, begin() + static_cast<difference_type>(_Old_size), end());
}

return begin() + _Saved_offset;
Expand All @@ -3427,11 +3430,16 @@ public:
const auto _Off = static_cast<difference_type>(_Insert_x(_Where, _Count));
_Copy_n_unchecked4(_RANGES _Ubegin(_Range), _Count, begin() + _Off);
} else {
auto _UFirst = _RANGES _Ubegin(_Range);
const auto _ULast = _RANGES _Uend(_Range);
for (difference_type _Off = _Old_off; _UFirst != _ULast; ++_UFirst, (void) ++_Off) {
insert(begin() + _Off, *_UFirst);
auto _UFirst = _RANGES _Ubegin(_Range);
const auto _ULast = _RANGES _Uend(_Range);
const auto _Old_size = this->_Mysize;
for (; _UFirst != _ULast; ++_UFirst) {
emplace_back(*_UFirst);
}
#if _ITERATOR_DEBUG_LEVEL == 2
_Orphan_range(static_cast<size_type>(_Old_off), _Old_size);
#endif // _ITERATOR_DEBUG_LEVEL == 2
_STD rotate(begin() + _Old_off, begin() + static_cast<difference_type>(_Old_size), end());
}

return begin() + _Old_off;
Expand Down