Author: hans
Date: Fri Jan 16 11:59:14 2015
New Revision: 226293
URL: http://llvm.org/viewvc/llvm-project?rev=226293&view=rev
Log:
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).
------------------------------------------------------------------------
Modified:
cfe/branches/release_36/ (props changed)
cfe/branches/release_36/lib/Tooling/ArgumentsAdjusters.cpp
Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 16 11:59:14 2015
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136
+/cfe/trunk:226008,226049,226136,226282
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_36/lib/Tooling/ArgumentsAdjusters.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/lib/Tooling/ArgumentsAdjusters.cpp?rev=226293&r1=226292&r2=226293&view=diff
==============================================================================
--- cfe/branches/release_36/lib/Tooling/ArgumentsAdjusters.cpp (original)
+++ cfe/branches/release_36/lib/Tooling/ArgumentsAdjusters.cpp Fri Jan 16
11:59:14 2015
@@ -78,7 +78,9 @@ ArgumentsAdjuster getInsertArgumentAdjus
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
_______________________________________________
llvm-branch-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
