From 071d61043ab85112e65f336ae35692eba834810c Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Fri, 2 Apr 2010 03:38:04 +0000 Subject: [PATCH] Constify. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@100174 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDeclCXX.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 8a2e4b0560..c8d47fa3f2 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -1705,7 +1705,7 @@ static void *GetKeyForMember(CXXBaseOrMemberInitializer *Member, static void DiagnoseBaseOrMemInitializerOrder(Sema &SemaRef, - CXXConstructorDecl *Constructor, + const CXXConstructorDecl *Constructor, CXXBaseOrMemberInitializer **MemInits, unsigned NumMemInits) { if (Constructor->isDependentContext()) @@ -1721,15 +1721,15 @@ DiagnoseBaseOrMemInitializerOrder(Sema &SemaRef, // of 1) base class declarations and 2) order of non-static data members. llvm::SmallVector AllBaseOrMembers; - CXXRecordDecl *ClassDecl - = cast(Constructor->getDeclContext()); + const CXXRecordDecl *ClassDecl = Constructor->getParent(); + // Push virtual bases before others. - for (CXXRecordDecl::base_class_iterator VBase = + for (CXXRecordDecl::base_class_const_iterator VBase = ClassDecl->vbases_begin(), E = ClassDecl->vbases_end(); VBase != E; ++VBase) AllBaseOrMembers.push_back(GetKeyForBase(VBase->getType())); - for (CXXRecordDecl::base_class_iterator Base = ClassDecl->bases_begin(), + for (CXXRecordDecl::base_class_const_iterator Base = ClassDecl->bases_begin(), E = ClassDecl->bases_end(); Base != E; ++Base) { // Virtuals are alread in the virtual base list and are constructed // first. -- 2.50.1