chore: Use typedefs to access ::type (#1695)

diff --git a/src/ccache/util/bitset.hpp b/src/ccache/util/bitset.hpp
index ed0d2a252ddaf335d0dee3f235e80c1b0233a9bc..1c25aa449f4aba0b309c436cf3adef6af63bb52b 100644 (file)
--- a/src/ccache/util/bitset.hpp
+++ b/src/ccache/util/bitset.hpp
@@ -39,17 +39,17 @@ public:
   void erase(T value);
 
   template<typename U> static BitSet<T> from_bitmask(U mask);
-  typename std::underlying_type<T>::type to_bitmask() const;
+  typename std::underlying_type_t<T> to_bitmask() const;
 
 private:
-  typename std::underlying_type<T>::type m_value;
+  typename std::underlying_type_t<T> m_value;
 };
 
 // --- Inline implementations ---
 
 template<typename T>
 inline BitSet<T>::BitSet(T value)
-  : m_value(static_cast<typename std::underlying_type<T>::type>(value))
+  : m_value(static_cast<typename std::underlying_type_t<T>>(value))
 {
 }
 
@@ -71,7 +71,7 @@ template<typename T>
 inline bool
 BitSet<T>::contains(T value) const
 {
-  return m_value & static_cast<typename std::underlying_type<T>::type>(value);
+  return m_value & static_cast<typename std::underlying_type_t<T>>(value);
 }
 
 template<typename T>
@@ -85,21 +85,21 @@ template<typename T>
 inline void
 BitSet<T>::insert(T value)
 {
-  m_value |= static_cast<typename std::underlying_type<T>::type>(value);
+  m_value |= static_cast<typename std::underlying_type_t<T>>(value);
 }
 
 template<typename T>
 inline void
 BitSet<T>::insert(const BitSet& set)
 {
-  m_value |= static_cast<typename std::underlying_type<T>::type>(set.m_value);
+  m_value |= static_cast<typename std::underlying_type_t<T>>(set.m_value);
 }
 
 template<typename T>
 inline void
 BitSet<T>::erase(T value)
 {
-  m_value &= ~static_cast<typename std::underlying_type<T>::type>(value);
+  m_value &= ~static_cast<typename std::underlying_type_t<T>>(value);
 }
 
 template<typename T>
@@ -113,7 +113,7 @@ BitSet<T>::from_bitmask(U mask)
 }
 
 template<typename T>
-inline typename std::underlying_type<T>::type
+inline typename std::underlying_type_t<T>
 BitSet<T>::to_bitmask() const
 {
   return m_value;

diff --git a/src/ccache/util/threadpool.hpp b/src/ccache/util/threadpool.hpp
index aacf1453893ac01c0fde19af8846458b4fccf9f2..04689b1dfff49fb16cca79704dd52c2cfb6501cb 100644 (file)
--- a/src/ccache/util/threadpool.hpp
+++ b/src/ccache/util/threadpool.hpp
@@ -49,7 +49,7 @@ public:
   // used to retrieve the result once the task completes.
   template<typename F, typename... Args>
   auto enqueue(F&& f, Args&&... args)
-    -> std::future<typename std::invoke_result<F, Args...>::type>;
+    -> std::future<typename std::invoke_result_t<F, Args...>>;
 
   void shut_down() noexcept;
 
@@ -68,9 +68,9 @@ private:
 template<typename F, typename... Args>
 auto
 ThreadPool::enqueue(F&& f, Args&&... args)
-  -> std::future<typename std::invoke_result<F, Args...>::type>
+  -> std::future<typename std::invoke_result_t<F, Args...>>
 {
-  using return_type = typename std::invoke_result<F, Args...>::type;
+  using return_type = typename std::invoke_result_t<F, Args...>;
 
   auto task = std::make_shared<std::packaged_task<return_type()>>(
     std::bind(std::forward<F>(f), std::forward<Args>(args)...));