git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/bits/hashtable_policy.h: Use __bool_constant. 

From-SVN: r219343
This commit is contained in:
Jonathan Wakely 2015-01-08 13:27:30 +00:00 committed by Jonathan Wakely
parent 3b1406134b
commit ea0b599a91
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,7 @@
2015-01-08 Jonathan Wakely <jwakely@redhat.com>
* include/bits/hashtable_policy.h: Use __bool_constant.
2015-01-07 Jonathan Wakely <jwakely@redhat.com> 2015-01-07 Jonathan Wakely <jwakely@redhat.com>
* libsupc++/Makefile.am: Compile del_ops.cc as C++14. * libsupc++/Makefile.am: Compile del_ops.cc as C++14.

5
libstdc++-v3/include/bits/hashtable_policy.h
View File

@ -81,7 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Helper type used to detect whether the hash functor is noexcept. // Helper type used to detect whether the hash functor is noexcept.
template <typename _Key, typename _Hash> template <typename _Key, typename _Hash>
struct __is_noexcept_hash : std::integral_constant<bool, struct __is_noexcept_hash : std::__bool_constant<
noexcept(declval<const _Hash&>()(declval<const _Key&>()))> noexcept(declval<const _Hash&>()(declval<const _Key&>()))>
{ }; { };
@ -211,9 +211,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<bool _Cache_hash_code, bool _Constant_iterators, bool _Unique_keys> template<bool _Cache_hash_code, bool _Constant_iterators, bool _Unique_keys>
struct _Hashtable_traits struct _Hashtable_traits
{ {
template<bool _Cond>
using __bool_constant = integral_constant<bool, _Cond>;
using __hash_cached = __bool_constant<_Cache_hash_code>; using __hash_cached = __bool_constant<_Cache_hash_code>;
using __constant_iterators = __bool_constant<_Constant_iterators>; using __constant_iterators = __bool_constant<_Constant_iterators>;
using __unique_keys = __bool_constant<_Unique_keys>; using __unique_keys = __bool_constant<_Unique_keys>;