From 0fd76d8e4c34b647eec8fcd7c8b797b8559301e0 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 8 Oct 2010 20:30:44 +0000 Subject: [PATCH] future (_Result_alloc): Derive from _Alloc, exploit the Empty Base Optimization. 2010-10-08 Paolo Carlini * include/std/future (_Result_alloc): Derive from _Alloc, exploit the Empty Base Optimization. From-SVN: r165194 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/future | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 172eb5b1736..b4ca4f215ce 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2010-10-08 Paolo Carlini + + * include/std/future (_Result_alloc): Derive from _Alloc, + exploit the Empty Base Optimization. + 2010-10-08 Jonathan Wakely PR libstdc++/45403 diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index ff566983ca2..2933c8be63f 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -215,24 +215,22 @@ namespace std /// Result_alloc. template - struct _Result_alloc : _Result<_Res> + struct _Result_alloc : _Result<_Res>, _Alloc { typedef typename _Alloc::template rebind<_Result_alloc>::other __allocator_type; explicit - _Result_alloc(const _Alloc& __a) : _Result<_Res>(), _M_alloc(__a) + _Result_alloc(const _Alloc& __a) : _Result<_Res>(), _Alloc(__a) { } private: void _M_destroy() { - __allocator_type __a(_M_alloc); + __allocator_type __a(*this); __a.destroy(this); __a.deallocate(this, 1); } - - __allocator_type _M_alloc; }; template -- 2.30.2