Commit 260d92cd by Jonathan Wakely Committed by Jonathan Wakely

Make __allocated_ptr::_S_raw_ptr static

	* include/bits/allocated_ptr.h (__allocated_ptr::_S_raw_ptr): Make
	static.

From-SVN: r238305
parent 2d60da10
2016-07-13 Jonathan Wakely <jwakely@redhat.com> 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()". Revert "Add non-const overload of std::string::data()".
2016-07-13 Ville Voutilainen <ville.voutilainen@gmail.com> 2016-07-13 Ville Voutilainen <ville.voutilainen@gmail.com>
......
...@@ -85,10 +85,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment