Using _t suffix instead of ::type in whole project + using std:: somewhere.

2 files changed, 7 insertions, 12 deletions

diff --git a/ugc/binary/serdes.cpp b/ugc/binary/serdes.cpp
index 4051fdda6a..0c855be171 100644
--- a/ugc/binary/serdes.cpp
+++ b/ugc/binary/serdes.cpp
@@ -33,14 +33,12 @@ public:
   }
 
   template <typename R>
-  typename enable_if<is_fundamental<R>::value>::type operator()(R const & r,
-                                                                char const * /* name */ = nullptr)
+  enable_if_t<is_fundamental<R>::value> operator()(R const & r, char const * /* name */ = nullptr)
   {
   }
 
   template <typename R>
-  typename enable_if<!is_fundamental<R>::value>::type operator()(R const & r,
-                                                                 char const * /* name */ = nullptr)
+  enable_if_t<!is_fundamental<R>::value> operator()(R const & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
diff --git a/ugc/binary/visitors.hpp b/ugc/binary/visitors.hpp
index a32d5d6a54..158c8f0b93 100644
--- a/ugc/binary/visitors.hpp
+++ b/ugc/binary/visitors.hpp
@@ -95,15 +95,14 @@ public:
   }
 
   template <typename D>
-  typename std::enable_if<std::is_integral<D>::value>::type operator()(
-      D d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D d, char const * /* name */ = nullptr)
   {
     WriteToSink(m_sink, d);
   }
 
   template <typename R>
-  typename std::enable_if<!std::is_integral<R>::value>::type operator()(
-      R const & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R const & r,
+                                                           char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
@@ -194,15 +193,13 @@ public:
   }
 
   template <typename D>
-  typename std::enable_if<std::is_integral<D>::value>::type operator()(
-      D & d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D & d, char const * /* name */ = nullptr)
   {
     ReadPrimitiveFromSource(m_source, d);
   }
 
   template <typename R>
-  typename std::enable_if<!std::is_integral<R>::value>::type operator()(
-      R & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }