mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-07-12 14:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix.

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-07-02 22:16:29 +09:00
parent 93e22a984d
commit 15c3f55ebb
69 changed files with 406 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sprout/algorithm/cxx14/merge.hpp
View file

@ -26,10 +26,10 @@ namespace sprout {
merge(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp) {
while (true) {
if (first1 == last1) {
return std::copy(first2, last2, result);
return sprout::copy(first2, last2, result);
}
if (first2 == last2) {
return std::copy(first1, last1, result);
return sprout::copy(first1, last1, result);
}
*result++ = comp(*first2, *first1)
? *first2++