This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix libstdc++/40497
- From: Paolo Carlini <paolo dot carlini at oracle dot com>
- To: "gcc-patches at gcc dot gnu dot org" <gcc-patches at gcc dot gnu dot org>
- Cc: libstdc++ <libstdc++ at gcc dot gnu dot org>
- Date: Sun, 21 Jun 2009 00:28:27 +0200
- Subject: [v3] Fix libstdc++/40497
Hi,
tested x86_64-linux, committed to mainline and 4_4-branch.
Paolo.
/////////////////////
2009-06-20 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/40497
* include/bits/stl_iterator_base_funcs.h (next, prev): Fix the
signature per the current C++1x draft (N2857).
* testsuite/24_iterators/operations/40497.cc: Add.
Index: include/bits/stl_iterator_base_funcs.h
===================================================================
--- include/bits/stl_iterator_base_funcs.h (revision 148720)
+++ include/bits/stl_iterator_base_funcs.h (working copy)
@@ -175,8 +175,8 @@
#ifdef __GXX_EXPERIMENTAL_CXX0X__
template<typename _InputIterator>
inline _InputIterator
- next(_InputIterator __x, typename
- iterator_traits<_InputIterator>::difference_type __n = 1)
+ next(_InputIterator __x,
+ typename _InputIterator::difference_type __n = 1)
{
std::advance(__x, __n);
return __x;
@@ -184,8 +184,8 @@
template<typename _BidirectionalIterator>
inline _BidirectionalIterator
- prev(_BidirectionalIterator __x, typename
- iterator_traits<_BidirectionalIterator>::difference_type __n = 1)
+ prev(_BidirectionalIterator __x,
+ typename _BidirectionalIterator::difference_type __n = 1)
{
std::advance(__x, -__n);
return __x;
Index: testsuite/24_iterators/operations/40497.cc
===================================================================
--- testsuite/24_iterators/operations/40497.cc (revision 0)
+++ testsuite/24_iterators/operations/40497.cc (revision 0)
@@ -0,0 +1,41 @@
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// Copyright (C) 2009 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 3, 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 COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+namespace X
+{
+ class C { };
+
+ template<class T> void next(T) { }
+ template<class T> void prev(T) { }
+}
+
+using namespace X;
+
+#include <string>
+
+using namespace std;
+
+// libstdc++/40497
+void test01()
+{
+ C c;
+ next(c);
+ prev(c);
+}