diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-07 13:12:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-09 10:02:59 +0000 |
| commit | 33fc33aa94d4add0878ec30dc818e34e1dd3cc2a (patch) | |
| tree | f6af110909c79b2759136554f1143d8b0572af0a /chromium/base/bind_internal.h | |
| parent | 7d2c5d177e9813077a621df8d18c0deda73099b3 (diff) | |
BASELINE: Update Chromium to 104.0.5112.120
Change-Id: I5d2726c2ab018d75d055739b6ba64317904f05bb
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/438935
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 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/base/bind_internal.h b/chromium/base/bind_internal.h index 1b06e54b65a..f24a2f09a37 100644 --- a/chromium/base/bind_internal.h +++ b/chromium/base/bind_internal.h @@ -21,7 +21,6 @@ #include "base/memory/raw_scoped_refptr_mismatch_checker.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" -#include "base/template_util.h" #include "build/build_config.h" #if BUILDFLAG(IS_APPLE) && !HAS_FEATURE(objc_arc) @@ -364,14 +363,14 @@ template <typename Functor, typename SFINAE = void> struct IsCallableObject : std::false_type {}; template <typename Callable> -struct IsCallableObject<Callable, void_t<decltype(&Callable::operator())>> +struct IsCallableObject<Callable, std::void_t<decltype(&Callable::operator())>> : std::true_type {}; // HasRefCountedTypeAsRawPtr inherits from true_type when any of the |Args| is a // raw pointer to a RefCounted type. template <typename... Ts> struct HasRefCountedTypeAsRawPtr - : disjunction<NeedsScopedRefptrButGetsRawPtr<Ts>...> {}; + : std::disjunction<NeedsScopedRefptrButGetsRawPtr<Ts>...> {}; // ForceVoidReturn<> // @@ -912,7 +911,7 @@ BanUnconstructedRefCountedReceiver(const Receiver& receiver, Unused&&...) { // This stores all the state passed into Bind(). template <typename Functor, typename... BoundArgs> struct BindState final : BindStateBase { - using IsCancellable = bool_constant< + using IsCancellable = std::bool_constant< CallbackCancellationTraits<Functor, std::tuple<BoundArgs...>>::is_cancellable>; template <typename ForwardFunctor, typename... ForwardBoundArgs> |