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

diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h
index 22e852dbd190440fce88ad4029fe9d4531261eae..3d33ee4a1495439957a414b29e1c3d80157f3d66 100644 (file)
--- a/include/clang/AST/ExprCXX.h
+++ b/include/clang/AST/ExprCXX.h
@@ -806,7 +806,7 @@ public:
 
   QualType getQueriedType() const { return QueriedType; }
 
-  bool Evaluate() const;
+  bool EvaluateTrait() const;
 
   static bool classof(const Stmt *T) {
     return T->getStmtClass() == UnaryTypeTraitExprClass;

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

diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp
index 801a0f22e2a02d4d40107d6474571fe6de2db560..e3d78eebec6eb32159a0070697c123ecdafe9e08 100644 (file)
--- a/lib/AST/ExprCXX.cpp
+++ b/lib/AST/ExprCXX.cpp
@@ -138,7 +138,7 @@ Stmt::child_iterator UnaryTypeTraitExpr::child_end() {
   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();

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index ad83e372b460ce055e6223124f7c68a1c156a52b..ccea646fb7876a4ef4eda6741de70cf680490b79 100644 (file)
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -552,7 +552,7 @@ public:
 
   bool VisitUnaryTypeTraitExpr(const UnaryTypeTraitExpr *E) {
     Result.zextOrTrunc(getIntTypeSizeInBits(E->getType()));
-    Result = E->Evaluate();
+    Result = E->EvaluateTrait();
     return true;
   }