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

From-SVN: r219343

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index affe204..7e26165 100644 (file)
--- 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 1251ef0..14bcca6 100644 (file)
--- 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>;