commit 8360a9cbcf4054a8fb43bde1e50951e1e4b48f73
author Daniel Dunbar <daniel@zuster.org> Tue Feb 17 23:20:26 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Tue Feb 17 23:20:26 2009 +0000
tree dce64ed54532e7fa8a2aeb71c0c57617872cdf3c
parent 684989fa5b55884b9499a83be815ca8dbc614851

Rename UnaryTypeTraitExpr::Evaluate to EvaluateTrait to not collide
with Expr::Evaluate().


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64850 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/Expr.cpp

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 200f7de..6f4a588 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1230,7 +1230,7 @@
              ->isIntegerConstantExpr(Result, Ctx, Loc, isEvaluated);
 
   case UnaryTypeTraitExprClass:
-    Result = cast<UnaryTypeTraitExpr>(this)->Evaluate();
+    Result = cast<UnaryTypeTraitExpr>(this)->EvaluateTrait();
     return true;
   }