2009-06-20 Paolo Carlini <paolo.carlini@oracle.com>

	* Revert last Change.

From-SVN: r148756

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4ab36ce50288af2ded554a39b5b65c30160d5248..8e7277447cab98228fac1997fd2e9d047ae9cf0b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-20  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * Revert last Change.
+
 2009-06-20  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/40497

diff --git a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
index 88ea8293ba604efe5438dc9893e56065fd06aa3a..0a854faa14cd967b15b11f32f8227bcc8afad68d 100644 (file)
--- a/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
+++ b/libstdc++-v3/include/bits/stl_iterator_base_funcs.h
@@ -175,8 +175,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
   template<typename _InputIterator>
     inline _InputIterator 
-    next(_InputIterator __x,
-        typename _InputIterator::difference_type __n = 1)
+    next(_InputIterator __x, typename
+        iterator_traits<_InputIterator>::difference_type __n = 1)
     {
       std::advance(__x, __n);
       return __x;
@@ -184,8 +184,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
   template<typename _BidirectionalIterator>
     inline _BidirectionalIterator 
-    prev(_BidirectionalIterator __x,
-        typename _BidirectionalIterator::difference_type __n = 1) 
+    prev(_BidirectionalIterator __x, typename
+        iterator_traits<_BidirectionalIterator>::difference_type __n = 1) 
     {
       std::advance(__x, -__n);
       return __x;

diff --git a/libstdc++-v3/testsuite/24_iterators/operations/40497.cc b/libstdc++-v3/testsuite/24_iterators/operations/40497.cc
deleted file mode 100644 (file)
index 8b476b2..0000000
--- a/libstdc++-v3/testsuite/24_iterators/operations/40497.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// { 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);
-}