From c9d63888fe4bf61cab2ca02db39caf47711f401d Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 31 Jan 2015 21:57:38 +0000 Subject: Merge llvm 3.6.0rc2 from ^/vendor/llvm/dist, merge clang 3.6.0rc2 from ^/vendor/clang/dist, resolve conflicts, and cleanup patches. --- contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'contrib/llvm/tools/clang/lib/Tooling') diff --git a/contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp b/contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp index 5a67db0..1722ede 100644 --- a/contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp +++ b/contrib/llvm/tools/clang/lib/Tooling/ArgumentsAdjusters.cpp @@ -78,7 +78,9 @@ ArgumentsAdjuster getInsertArgumentAdjuster(const char *Extra, ArgumentsAdjuster combineAdjusters(ArgumentsAdjuster First, ArgumentsAdjuster Second) { - return std::bind(Second, std::bind(First, std::placeholders::_1)); + return [First, Second](const CommandLineArguments &Args) { + return Second(First(Args)); + }; } } // end namespace tooling -- cgit v1.1