From c1a9e940680874a7571f18d8767fe953996907b8 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 21 May 2017 15:49:55 -0700 Subject: Common: Clean up meta-template logic in BitField --- src/common/bit_field.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/bit_field.h b/src/common/bit_field.h index 72a01c7a8..0cc0a1be0 100644 --- a/src/common/bit_field.h +++ b/src/common/bit_field.h @@ -121,11 +121,11 @@ private: // T is an enumeration. Note that T is wrapped within an enable_if in the // former case to workaround compile errors which arise when using // std::underlying_type::type directly. - typedef typename std::conditional::value, std::underlying_type, - std::enable_if>::type::type StorageType; + using StorageType = typename std::conditional_t::value, std::underlying_type, + std::enable_if>::type; // Unsigned version of StorageType - typedef typename std::make_unsigned::type StorageTypeU; + using StorageTypeU = std::make_unsigned_t; public: /// Constants to allow limited introspection of fields if needed -- cgit v1.2.3