diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-08 13:27:30 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-01-08 13:27:30 +0000 |
| commit | 8ad5da62c4a157680772cbd7e713e34ebc88b5bb (patch) | |
| tree | 8ea7876d68f1192d6c311b093b131cbe3595841a | |
| parent | f07efc97c65a4e74d0c2986e12adc1905077b8ef (diff) | |
| download | gcc-8ad5da62c4a157680772cbd7e713e34ebc88b5bb.tar.gz | |
* include/bits/hashtable_policy.h: Use __bool_constant.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219343 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/hashtable_policy.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index affe20416bb..7e261654903 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -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> * libsupc++/Makefile.am: Compile del_ops.cc as C++14. diff --git a/libstdc++-v3/include/bits/hashtable_policy.h b/libstdc++-v3/include/bits/hashtable_policy.h index 1251ef07ed3..14bcca6562c 100644 --- a/libstdc++-v3/include/bits/hashtable_policy.h +++ b/libstdc++-v3/include/bits/hashtable_policy.h @@ -81,7 +81,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Helper type used to detect whether the hash functor is noexcept. 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&>()))> { }; @@ -211,9 +211,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<bool _Cache_hash_code, bool _Constant_iterators, bool _Unique_keys> struct _Hashtable_traits { - template<bool _Cond> - using __bool_constant = integral_constant<bool, _Cond>; - using __hash_cached = __bool_constant<_Cache_hash_code>; using __constant_iterators = __bool_constant<_Constant_iterators>; using __unique_keys = __bool_constant<_Unique_keys>; |