[cfe-commits] r64850 - in /cfe/trunk: include/clang/AST/ExprCXX.h lib/AST/Expr.cpp lib/AST/ExprCXX.cpp lib/AST/ExprConstant.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Tue Feb 17 17:20:26 2009
New Revision: 64850

URL: http://llvm.org/viewvc/llvm-project?rev=64850&view=rev
Log:
Rename UnaryTypeTraitExpr::Evaluate to EvaluateTrait to not collide
with Expr::Evaluate().

Modified:
    cfe/trunk/include/clang/AST/ExprCXX.h
    cfe/trunk/lib/AST/Expr.cpp
    cfe/trunk/lib/AST/ExprCXX.cpp
    cfe/trunk/lib/AST/ExprConstant.cpp

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

==============================================================================
--- cfe/trunk/include/clang/AST/ExprCXX.h (original)
+++ cfe/trunk/include/clang/AST/ExprCXX.h Tue Feb 17 17:20:26 2009
@@ -806,7 +806,7 @@
 
   QualType getQueriedType() const { return QueriedType; }
 
-  bool Evaluate() const;
+  bool EvaluateTrait() const;
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == UnaryTypeTraitExprClass;

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

==============================================================================
--- cfe/trunk/lib/AST/Expr.cpp (original)
+++ cfe/trunk/lib/AST/Expr.cpp Tue Feb 17 17:20:26 2009
@@ -1230,7 +1230,7 @@
              ->isIntegerConstantExpr(Result, Ctx, Loc, isEvaluated);
 
   case UnaryTypeTraitExprClass:
-    Result = cast<UnaryTypeTraitExpr>(this)->Evaluate();
+    Result = cast<UnaryTypeTraitExpr>(this)->EvaluateTrait();
     return true;
   }
 

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

==============================================================================
--- cfe/trunk/lib/AST/ExprCXX.cpp (original)
+++ cfe/trunk/lib/AST/ExprCXX.cpp Tue Feb 17 17:20:26 2009
@@ -138,7 +138,7 @@
   return child_iterator();
 }
 
-bool UnaryTypeTraitExpr::Evaluate() const {
+bool UnaryTypeTraitExpr::EvaluateTrait() const {
   switch(UTT) {
   default: assert(false && "Unknown type trait or not implemented");
   case UTT_IsPOD: return QueriedType->isPODType();

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

==============================================================================
--- cfe/trunk/lib/AST/ExprConstant.cpp (original)
+++ cfe/trunk/lib/AST/ExprConstant.cpp Tue Feb 17 17:20:26 2009
@@ -552,7 +552,7 @@
 
   bool VisitUnaryTypeTraitExpr(const UnaryTypeTraitExpr *E) {
     Result.zextOrTrunc(getIntTypeSizeInBits(E->getType()));
-    Result = E->Evaluate();
+    Result = E->EvaluateTrait();
     return true;
   }