4 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h
index 22e852dbd1..3d33ee4a14 100644
--- 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 200f7de6c6..6f4a588e2d 100644
--- 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 801a0f22e2..e3d78eebec 100644
--- 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 ad83e372b4..ccea646fb7 100644
--- 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;
   }