SafeMin/SafeMax: Fix wrong return type when given two enum arguments

webrtc/base/safe_minmax.h

 /*
  *  Copyright 2017 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 135 matching lines @@
                     safe_cmp::Ge(Limits<type>::max, Limits<B>::max),
                 "The specified type isn't large enough");
   static_assert(IsIntlike<type>::value == IsIntlike<B>::value &&
                     std::is_floating_point<type>::value ==
                         std::is_floating_point<type>::value,
                 "float<->int conversions not allowed");
 };
 
 }  // namespace safe_minmax_impl
 
-template <typename R = safe_minmax_impl::DefaultType,
-          typename T1 = safe_minmax_impl::DefaultType,
-          typename T2 = safe_minmax_impl::DefaultType,
-          typename R2 = typename safe_minmax_impl::TypeOr<
-              R,
-              typename safe_minmax_impl::UnderlyingType<
-                  typename safe_minmax_impl::MType<T1, T2>::min_t>::type>::type>
+template <
+    typename R = safe_minmax_impl::DefaultType,
+    typename T1 = safe_minmax_impl::DefaultType,
+    typename T2 = safe_minmax_impl::DefaultType,
+    typename R2 = typename safe_minmax_impl::TypeOr<
+        R,
+        typename safe_minmax_impl::MType<
+            typename safe_minmax_impl::UnderlyingType<T1>::type,
+            typename safe_minmax_impl::UnderlyingType<T2>::type>::min_t>::type>
 constexpr R2 SafeMin(T1 a, T2 b) {
   static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
                 "The first argument must be integral or floating-point");
   static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
                 "The second argument must be integral or floating-point");
   return safe_cmp::Lt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
 }
 
-template <typename R = safe_minmax_impl::DefaultType,
-          typename T1 = safe_minmax_impl::DefaultType,
-          typename T2 = safe_minmax_impl::DefaultType,
-          typename R2 = typename safe_minmax_impl::TypeOr<
-              R,
-              typename safe_minmax_impl::UnderlyingType<
-                  typename safe_minmax_impl::MType<T1, T2>::max_t>::type>::type>
+template <
+    typename R = safe_minmax_impl::DefaultType,
+    typename T1 = safe_minmax_impl::DefaultType,
+    typename T2 = safe_minmax_impl::DefaultType,
+    typename R2 = typename safe_minmax_impl::TypeOr<
+        R,
+        typename safe_minmax_impl::MType<
+            typename safe_minmax_impl::UnderlyingType<T1>::type,
+            typename safe_minmax_impl::UnderlyingType<T2>::type>::max_t>::type>
 constexpr R2 SafeMax(T1 a, T2 b) {
   static_assert(IsIntlike<T1>::value || std::is_floating_point<T1>::value,
                 "The first argument must be integral or floating-point");
   static_assert(IsIntlike<T2>::value || std::is_floating_point<T2>::value,
                 "The second argument must be integral or floating-point");
   return safe_cmp::Gt(a, b) ? static_cast<R2>(a) : static_cast<R2>(b);
 }
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_SAFE_MINMAX_H_