OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hashtable.cc (__access_protected_ctor): Define and use new type instead of _Hashtable_ebo_helper.

Browse Source 
* include/bits/hashtable.cc (__access_protected_ctor): Define and use
	new type instead of _Hashtable_ebo_helper.
	* testsuite/23_containers/unordered_set/
	not_default_constructible_hash_neg.cc: Adjust line number.

From-SVN: r204182
This commit is contained in:
Jonathan Wakely 2013-10-29 21:19:34 +00:00 committed by Jonathan Wakely
parent 94b89bc0ea
commit da2e699194
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2013-10-29 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/bits/hashtable.cc (__access_protected_ctor): Define and use
new type instead of _Hashtable_ebo_helper.
* testsuite/23_containers/unordered_set/
not_default_constructible_hash_neg.cc: Adjust line number.
2013-10-28 Tim Shen <timshen91@gmail.com>
* regex_executor.tcc: Add comments.

9
libstdc++-v3/include/bits/hashtable.h
View File

@ -277,14 +277,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
"Functor used to map hash code to bucket index"
" must be default constructible");
// _Hash_code_base has a protected default constructor, so use this
// derived type to tell if it's usable.
struct __access_protected_ctor : __hash_code_base { };
// When hash codes are not cached local iterator inherits from
// __hash_code_base above to compute node bucket index so it has to be
// default constructible.
static_assert(__if_hash_not_cached<
is_default_constructible<
// We use _Hashtable_ebo_helper to access the protected
// default constructor.
__detail::_Hashtable_ebo_helper<0, __hash_code_base, true>>>::value,
is_default_constructible<__access_protected_ctor>>::value,
"Cache the hash code or make functors involved in hash code"
" and bucket index computation default constructible");

2
libstdc++-v3/testsuite/23_containers/unordered_set/not_default_constructible_hash_neg.cc
View File

@ -19,7 +19,7 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-error "default constructible" "" { target *-*-* } 283 }
// { dg-error "default constructible" "" { target *-*-* } 287 }
#include <unordered_set>