summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-22 00:49:55 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-05-25 06:06:00 +0200
commitc1a9e940680874a7571f18d8767fe953996907b8 (patch)
tree9f77aaf05de56eeabfbdbc153fa12fb68095fb69 /src/common
parentKernel: Centralize error definitions in errors.h (diff)
downloadyuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar.gz
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar.bz2
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar.lz
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar.xz
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.tar.zst
yuzu-c1a9e940680874a7571f18d8767fe953996907b8.zip
Diffstat (limited to 'src/common')
-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:
// 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<T>::type directly.
- typedef typename std::conditional<std::is_enum<T>::value, std::underlying_type<T>,
- std::enable_if<true, T>>::type::type StorageType;
+ using StorageType = typename std::conditional_t<std::is_enum<T>::value, std::underlying_type<T>,
+ std::enable_if<true, T>>::type;
// Unsigned version of StorageType
- typedef typename std::make_unsigned<StorageType>::type StorageTypeU;
+ using StorageTypeU = std::make_unsigned_t<StorageType>;
public:
/// Constants to allow limited introspection of fields if needed