From 85799c607bd51136e8d0eeefa7039ce82e10a900 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sat, 20 Oct 2007 10:08:29 +0000 Subject: [PATCH] stl_move.h (_GLIBCXX_MOVE): Wrap in parentheses. 2007-10-20 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/stl_algobase.h | 8 ++++---- libstdc++-v3/include/bits/stl_move.h | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c839f27efed..e7d18fdd4b4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-10-20 Paolo Carlini + + * 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 * include/tr1_impl/random diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 6a6e2e03bd4..75bf7e07f9b 100644 --- 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 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 f8e10620a0d..ab5b494f1b9 100644 --- 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) -- 2.30.2