[cfe-commits] r74909 - in /cfe/trunk: include/clang/AST/DeclCXX.h lib/AST/DeclCXX.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Jul  7 11:24:08 2009
New Revision: 74909

URL: http://llvm.org/viewvc/llvm-project?rev=74909&view=rev
Log:
A few change per Doug's feedback.
- Fariborz


Modified:
    cfe/trunk/include/clang/AST/DeclCXX.h
    cfe/trunk/lib/AST/DeclCXX.cpp

Modified: cfe/trunk/include/clang/AST/DeclCXX.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=74909&r1=74908&r2=74909&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/DeclCXX.h (original)
+++ cfe/trunk/include/clang/AST/DeclCXX.h Tue Jul  7 11:24:08 2009
@@ -750,17 +750,17 @@
   /// init_const_iterator - Iterates through the memberbase initializer list.
   typedef CXXBaseOrMemberInitializer * const * init_const_iterator;
   
+  /// init_begin() - Retrieve an iterator to the first initializer.
+  init_iterator       init_begin()       { return BaseOrMemberInitializers; }
   /// begin() - Retrieve an iterator to the first initializer.
-  init_iterator       begin()       { return BaseOrMemberInitializers; }
-  /// begin() - Retrieve an iterator to the first initializer.
-  init_const_iterator begin() const { return BaseOrMemberInitializers; }
+  init_const_iterator init_begin() const { return BaseOrMemberInitializers; }
   
-  /// end() - Retrieve an iterator past the last initializer.
-  init_iterator       end()       { 
+  /// init_end() - Retrieve an iterator past the last initializer.
+  init_iterator       init_end()       { 
     return BaseOrMemberInitializers + NumBaseOrMemberInitializers; 
   }
   /// end() - Retrieve an iterator past the last initializer.
-  init_const_iterator end() const { 
+  init_const_iterator init_end() const { 
     return BaseOrMemberInitializers + NumBaseOrMemberInitializers; 
   }
   

Modified: cfe/trunk/lib/AST/DeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclCXX.cpp?rev=74909&r1=74908&r2=74909&view=diff

==============================================================================
--- cfe/trunk/lib/AST/DeclCXX.cpp (original)
+++ cfe/trunk/lib/AST/DeclCXX.cpp Tue Jul  7 11:24:08 2009
@@ -419,7 +419,7 @@
   if (NumInitializers > 0) {
     NumBaseOrMemberInitializers = NumInitializers;
     BaseOrMemberInitializers = 
-      new (C, 8) CXXBaseOrMemberInitializer*[NumInitializers]; 
+      new (C) CXXBaseOrMemberInitializer*[NumInitializers]; 
     for (unsigned Idx = 0; Idx < NumInitializers; ++Idx)
       BaseOrMemberInitializers[Idx] = Initializers[Idx];
   }
@@ -428,8 +428,7 @@
 void
 CXXConstructorDecl::Destroy(ASTContext& C) {
   C.Deallocate(BaseOrMemberInitializers);
-  this->~CXXMethodDecl();
-  C.Deallocate((void *)this);
+  CXXMethodDecl::Destroy(C);
 }
 
 CXXConversionDecl *