This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[Patch] Another one...


Hi,

another one. Tested x86-linux.

Would like to commit tomorrow together with the other one
(amended from the very stupid and pointless qualifications
noticed by Martin, of course)

Paolo.

////////
2003-07-03  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/stl_iterator_base_funcs.h: Fully qualify
	standard functions with std::, thus avoiding Koenig lookup.
diff -cprN libstdc++-v3-orig/include/bits/stl_iterator_base_funcs.h libstdc++-v3/include/bits/stl_iterator_base_funcs.h
*** libstdc++-v3-orig/include/bits/stl_iterator_base_funcs.h	Tue Jun 10 23:52:23 2003
--- libstdc++-v3/include/bits/stl_iterator_base_funcs.h	Thu Jul  3 22:32:22 2003
***************
*** 1,6 ****
  // Functions used by iterators -*- C++ -*-
  
! // Copyright (C) 2001, 2002 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
--- 1,6 ----
  // Functions used by iterators -*- C++ -*-
  
! // 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
*************** namespace std
*** 111,117 ****
      distance(_InputIterator __first, _InputIterator __last)
      {
        // concept requirements -- taken care of in __distance
!       return __distance(__first, __last, __iterator_category(__first));
      }
    
    template<typename _InputIterator, typename _Distance>
--- 111,117 ----
      distance(_InputIterator __first, _InputIterator __last)
      {
        // concept requirements -- taken care of in __distance
!       return std::__distance(__first, __last, __iterator_category(__first));
      }
    
    template<typename _InputIterator, typename _Distance>
*************** namespace std
*** 164,170 ****
      advance(_InputIterator& __i, _Distance __n)
      {
        // concept requirements -- taken care of in __advance
!       __advance(__i, __n, __iterator_category(__i));
      }
  } // namespace std
  
--- 164,170 ----
      advance(_InputIterator& __i, _Distance __n)
      {
        // concept requirements -- taken care of in __advance
!       std::__advance(__i, __n, __iterator_category(__i));
      }
  } // namespace std
  

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]