diff --git a/lib/base/atomic.hpp b/lib/base/atomic.hpp
index fe8c1b6cc..fd90a67fe 100644
--- a/lib/base/atomic.hpp
+++ b/lib/base/atomic.hpp
@@ -109,7 +109,7 @@ private:
  * @ingroup base
  */
 template <typename T>
-using AtomicOrLocked = typename std::conditional<std::is_trivially_copyable<T>::value, std::atomic<T>, Locked<T>>::type;
+using AtomicOrLocked = std::conditional_t<std::is_trivially_copyable_v<T>, std::atomic<T>, Locked<T>>;
 
 }