From d4c579b56109284162f084bf031cd4eea1f1b036 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 23 Oct 2013 14:08:46 -0400 Subject: [PATCH] * include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base. From-SVN: r203984 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/bits/hashtable.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e5c07bc59a0..40470688e5f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2013-10-23 Jason Merrill + + * include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base. + 2013-10-23 Paolo Carlini PR libstdc++/58850 diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 43c89b1ce51..c639c553d34 100644 --- a/libstdc++-v3/include/bits/hashtable.h +++ b/libstdc++-v3/include/bits/hashtable.h @@ -284,7 +284,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION is_default_constructible< // We use _Hashtable_ebo_helper to access the protected // default constructor. - __detail::_Hashtable_ebo_helper<0, __hash_code_base>>>::value, + __detail::_Hashtable_ebo_helper<0, __hash_code_base, true>>>::value, "Cache the hash code or make functors involved in hash code" " and bucket index computation default constructible");