aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-11-14 02:00:26 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2016-11-14 02:00:26 +0000
commit881ca4c9de62eedb450a9c4d884318ec82a86d00 (patch)
tree48ea4cac6379cfd7531956b09eb3e9b8c41d31c8
parentd1422b9d9a7faf2f0a021a92ba8701bdf7b81406 (diff)
downloadgcc-881ca4c9de62eedb450a9c4d884318ec82a86d00.zip
gcc-881ca4c9de62eedb450a9c4d884318ec82a86d00.tar.gz
gcc-881ca4c9de62eedb450a9c4d884318ec82a86d00.tar.bz2
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. From-SVN: r242373
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/experimental/memory_resource1
2 files changed, 5 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 83a6139..c8cbb2c 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 39187c5..52e0b03 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: