From 2b4a2a08156cdf2a3cff99f19e9735b1103e357a Mon Sep 17 00:00:00 2001 From: redi Date: Wed, 13 Jul 2016 17:22:47 +0000 Subject: [PATCH] Make __allocated_ptr::_S_raw_ptr static * include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make static. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238305 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/allocated_ptr.h | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e3a84c5a1f0b..f5246fe05774 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2016-07-13 Jonathan Wakely + + * include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make + static. + 2016-07-13 Jonathan Wakely Revert "Add non-const overload of std::string::data()". diff --git a/libstdc++-v3/include/bits/allocated_ptr.h b/libstdc++-v3/include/bits/allocated_ptr.h index 2bd9d82fd039..97e26662432b 100644 --- a/libstdc++-v3/include/bits/allocated_ptr.h +++ b/libstdc++-v3/include/bits/allocated_ptr.h @@ -85,10 +85,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION value_type* get() { return _S_raw_ptr(_M_ptr); } private: - value_type* _S_raw_ptr(value_type* __ptr) { return __ptr; } + static value_type* _S_raw_ptr(value_type* __ptr) { return __ptr; } template - auto _S_raw_ptr(_Ptr __ptr) -> decltype(_S_raw_ptr(__ptr.operator->())) + static auto + _S_raw_ptr(_Ptr __ptr) -> decltype(_S_raw_ptr(__ptr.operator->())) { return _S_raw_ptr(__ptr.operator->()); } _Alloc* _M_alloc; -- 2.47.3