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

diff --git a/lib/Tooling/ArgumentsAdjusters.cpp b/lib/Tooling/ArgumentsAdjusters.cpp
index 5a67db0e176f5c9cf5c50d3553d1e7e30ddcf0fd..1722ede08a8625517685f5b73c3631ba391811f2 100644 (file)
--- 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