diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-05-26 06:22:03 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-05-26 06:22:03 +0000 |
commit | 6b8c5857eb9d309f9adb9149d9f383a29a9b68e7 (patch) | |
tree | 56e8b6db6892b13eea6e33509cb7751501b94409 /lib/Sema/SemaAccess.cpp | |
parent | b0449def46f3e7efc8dd134ac68ce71399ba6573 (diff) |
[C++11] Use 'nullptr'. Sema edition.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@209613 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaAccess.cpp')
-rw-r--r-- | lib/Sema/SemaAccess.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/Sema/SemaAccess.cpp b/lib/Sema/SemaAccess.cpp index f7806d2516..dc574f17db 100644 --- a/lib/Sema/SemaAccess.cpp +++ b/lib/Sema/SemaAccess.cpp @@ -78,7 +78,7 @@ static CXXRecordDecl *FindDeclaringClass(NamedDecl *D) { namespace { struct EffectiveContext { - EffectiveContext() : Inner(0), Dependent(false) {} + EffectiveContext() : Inner(nullptr), Dependent(false) {} explicit EffectiveContext(DeclContext *DC) : Inner(DC), @@ -209,7 +209,8 @@ struct AccessTarget : public AccessedEntity { CalculatedInstanceContext = true; DeclContext *IC = S.computeDeclContext(getBaseObjectType()); - InstanceContext = (IC ? cast<CXXRecordDecl>(IC)->getCanonicalDecl() : 0); + InstanceContext = (IC ? cast<CXXRecordDecl>(IC)->getCanonicalDecl() + : nullptr); return InstanceContext; } @@ -232,7 +233,7 @@ private: !getBaseObjectType().isNull() && getTargetDecl()->isCXXInstanceMember()); CalculatedInstanceContext = false; - InstanceContext = 0; + InstanceContext = nullptr; if (isMemberAccess()) DeclaringClass = FindDeclaringClass(getTargetDecl()); @@ -709,7 +710,7 @@ struct ProtectedFriendContext { static AccessResult GetProtectedFriendKind(Sema &S, const EffectiveContext &EC, const CXXRecordDecl *InstanceContext, const CXXRecordDecl *NamingClass) { - assert(InstanceContext == 0 || + assert(InstanceContext == nullptr || InstanceContext->getCanonicalDecl() == InstanceContext); assert(NamingClass->getCanonicalDecl() == NamingClass); @@ -842,7 +843,7 @@ static AccessResult HasAccess(Sema &S, // and instead rely on whether any potential P is a friend. if (Access == AS_protected && Target.isInstanceMember()) { // Compute the instance context if possible. - const CXXRecordDecl *InstanceContext = 0; + const CXXRecordDecl *InstanceContext = nullptr; if (Target.hasInstanceContext()) { InstanceContext = Target.resolveInstanceContext(S); if (!InstanceContext) return AR_dependent; @@ -937,7 +938,7 @@ static CXXBasePath *FindBestPath(Sema &S, assert(isDerived && "derived class not actually derived from base"); (void) isDerived; - CXXBasePath *BestPath = 0; + CXXBasePath *BestPath = nullptr; assert(FinalAccess != AS_none && "forbidden access after declaring class"); @@ -986,7 +987,7 @@ static CXXBasePath *FindBestPath(Sema &S, // Note that we modify the path's Access field to the // friend-modified access. - if (BestPath == 0 || PathAccess < BestPath->Access) { + if (BestPath == nullptr || PathAccess < BestPath->Access) { BestPath = &*PI; BestPath->Access = PathAccess; @@ -1004,7 +1005,7 @@ static CXXBasePath *FindBestPath(Sema &S, // We didn't find a public path, but at least one path was subject // to dependent friendship, so delay the check. if (AnyDependent) - return 0; + return nullptr; return BestPath; } @@ -1101,7 +1102,7 @@ static void diagnoseBadDirectAccess(Sema &S, // Find an original declaration. while (D->isOutOfLine()) { - NamedDecl *PrevDecl = 0; + NamedDecl *PrevDecl = nullptr; if (VarDecl *VD = dyn_cast<VarDecl>(D)) PrevDecl = VD->getPreviousDecl(); else if (FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) @@ -1212,7 +1213,7 @@ static void DiagnoseAccessPath(Sema &S, case AR_accessible: accessSoFar = AS_public; entity.suppressInstanceContext(); - constrainingBase = 0; + constrainingBase = nullptr; break; case AR_dependent: llvm_unreachable("cannot diagnose dependent access"); @@ -1259,7 +1260,7 @@ static void DiagnoseBadAccess(Sema &S, SourceLocation Loc, AccessTarget &Entity) { const CXXRecordDecl *NamingClass = Entity.getNamingClass(); const CXXRecordDecl *DeclaringClass = Entity.getDeclaringClass(); - NamedDecl *D = (Entity.isMemberAccess() ? Entity.getTargetDecl() : 0); + NamedDecl *D = (Entity.isMemberAccess() ? Entity.getTargetDecl() : nullptr); S.Diag(Loc, Entity.getDiag()) << (Entity.getAccess() == AS_protected) @@ -1872,7 +1873,7 @@ bool Sema::IsSimplyAccessible(NamedDecl *Decl, DeclContext *Ctx) { // If we are inside a class or category implementation, determine the // interface we're in. - ObjCInterfaceDecl *ClassOfMethodDecl = 0; + ObjCInterfaceDecl *ClassOfMethodDecl = nullptr; if (ObjCMethodDecl *MD = getCurMethodDecl()) ClassOfMethodDecl = MD->getClassInterface(); else if (FunctionDecl *FD = getCurFunctionDecl()) { |