diff options
| -rw-r--r-- | clang/include/clang/AST/Type.h | 1 | ||||
| -rw-r--r-- | clang/test/SemaCXX/type-traits.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h index 88f022b083c..fcc74198ab0 100644 --- a/clang/include/clang/AST/Type.h +++ b/clang/include/clang/AST/Type.h @@ -6353,6 +6353,7 @@ inline bool QualType::isCForbiddenLValueType() const { /// \returns True for types specified in C++0x [basic.fundamental]. inline bool Type::isFundamentalType() const { return isVoidType() || + isNullPtrType() || // FIXME: It's really annoying that we don't have an // 'isArithmeticType()' which agrees with the standard definition. (isArithmeticType() && !isEnumeralType()); diff --git a/clang/test/SemaCXX/type-traits.cpp b/clang/test/SemaCXX/type-traits.cpp index e1908445331..99270f19e68 100644 --- a/clang/test/SemaCXX/type-traits.cpp +++ b/clang/test/SemaCXX/type-traits.cpp @@ -802,6 +802,7 @@ void is_fundamental() int t23[T(__is_fundamental(unsigned long))]; int t24[T(__is_fundamental(void))]; int t25[T(__is_fundamental(cvoid))]; + int t26[T(__is_fundamental(decltype(nullptr)))]; int t30[F(__is_fundamental(Union))]; int t31[F(__is_fundamental(UnionAr))]; |
