Make __allocated_ptr::_S_raw_ptr static
* include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make static. From-SVN: r238305
This commit is contained in:
parent
2d60da1031
commit
260d92cd0d
|
@ -1,3 +1,8 @@
|
||||||
|
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>
|
2016-07-13 Jonathan Wakely <jwakely@redhat.com>
|
||||||
|
|
||||||
Revert "Add non-const overload of std::string::data()".
|
Revert "Add non-const overload of std::string::data()".
|
||||||
|
|
|
@ -85,10 +85,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
value_type* get() { return _S_raw_ptr(_M_ptr); }
|
value_type* get() { return _S_raw_ptr(_M_ptr); }
|
||||||
|
|
||||||
private:
|
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>
|
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->()); }
|
{ return _S_raw_ptr(__ptr.operator->()); }
|
||||||
|
|
||||||
_Alloc* _M_alloc;
|
_Alloc* _M_alloc;
|
||||||
|
|
Loading…
Reference in New Issue