diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e5c07bc..4047068 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2013-10-23 Jason Merrill <jason@redhat.com> + + * include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base. + 2013-10-23 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/58850 diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h index 43c89b1..c639c55 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"); |