Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2762)

Unified Diff: base/mac/bind_objc_block.h

Issue 1855483004: [iOS/OS X] Allow base::scoped_nsobject<> to be used when ARC is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to build/config/compiler/BUILD.gn Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/mac/bind_objc_block.h
diff --git a/base/mac/bind_objc_block.h b/base/mac/bind_objc_block.h
index c31f26e5a31f6347fc2459848f0d261a8e4c4bf4..a54c1ad165c519c78a4cc756301eb1efbe9a3230 100644
--- a/base/mac/bind_objc_block.h
+++ b/base/mac/bind_objc_block.h
@@ -46,7 +46,8 @@ R RunBlock(base::mac::ScopedBlock<R(^)(Args...)> block, Args... args) {
template<typename R, typename... Args>
base::Callback<R(Args...)> BindBlock(R(^block)(Args...)) {
return base::Bind(&base::internal::RunBlock<R, Args...>,
- base::mac::ScopedBlock<R(^)(Args...)>(Block_copy(block)));
+ base::mac::ScopedBlock<R (^)(Args...)>(
+ base::mac::internal::ScopedBlockTraitsRetain(block)));
}
} // namespace base
« no previous file with comments | « base/base.gypi ('k') | base/mac/scoped_block.h » ('j') | base/mac/scoped_block.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698