diff options
| author | Hans Wennborg <hans@hanshq.net> | 2015-01-16 17:59:14 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2015-01-16 17:59:14 +0000 |
| commit | 2e151343a8de90fc29d2081c02fcb50b48fd23bd (patch) | |
| tree | df688a3cc34477b9c702156ec876e80ee89f52b3 /lib | |
| parent | 4587e1f8698e96ac836e0f93b296b2b2bf83ea5c (diff) | |
Merging r226282:
------------------------------------------------------------------------
r226282 | alexfh | 2015-01-16 07:57:15 -0800 (Fri, 16 Jan 2015) | 2 lines
Attempt to fix the build with XCode 5.0.2 (and probably 5.1.1).
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_36@226293 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Tooling/ArgumentsAdjusters.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Tooling/ArgumentsAdjusters.cpp b/lib/Tooling/ArgumentsAdjusters.cpp index 5a67db0e17..1722ede08a 100644 --- a/lib/Tooling/ArgumentsAdjusters.cpp +++ b/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 |