diff --git a/lib/base/atomic.hpp b/lib/base/atomic.hpp
index cb4fe93b0..b18ff5373 100644
--- a/lib/base/atomic.hpp
+++ b/lib/base/atomic.hpp
@@ -71,7 +71,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>>;
 
 }