[cfe-commits] r70956 - /cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h

[Mike Stump]

Author: mrs
Date: Mon May  4 20:42:43 2009
New Revision: 70956

URL: http://llvm.org/viewvc/llvm-project?rev=70956&view=rev
Log:
Merge in 70914:

Add ASTRecordLayout::getFieldCount accessor, change NextOffset field to 64-bits.

Modified:
    cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h

Modified: cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h?rev=70956&r1=70955&r2=70956&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h (original)
+++ cfe/branches/Apple/Dib/include/clang/AST/RecordLayout.h Mon May  4 20:42:43 2009
@@ -29,14 +29,14 @@
 /// These objects are managed by ASTContext.
 class ASTRecordLayout {
   uint64_t Size;        // Size of record in bits.
+  uint64_t NextOffset;  // Next available offset
   uint64_t *FieldOffsets;
   unsigned Alignment;   // Alignment of record in bits.
   unsigned FieldCount;  // Number of fields
-  unsigned NextOffset;  // Next available offset
   friend class ASTContext;
 
   ASTRecordLayout(uint64_t S = 0, unsigned A = 8) 
-    : Size(S), Alignment(A), FieldCount(0), NextOffset(S) {}
+    : Size(S), NextOffset(S), Alignment(A), FieldCount(0) {}
   ~ASTRecordLayout() {
     delete [] FieldOffsets;
   }
@@ -78,6 +78,9 @@
   /// getSize - Get the record size in bits.
   uint64_t getSize() const { return Size; }
   
+  /// getFieldCount - Get the number of fields in the layout.
+  unsigned getFieldCount() const { return FieldCount; }
+  
   /// getFieldOffset - Get the offset of the given field index, in
   /// bits.
   uint64_t getFieldOffset(unsigned FieldNo) const {