From: Jason Merrill <jason@redhat.com>
Date: Wed, 23 Oct 2013 18:08:46 +0000 (-0400)
Subject: * include/bits/hashtable.h (_Hashtable): Force EBO for _Hash_code_base.
X-Git-Tag: releases/gcc-4.9.0~3274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4c579b56109284162f084bf031cd4eea1f1b036;p=thirdparty%2Fgcc.git

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

From-SVN: r203984
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e5c07bc59a02..40470688e5fc 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 43c89b1ce515..c639c553d34a 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");