diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/base/bind_internal.h | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/bind_internal.h')
| -rw-r--r-- | chromium/base/bind_internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/base/bind_internal.h b/chromium/base/bind_internal.h index d8efc568c05..c69d138ac97 100644 --- a/chromium/base/bind_internal.h +++ b/chromium/base/bind_internal.h @@ -23,7 +23,7 @@ #include "base/template_util.h" #include "build/build_config.h" -#if defined(OS_MACOSX) && !HAS_FEATURE(objc_arc) +#if defined(OS_APPLE) && !HAS_FEATURE(objc_arc) #include "base/mac/scoped_block.h" #endif @@ -426,7 +426,7 @@ struct FunctorTraits<R(__fastcall*)(Args...)> { #endif // defined(OS_WIN) && !defined(ARCH_CPU_64_BITS) -#if defined(OS_MACOSX) +#if defined(OS_APPLE) // Support for Objective-C blocks. There are two implementation depending // on whether Automated Reference Counting (ARC) is enabled. When ARC is @@ -481,7 +481,7 @@ struct FunctorTraits<base::mac::ScopedBlock<R (^)(Args...)>> { }; #endif // HAS_FEATURE(objc_arc) -#endif // defined(OS_MACOSX) +#endif // defined(OS_APPLE) // For methods. template <typename R, typename Receiver, typename... Args> @@ -642,7 +642,7 @@ struct InvokeHelper<false, ReturnType> { template <typename ReturnType> struct InvokeHelper<true, ReturnType> { // WeakCalls are only supported for functions with a void return type. - // Otherwise, the function result would be undefined if the the WeakPtr<> + // Otherwise, the function result would be undefined if the WeakPtr<> // is invalidated. static_assert(std::is_void<ReturnType>::value, "weak_ptrs can only bind to methods without return values"); |