diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2015-03-12 23:46:55 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2015-03-12 23:46:55 +0000 |
| commit | 7f1f6b5370c7449700fbe5fda9e8f3648bc78890 (patch) | |
| tree | fa5586a6d1f39eaf73ff80c63ae80681f00c4f64 /clang/lib | |
| parent | 51680bccdaa74f82f7095a5bdf40fac811deb0d2 (diff) | |
| download | bcm5719-llvm-7f1f6b5370c7449700fbe5fda9e8f3648bc78890.tar.gz bcm5719-llvm-7f1f6b5370c7449700fbe5fda9e8f3648bc78890.zip | |
Disambiguate call for GCC.
llvm-svn: 232122
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenFunction.h | 2 | ||||
| -rw-r--r-- | clang/lib/CodeGen/EHScopeStack.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h index f93e556b588..1795ba3488c 100644 --- a/clang/lib/CodeGen/CodeGenFunction.h +++ b/clang/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/clang/lib/CodeGen/EHScopeStack.h b/clang/lib/CodeGen/EHScopeStack.h index 08dad69e7da..363d8b8fe4a 100644 --- a/clang/lib/CodeGen/EHScopeStack.h +++ b/clang/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; |
