diff options
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index 0f715f0b8f..2664c7811c 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -2507,12 +2507,7 @@ static bool EvaluateUnaryTypeTrait(Sema &Self, UnaryTypeTrait UTT, // !__is_reference(T) && !__is_function(T) && !__is_void(T). return ! (T->isReferenceType() || T->isFunctionType() || T->isVoidType()); case UTT_IsScalar: - // Scalar type is defined in Section 3.9 p10 of the Working Draft. - // Essentially: - // __is_arithmetic( T ) || __is_enumeration(T) || - // __is_pointer(T) || __is_member_pointer(T) - return (T->isArithmeticType() || T->isEnumeralType() || - T->isPointerType() || T->isMemberPointerType()); + return T->isScalarType(); case UTT_IsCompound: return ! (T->isVoidType() || T->isArithmeticType()) || T->isEnumeralType(); case UTT_IsMemberPointer: |