2005-05-20 Paolo Carlini <pcarlini@suse.de>

	* include/bits/stl_algo.h (__rotate<_RandomAccessIterator>):
	Don't qualify __tmp as const, _ValueType is not necessarily
	Assignable.
	* include/bits/stl_algobase.h (swap, __iter_swap<false>):
	Likewise, as an harmless extension.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100011 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 888dfed..efde72f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-20  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/stl_algo.h (__rotate<_RandomAccessIterator>):
+       Don't qualify __tmp as const, _ValueType is not necessarily
+       Assignable.
+       * include/bits/stl_algobase.h (swap, __iter_swap<false>):
+       Likewise, as an harmless extension.
+
 2005-05-19  Richard Henderson  <rth@redhat.com>
 
        * libsupc++/unwind-cxx.h: Revert gcc_unreachable change.

diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index c0eaf5c..7647ba3 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algo.h
+++ b/libstdc++-v3/include/bits/stl_algo.h
@@ -1,6 +1,6 @@
 // Algorithm implementation -*- C++ -*-
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 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
@@ -1637,7 +1637,7 @@ namespace std
 
       for (_Distance __i = 0; __i < __d; __i++)
        {
-         const _ValueType __tmp = *__first;
+         _ValueType __tmp = *__first;
          _RandomAccessIterator __p = __first;
 
          if (__k < __l)

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 426fcba..a0f7c50 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -94,7 +94,7 @@ namespace std
       // concept requirements
       __glibcxx_function_requires(_SGIAssignableConcept<_Tp>)
 
-      const _Tp __tmp = __a;
+      _Tp __tmp = __a;
       __a = __b;
       __b = __tmp;
     }
@@ -111,7 +111,7 @@ namespace std
         {
           typedef typename iterator_traits<_ForwardIterator1>::value_type
             _ValueType1;
-          const _ValueType1 __tmp = *__a;
+          _ValueType1 __tmp = *__a;
           *__a = *__b;
           *__b = __tmp; 
        }