diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algo.h | 24 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/unique/1.cc (renamed from libstdc++-v3/testsuite/25_algorithms/unique.cc) | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/unique/11480.cc | 46 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/25_algorithms/unique/2.cc | 95 |
5 files changed, 173 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b538114..481dd37 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,13 @@ 2003-10-14 Paolo Carlini <pcarlini@unitus.it> + PR libstdc++/11480 + * include/bits/stl_algo.h (unique): Fix. + * testsuite/25_algorithms/unique.cc: Move to unique/1.cc. + * testsuite/25_algorithms/unique/11480.cc: New, from the PR. + * testsuite/25_algorithms/unique/2.cc: New. + +2003-10-14 Paolo Carlini <pcarlini@unitus.it> + * src/localename.cc (_M_replace_categories, M_replace_facet): Const-ify a couple of variables. diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index 062550c..70ef219 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -1268,8 +1268,18 @@ namespace std __glibcxx_function_requires(_EqualityComparableConcept< typename iterator_traits<_ForwardIterator>::value_type>) + // Skip the beginning, if already unique. __first = std::adjacent_find(__first, __last); - return std::unique_copy(__first, __last, __first); + if (__first == __last) + return __last; + + // Do the real copy work. + _ForwardIterator __dest = __first; + ++__first; + while (++__first != __last) + if (!(*__dest == *__first)) + *++__dest = *__first; + return ++__dest; } /** @@ -1297,8 +1307,18 @@ namespace std typename iterator_traits<_ForwardIterator>::value_type, typename iterator_traits<_ForwardIterator>::value_type>) + // Skip the beginning, if already unique. __first = std::adjacent_find(__first, __last, __binary_pred); - return std::unique_copy(__first, __last, __first, __binary_pred); + if (__first == __last) + return __last; + + // Do the real copy work. + _ForwardIterator __dest = __first; + ++__first; + while (++__first != __last) + if (!__binary_pred(*__dest, *__first)) + *++__dest = *__first; + return ++__dest; } /** diff --git a/libstdc++-v3/testsuite/25_algorithms/unique.cc b/libstdc++-v3/testsuite/25_algorithms/unique/1.cc index 6a4d7f2..6c383bb 100644 --- a/libstdc++-v3/testsuite/25_algorithms/unique.cc +++ b/libstdc++-v3/testsuite/25_algorithms/unique/1.cc @@ -1,6 +1,6 @@ // 2001-07-19 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de> -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -18,13 +18,11 @@ // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, // USA. -// 25.2.8 Unique - +// 25.2.8 [lib.alg.unique] Unique #include <list> #include <algorithm> - int main() { using namespace std; diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc b/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc new file mode 100644 index 0000000..6ac9f68 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/unique/11480.cc @@ -0,0 +1,46 @@ +// Copyright (C) 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +#include <algorithm> +#include <testsuite_hooks.h> + +int a[10] = { 1, 2, 3, 3, 4, 5, 5, 6, 7, 9 }; + +static int compare_count = 0; + +bool compare(int a, int b) +{ + compare_count++; + return a == b; +} + +// libstdc++/11480 +void test01() +{ + bool test __attribute__((unused)) = true; + + std::unique(a, a+10, compare); + VERIFY( compare_count == 9 ); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/unique/2.cc b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc new file mode 100644 index 0000000..55920fb --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/unique/2.cc @@ -0,0 +1,95 @@ +// 2003-10-14 Paolo Carlini <pcarlini@unitus.it> + +// Copyright (C) 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 25.2.8 [lib.alg.unique] Unique + +#include <list> +#include <algorithm> +#include <functional> +#include <testsuite_hooks.h> + +const int T1[] = {1, 4, 4, 6, 1, 2, 2, 3, 1, 6, 6, 6, 5, 7, 5, 4, 4}; +const int T2[] = {1, 1, 1, 2, 2, 1, 1, 7, 6, 6, 7, 8, 8, 8, 8, 9, 9}; +const int N = sizeof(T1) / sizeof(int); + +const int A1[] = {1, 4, 6, 1, 2, 3, 1, 6, 5, 7, 5, 4}; +const int A2[] = {1, 4, 4, 6, 6, 6, 6, 7}; +const int A3[] = {1, 1, 1}; + +const int B1[] = {1, 2, 1, 7, 6, 7, 8, 9}; +const int B2[] = {1, 1, 1, 2, 2, 7, 7, 8, 8, 8, 8, 9, 9}; +const int B3[] = {9, 9, 8, 8, 8, 8, 7, 6, 6, 1, 1, 1, 1, 1}; + +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + list<int>::iterator pos; + + list<int> coll(T1, T1 + N); + pos = unique(coll.begin(), coll.end()); + VERIFY( equal(coll.begin(), pos, A1) ); + + list<int> coll2(T2, T2 + N); + pos = unique(coll2.begin(), coll2.end()); + VERIFY( equal(coll2.begin(), pos, B1) ); +} + +void test02() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + list<int>::iterator pos; + + list<int> coll(T1, T1 + N); + pos = unique(coll.begin(), coll.end(), greater<int>()); + VERIFY( equal(coll.begin(), pos, A2) ); + + list<int> coll2(T2, T2 + N); + pos = unique(coll2.begin(), coll2.end(), greater<int>()); + VERIFY( equal(coll2.begin(), pos, B2) ); +} + +void test03() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + list<int>::iterator pos; + + list<int> coll(T1, T1 + N); + pos = unique(coll.begin(), coll.end(), less<int>()); + VERIFY( equal(coll.begin(), pos, A3) ); + + list<int> coll2(T2, T2 + N); + reverse(coll2.begin(), coll2.end()); + pos = unique(coll2.begin(), coll2.end(), less<int>()); + VERIFY( equal(coll2.begin(), pos, B3) ); +} + +int main() +{ + test01(); + test02(); + test03(); + return 0; +} |