[cfe-commits] r111865 - /cfe/trunk/include/clang/Sema/Action.h

[John McCall]

Author: rjmccall
Date: Mon Aug 23 18:46:51 2010
New Revision: 111865

URL: http://llvm.org/viewvc/llvm-project?rev=111865&view=rev
Log:
Don't call this field 'Expr', it changes lookup in illegal ways that
GCC diagnoses.


Modified:
    cfe/trunk/include/clang/Sema/Action.h

Modified: cfe/trunk/include/clang/Sema/Action.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Sema/Action.h?rev=111865&r1=111864&r2=111865&view=diff
==============================================================================
--- cfe/trunk/include/clang/Sema/Action.h (original)
+++ cfe/trunk/include/clang/Sema/Action.h Mon Aug 23 18:46:51 2010
@@ -105,21 +105,21 @@
 
   class FullExprArg {
   public:
-    FullExprArg(ActionBase &actions) : Expr(0) { }
+    FullExprArg(ActionBase &actions) : E(0) { }
                 
     // FIXME: The const_cast here is ugly. RValue references would make this
     // much nicer (or we could duplicate a bunch of the move semantics
     // emulation code from Ownership.h).
-    FullExprArg(const FullExprArg& Other): Expr(Other.Expr) {}
+    FullExprArg(const FullExprArg& Other): E(Other.E) {}
 
     OwningExprResult release() {
-      return move(Expr);
+      return move(E);
     }
 
-    ExprArg get() const { return Expr; }
+    Expr *get() const { return E; }
 
-    ExprArg operator->() {
-      return Expr;
+    Expr *operator->() {
+      return E;
     }
 
   private:
@@ -127,9 +127,9 @@
     // Action::FullExpr that needs access to the constructor below.
     friend class Action;
 
-    explicit FullExprArg(Expr *expr) : Expr(expr) {}
+    explicit FullExprArg(Expr *expr) : E(expr) {}
 
-    Expr *Expr;
+    Expr *E;
   };
 
   FullExprArg MakeFullExpr(Expr *Arg) {