OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make __allocated_ptr::_S_raw_ptr static

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

From-SVN: r238305
This commit is contained in:
Jonathan Wakely 2016-07-13 18:22:47 +01:00 committed by Jonathan Wakely
parent 2d60da1031
commit 260d92cd0d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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>
Revert "Add non-const overload of std::string::data()".

5
libstdc++-v3/include/bits/allocated_ptr.h
View File

@ -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;