Index: include/bits/stl_algobase.h =================================================================== --- include/bits/stl_algobase.h (revision 129492) +++ include/bits/stl_algobase.h (working copy) @@ -269,16 +269,16 @@ 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(); } }; Index: include/bits/stl_move.h =================================================================== --- include/bits/stl_move.h (revision 129491) +++ include/bits/stl_move.h (working copy) @@ -64,7 +64,7 @@ #define _GLIBCXX_MOVE(_Tp) std::move(_Tp) #else -#define _GLIBCXX_MOVE(_Tp) _Tp +#define _GLIBCXX_MOVE(_Tp) (_Tp) #endif _GLIBCXX_BEGIN_NAMESPACE(std)