diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-02-16 00:56:22 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-02-16 00:56:22 +0000 |
| commit | bcd4b5521d9da29a617d2ef16cae68cf1750f6e0 (patch) | |
| tree | 21bbb7f5db51ce9d95113bb160a9c0e2e2ff5d6c /clang/lib/Sema/SemaChecking.cpp | |
| parent | 65fd2a4e905daf579a5497ed9cd1d177e96f3e10 (diff) | |
| download | bcm5719-llvm-bcd4b5521d9da29a617d2ef16cae68cf1750f6e0.tar.gz bcm5719-llvm-bcd4b5521d9da29a617d2ef16cae68cf1750f6e0.zip | |
Don't warn on conversion from NULL to nullptr_t
llvm-svn: 175331
Diffstat (limited to 'clang/lib/Sema/SemaChecking.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaChecking.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp index 17ce614f7f3..d76592438b4 100644 --- a/clang/lib/Sema/SemaChecking.cpp +++ b/clang/lib/Sema/SemaChecking.cpp @@ -4939,7 +4939,7 @@ void CheckImplicitConversion(Sema &S, Expr *E, QualType T, if ((E->isNullPointerConstant(S.Context, Expr::NPC_ValueDependentIsNotNull) == Expr::NPCK_GNUNull) && !Target->isAnyPointerType() && !Target->isBlockPointerType() && !Target->isMemberPointerType() - && Target->isScalarType()) { + && Target->isScalarType() && !Target->isNullPtrType()) { SourceLocation Loc = E->getSourceRange().getBegin(); if (Loc.isMacroID()) Loc = S.SourceMgr.getImmediateExpansionRange(Loc).first; |
