[cfe-commits] r56709 - /cfe/trunk/include/clang/AST/DeclGroup.h

[Ted Kremenek]

Author: kremenek
Date: Fri Sep 26 18:24:05 2008
New Revision: 56709

URL: http://llvm.org/viewvc/llvm-project?rev=56709&view=rev
Log:
Forgot to check in header file with last commit.

Modified:
    cfe/trunk/include/clang/AST/DeclGroup.h

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

==============================================================================
--- cfe/trunk/include/clang/AST/DeclGroup.h (original)
+++ cfe/trunk/include/clang/AST/DeclGroup.h Fri Sep 26 18:24:05 2008
@@ -45,34 +45,27 @@
 class DeclGroupRef {
 protected:
   enum Kind { DeclKind=0x0, DeclGroupKind=0x1, Mask=0x1 };
-  uintptr_t ThePtr;
-
-  Kind getKind() const { return (Kind) (ThePtr & Mask); }  
+  union { Decl* D; uintptr_t Raw; };
+  Kind getKind() const { return (Kind) (Raw & Mask); }  
   
 public:    
-  DeclGroupRef() : ThePtr(0) {}
-  
-  explicit DeclGroupRef(Decl* D)
-    : ThePtr(reinterpret_cast<uintptr_t>(D)) {}
+  DeclGroupRef() : Raw(0) {}
   
-  explicit DeclGroupRef(DeclGroup* D)
-    : ThePtr(reinterpret_cast<uintptr_t>(D) | DeclGroupKind) {}
+  explicit DeclGroupRef(Decl* d) : D(d) {}
+  explicit DeclGroupRef(DeclGroup* dg)
+    : Raw(reinterpret_cast<uintptr_t>(dg) | DeclGroupKind) {}
   
   typedef Decl** iterator;
 
   iterator begin() {
-    if (getKind() == DeclKind)
-      return ThePtr ? (Decl**) &ThePtr : 0;
-
-    DeclGroup* G = reinterpret_cast<DeclGroup*>(ThePtr & ~Mask);
+    if (getKind() == DeclKind) return Raw ? &D : 0;
+    DeclGroup* G = reinterpret_cast<DeclGroup*>(Raw & ~Mask);
     return &(*G)[0];
   }
 
   iterator end() {
-    if (getKind() == DeclKind)
-      return ThePtr ? ((Decl**) &ThePtr) + 1 : 0;
-    
-    DeclGroup* G = reinterpret_cast<DeclGroup*>(ThePtr & ~Mask);
+    if (getKind() == DeclKind) return Raw ? &D + 1 : 0;    
+    DeclGroup* G = reinterpret_cast<DeclGroup*>(Raw & ~Mask);
     return &(*G)[0] + G->size();
   }  
 };
@@ -83,11 +76,11 @@
   void Destroy(ASTContext& C);
   
   explicit DeclGroupOwningRef(DeclGroupOwningRef& R)
-    : DeclGroupRef(R) { R.ThePtr = 0; }
+    : DeclGroupRef(R) { R.Raw = 0; }
 
   DeclGroupOwningRef& operator=(DeclGroupOwningRef& R) {
-    ThePtr = R.ThePtr;
-    R.ThePtr = 0;
+    Raw = R.Raw;
+    R.Raw = 0;
     return *this;
   }
 };