stl_move.h (_GLIBCXX_MOVE): Wrap in parentheses.

2007-10-20  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/stl_move.h (_GLIBCXX_MOVE): Wrap in parentheses.
	* include/bits/stl_algobase.h (__niter_base<>): Pass iterators
	by value, as everywhere else.

From-SVN: r129509

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c839f27efed7054a39a3cebae96886f349f41a7a..e7d18fdd4b4ae3e2f0fcbb278b69da74fc17d0b6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-20  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/stl_move.h (_GLIBCXX_MOVE): Wrap in parentheses.
+       * include/bits/stl_algobase.h (__niter_base<>): Pass iterators
+       by value, as everywhere else.
+
 2007-10-20  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1_impl/random

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 6a6e2e03bd47beb6e5a887e4df2de633b013ef7a..75bf7e07f9b919899a8a42f8a5b2aba4962a7ed1 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -269,16 +269,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
           bool _BoolType = __is_normal_iterator<_Iterator>::__value>
     struct __niter_base
     {
-      static const _Iterator&
-      __b(const _Iterator& __it)
+      static _Iterator
+      __b(_Iterator __it)
       { return __it; }
     };
 
   template<typename _Iterator>
     struct __niter_base<_Iterator, true>
     {
-      static const typename _Iterator::_Iterator_type&
-      __b(const _Iterator& __it)
+      static typename _Iterator::_Iterator_type
+      __b(_Iterator __it)
       { return __it.base(); }
     };
 

diff --git a/libstdc++-v3/include/bits/stl_move.h b/libstdc++-v3/include/bits/stl_move.h
index f8e10620a0d323adb0122db52d3ec5fff05be00d..ab5b494f1b90ac9792cf260fb792f3a40214a7b0 100644 (file)
--- a/libstdc++-v3/include/bits/stl_move.h
+++ b/libstdc++-v3/include/bits/stl_move.h
@@ -64,7 +64,7 @@ _GLIBCXX_END_NAMESPACE
 
 #define _GLIBCXX_MOVE(_Tp) std::move(_Tp)
 #else
-#define _GLIBCXX_MOVE(_Tp) _Tp
+#define _GLIBCXX_MOVE(_Tp) (_Tp)
 #endif
 
 _GLIBCXX_BEGIN_NAMESPACE(std)