From 4bb0968c93075b1e49c5363bb20cba16cae45c3e Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Sun, 23 Oct 2022 11:41:05 +0200
Subject: [PATCH] Mark trait constants as inline

Mark trait constants as inline, and simplify the definition of the trait
types.
---
 .../AlpakaInterface/interface/traits.h        | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/HeterogeneousCore/AlpakaInterface/interface/traits.h b/HeterogeneousCore/AlpakaInterface/interface/traits.h
index 8235a4166f4e9..3083cda79833d 100644
--- a/HeterogeneousCore/AlpakaInterface/interface/traits.h
+++ b/HeterogeneousCore/AlpakaInterface/interface/traits.h
@@ -32,37 +32,34 @@ namespace cms::alpakatools {
   // is_platform
 
   template <typename T>
-  struct is_platform
-      : std::integral_constant<bool, alpaka::concepts::ImplementsConcept<alpaka::ConceptPltf, T>::value> {};
+  using is_platform = alpaka::concepts::ImplementsConcept<alpaka::ConceptPltf, T>;
 
   template <typename T>
-  constexpr bool is_platform_v = is_platform<T>::value;
+  inline constexpr bool is_platform_v = is_platform<T>::value;
 
   // is_device
 
   template <typename T>
-  struct is_device : std::integral_constant<bool, alpaka::concepts::ImplementsConcept<alpaka::ConceptDev, T>::value> {};
+  using is_device = alpaka::concepts::ImplementsConcept<alpaka::ConceptDev, T>;
 
   template <typename T>
-  constexpr bool is_device_v = is_device<T>::value;
+  inline constexpr bool is_device_v = is_device<T>::value;
 
   // is_accelerator
 
   template <typename T>
-  struct is_accelerator
-      : std::integral_constant<bool, alpaka::concepts::ImplementsConcept<alpaka::ConceptAcc, T>::value> {};
+  using is_accelerator = alpaka::concepts::ImplementsConcept<alpaka::ConceptAcc, T>;
 
   template <typename T>
-  constexpr bool is_accelerator_v = is_accelerator<T>::value;
+  inline constexpr bool is_accelerator_v = is_accelerator<T>::value;
 
   // is_queue
 
   template <typename T>
-  struct is_queue : std::integral_constant<bool, alpaka::concepts::ImplementsConcept<alpaka::ConceptQueue, T>::value> {
-  };
+  using is_queue = alpaka::concepts::ImplementsConcept<alpaka::ConceptQueue, T>;
 
   template <typename T>
-  constexpr bool is_queue_v = is_queue<T>::value;
+  inline constexpr bool is_queue_v = is_queue<T>::value;
 
 }  // namespace cms::alpakatools