diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-11-14 02:00:26 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-11-14 02:00:26 +0000 |
commit | 682d2b7ee96c90d77f37c187b7d247c379074157 (patch) | |
tree | 48ea4cac6379cfd7531956b09eb3e9b8c41d31c8 | |
parent | 84adbcae1b9c8d297bb1130195764247af27be13 (diff) | |
download | gcc-682d2b7ee96c90d77f37c187b7d247c379074157.tar.gz |
PR78326 fix incorrect access of data member in base class
PR libstdc++/78326
* include/experimental/memory_resource (memory_resource::_S_max_align):
Change access to protected.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@242373 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/experimental/memory_resource | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 83a61393cbb..c8cbb2c29f7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-11-13 Jonathan Wakely <jwakely@redhat.com> + PR libstdc++/78326 + * include/experimental/memory_resource (memory_resource::_S_max_align): + Change access to protected. + * doc/xml/manual/status_cxx2017.xml: Update status. * doc/html/manual/status.html: Regenerate. * include/bits/shared_ptr.h (shared_ptr(unique_ptr<_Yp, _Del>)): Add diff --git a/libstdc++-v3/include/experimental/memory_resource b/libstdc++-v3/include/experimental/memory_resource index 39187c50881..52e0b031653 100644 --- a/libstdc++-v3/include/experimental/memory_resource +++ b/libstdc++-v3/include/experimental/memory_resource @@ -72,6 +72,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // 8.5 Class memory_resource class memory_resource { + protected: static constexpr size_t _S_max_align = alignof(max_align_t); public: |