Merge bug fixes to release; Fixes #7399 Fixes #7400 Fixes #7401

[SVN r80670]
This commit is contained in:
Marshall Clow
2012-09-23 14:56:41 +00:00
parent 6341cfb1a6
commit 29bd9f53d9
6 changed files with 105 additions and 7 deletions

View File

@ -39,7 +39,7 @@ OutputIterator copy_if ( InputIterator first, InputIterator last, OutputIterator
{
for ( ; first != last; ++first )
if (p(*first))
*result++ = first;
*result++ = *first;
return result;
}
#endif
@ -75,7 +75,7 @@ OutputIterator copy_while ( InputIterator first, InputIterator last,
OutputIterator result, Predicate p )
{
for ( ; first != last && p(*first); ++first )
*result++ = first;
*result++ = *first;
return result;
}
@ -109,7 +109,7 @@ template<typename InputIterator, typename OutputIterator, typename Predicate>
OutputIterator copy_until ( InputIterator first, InputIterator last, OutputIterator result, Predicate p )
{
for ( ; first != last && !p(*first); ++first )
*result++ = first;
*result++ = *first;
return result;
}