midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Common: Clean up meta-template logic in BitField

Browse Source
This commit is contained in:
Yuri Kunde Schlesner 2017-05-21 15:49:55 -07:00
parent 2cdb40d709
commit c1a9e94068
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/bit_field.h
View File

@ -121,11 +121,11 @@ private:
// T is an enumeration. Note that T is wrapped within an enable_if in the // 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 // former case to workaround compile errors which arise when using
// std::underlying_type<T>::type directly. // std::underlying_type<T>::type directly.
typedef typename std::conditional<std::is_enum<T>::value, std::underlying_type<T>, using StorageType = typename std::conditional_t<std::is_enum<T>::value, std::underlying_type<T>,
std::enable_if<true, T>>::type::type StorageType; std::enable_if<true, T>>::type;
// Unsigned version of StorageType // Unsigned version of StorageType
typedef typename std::make_unsigned<StorageType>::type StorageTypeU; using StorageTypeU = std::make_unsigned_t<StorageType>;
public: public:
/// Constants to allow limited introspection of fields if needed /// Constants to allow limited introspection of fields if needed