From: Benjamin Kramer <benny.kra@googlemail.com>
Date: Thu, 12 Mar 2015 23:46:55 +0000 (+0000)
Subject: Disambiguate call for GCC.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f836120ac2c7fff5f91e0d38f4d6796a89657dce;p=clang

Disambiguate call for GCC.

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

diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index f93e556b58..1795ba3488 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -380,7 +380,7 @@ public:
     SavedTuple Saved{saveValueInCond(A)...};
 
     typedef EHScopeStack::ConditionalCleanup<T, As...> CleanupType;
-    EHStack.pushCleanup<CleanupType>(kind, Saved);
+    EHStack.pushCleanupTuple<CleanupType>(kind, Saved);
     initFullExprCleanup();
   }
 
diff --git a/lib/CodeGen/EHScopeStack.h b/lib/CodeGen/EHScopeStack.h
index 08dad69e7d..363d8b8fe4 100644
--- a/lib/CodeGen/EHScopeStack.h
+++ b/lib/CodeGen/EHScopeStack.h
@@ -266,7 +266,7 @@ public:
 
   /// Push a lazily-created cleanup on the stack. Tuple version.
   template <class T, class... As>
-  void pushCleanup(CleanupKind Kind, std::tuple<As...> A) {
+  void pushCleanupTuple(CleanupKind Kind, std::tuple<As...> A) {
     void *Buffer = pushCleanup(Kind, sizeof(T));
     Cleanup *Obj = new (Buffer) T(std::move(A));
     (void) Obj;