diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 e3a84c5..f5246fe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2016-07-13 Jonathan Wakely <jwakely@redhat.com> + * include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make + static. + +2016-07-13 Jonathan Wakely <jwakely@redhat.com> + Revert "Add non-const overload of std::string::data()". 2016-07-13 Ville Voutilainen <ville.voutilainen@gmail.com> diff --git a/libstdc++-v3/include/bits/allocated_ptr.h b/libstdc++-v3/include/bits/allocated_ptr.h index 2bd9d82..97e2666 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<typename _Ptr> - 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; |