r232122 - Disambiguate call for GCC.

[Benjamin Kramer]

Author: d0k
Date: Thu Mar 12 18:46:55 2015
New Revision: 232122

URL: http://llvm.org/viewvc/llvm-project?rev=232122&view=rev
Log:
Disambiguate call for GCC.

Modified:
    cfe/trunk/lib/CodeGen/CodeGenFunction.h
    cfe/trunk/lib/CodeGen/EHScopeStack.h

Modified: cfe/trunk/lib/CodeGen/CodeGenFunction.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenFunction.h?rev=232122&r1=232121&r2=232122&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenFunction.h (original)
+++ cfe/trunk/lib/CodeGen/CodeGenFunction.h Thu Mar 12 18:46:55 2015
@@ -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();
   }
 

Modified: cfe/trunk/lib/CodeGen/EHScopeStack.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/EHScopeStack.h?rev=232122&r1=232121&r2=232122&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/EHScopeStack.h (original)
+++ cfe/trunk/lib/CodeGen/EHScopeStack.h Thu Mar 12 18:46:55 2015
@@ -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;