summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/bit_field.h6
1 files 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:
121 // T is an enumeration. Note that T is wrapped within an enable_if in the 121 // T is an enumeration. Note that T is wrapped within an enable_if in the
122 // former case to workaround compile errors which arise when using 122 // former case to workaround compile errors which arise when using
123 // std::underlying_type<T>::type directly. 123 // std::underlying_type<T>::type directly.
124 typedef typename std::conditional<std::is_enum<T>::value, std::underlying_type<T>, 124 using StorageType = typename std::conditional_t<std::is_enum<T>::value, std::underlying_type<T>,
125 std::enable_if<true, T>>::type::type StorageType; 125 std::enable_if<true, T>>::type;
126 126
127 // Unsigned version of StorageType 127 // Unsigned version of StorageType
128 typedef typename std::make_unsigned<StorageType>::type StorageTypeU; 128 using StorageTypeU = std::make_unsigned_t<StorageType>;
129 129
130public: 130public:
131 /// Constants to allow limited introspection of fields if needed 131 /// Constants to allow limited introspection of fields if needed