Commit 6d04ab05 authored by Simon Morlat's avatar Simon Morlat
Browse files

Fix compilation issues with clang on macos.

parent f67bc3cc
......@@ -40,7 +40,7 @@ public:
std::is_signed<typename std::underlying_type<T>::type>::value, int, unsigned int
>::type StorageType;
constexpr EnumMask (int mask = 0) : mMask(mask) {}
constexpr EnumMask (int mask = 0) : mMask(StorageType(mask)) {}
constexpr EnumMask (T value) : mMask(StorageType(value)) {}
constexpr EnumMask (std::initializer_list<T> mask) : mMask(init(mask.begin(), mask.end())) {}
......@@ -110,7 +110,7 @@ public:
}
constexpr EnumMask operator& (T mask) const {
return mMask & StorageType(mask);
return (int) (mMask & StorageType(mask));
}
constexpr EnumMask operator| (EnumMask mask) const {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment