diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/stl_algobase.h | 8 | ||||
| -rw-r--r-- | 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 c839f27..e7d18fd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,11 @@ 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 (uniform_int<>::_M_call(_UniformRandomNumberGenerator&, result_type, result_type, true_type)): Fix small thinko. diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 6a6e2e0..75bf7e0 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<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 f8e1062..ab5b494 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) |