From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Wed, 8 Mar 2023 13:25:28 +0000 (-0700)
Subject: Remove another avoidable use of 'typename ...::type'.
X-Git-Tag: v9.5.0-rc1~500^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da0e29d25eb059654dc9a161f1c3d9e7333b790;p=dealii.git

Remove another avoidable use of 'typename ...::type'.
---

diff --git a/include/deal.II/base/exceptions.h b/include/deal.II/base/exceptions.h
index b2739df6cc..ba4ae6b402 100644
--- a/include/deal.II/base/exceptions.h
+++ b/include/deal.II/base/exceptions.h
@@ -1789,7 +1789,7 @@ namespace internal
   // Workaround to allow for commas in template parameter lists
   // in preprocessor macros as found in
   // https://stackoverflow.com/questions/13842468/comma-in-c-c-macro
-  template <typename T>
+  template <typename F>
   struct argument_type;
 
   template <typename T, typename U>
@@ -1797,6 +1797,9 @@ namespace internal
   {
     using type = U;
   };
+
+  template <typename F>
+  using argument_type_t = typename argument_type<F>::type;
 } // namespace internal
 
 /**
@@ -1818,13 +1821,13 @@ namespace internal
  *
  * @ingroup Exceptions
  */
-#define AssertIndexRange(index, range)                                         \
-  Assert(                                                                      \
-    ::dealii::deal_II_exceptions::internals::compare_less_than(index, range),  \
-    dealii::ExcIndexRangeType<typename ::dealii::internal::argument_type<void( \
-      std::common_type_t<decltype(index), decltype(range)>)>::type>((index),   \
-                                                                    0,         \
-                                                                    (range)))
+#define AssertIndexRange(index, range)                                       \
+  Assert(::dealii::deal_II_exceptions::internals::compare_less_than(index,   \
+                                                                    range),  \
+         dealii::ExcIndexRangeType<::dealii::internal::argument_type_t<void( \
+           std::common_type_t<decltype(index), decltype(range)>)>>((index),  \
+                                                                   0,        \
+                                                                   (range)))
 
 /**
  * An assertion that checks whether a number is finite or not. We explicitly