* include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base.

From-SVN: r203984

* include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base.
From-SVN: r203984
d4c579b5 · Jason Merrill · Jason Merrill · 24d2e5eb · d4c579b5 · d4c579b5
Commit d4c579b5 authored Oct 23, 2013 by Jason Merrill Committed by Jason Merrill Oct 23, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

libstdc++-v3/ChangeLog
+4 -0

libstdc++-v3/include/bits/hashtable.h
+1 -1

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+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

--- 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");