From bdb941b6d7311b777c43dd76fad7ca401b31f17e Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Fri, 26 Feb 2021 20:12:07 -0800
Subject: [PATCH] arch: Remove unnecessary "typename"s from VecPredRegT.

Change-Id: If38e71ac79105b111d68df1e572f9a8e32a131ad
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/41998
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/arch/generic/vec_pred_reg.hh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/arch/generic/vec_pred_reg.hh b/src/arch/generic/vec_pred_reg.hh
index 84047f697d..b238357f4b 100644
--- a/src/arch/generic/vec_pred_reg.hh
+++ b/src/arch/generic/vec_pred_reg.hh
@@ -88,16 +88,14 @@ class VecPredRegT
 
     /// Reset the register to an all-false value.
     template<bool Condition = !Const>
-    typename std::enable_if_t<Condition, void>
-    reset() { container.reset(); }
+    std::enable_if_t<Condition> reset() { container.reset(); }
 
     /// Reset the register to an all-true value.
     template<bool Condition = !Const>
-    typename std::enable_if_t<Condition, void>
-    set() { container.set(); }
+    std::enable_if_t<Condition> set() { container.set(); }
 
     template<bool Condition = !Const>
-    typename std::enable_if_t<Condition, MyClass&>
+    std::enable_if_t<Condition, MyClass&>
     operator=(const MyClass& that)
     {
         container = that.container;
@@ -111,7 +109,7 @@ class VecPredRegT
     }
 
     template<bool Condition = !Const>
-    typename std::enable_if_t<Condition, bool&>
+    std::enable_if_t<Condition, bool&>
     operator[](size_t idx)
     {
         return container[idx * (Packed ? 1 : sizeof(VecElem))];
@@ -128,7 +126,7 @@ class VecPredRegT
 
     /// Write a raw value in an element of the predicate register
     template<bool Condition = !Const>
-    typename std::enable_if_t<Condition, void>
+    std::enable_if_t<Condition>
     set_raw(size_t idx, uint8_t val)
     {
         container.set_bits(idx * (Packed ? 1 : sizeof(VecElem)),