Work around GCC bug in tests. The bug has been fixed in GCC 6.0

llvm-svn: 273068
This commit is contained in:
Eric Fiselier 2016-06-17 23:30:40 +00:00
parent b3875ea71b
commit 5b58d0dffb
1 changed files with 2 additions and 2 deletions

View File

@ -17,7 +17,7 @@ template <class EnumType, EnumType Val1, EnumType Val2,
struct check_bitmask_type {
static constexpr UT dcast(EnumType e) { return static_cast<UT>(e); }
static constexpr UT unpromote(decltype(~UZero) promoted) { return static_cast<UT>(promoted); }
static constexpr UT unpromote(decltype((~UZero)) promoted) { return static_cast<UT>(promoted); }
// We need two values that are non-zero and share at least one bit.
static_assert(Val1 != Zero && Val2 != Zero, "");
static_assert(Val1 != Val2, "");
@ -31,7 +31,7 @@ struct check_bitmask_type {
ASSERT_SAME_TYPE(EnumType, decltype(Val1 & Val2));
ASSERT_SAME_TYPE(EnumType, decltype(Val1 | Val2));
ASSERT_SAME_TYPE(EnumType, decltype(Val1 ^ Val2));
ASSERT_SAME_TYPE(EnumType, decltype(~Val1));
ASSERT_SAME_TYPE(EnumType, decltype((~Val1)));
ASSERT_SAME_TYPE(EnumType&, decltype(ValRef &= Val2));
ASSERT_SAME_TYPE(EnumType&, decltype(ValRef |= Val2));
ASSERT_SAME_TYPE(EnumType&, decltype(ValRef ^= Val2));