diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-12 14:07:37 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-07-17 10:29:26 +0000 |
| commit | ec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch) | |
| tree | 25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/base/bind_internal.h | |
| parent | bb09965444b5bb20b096a291445170876225268d (diff) | |
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/base/bind_internal.h')
| -rw-r--r-- | chromium/base/bind_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/base/bind_internal.h b/chromium/base/bind_internal.h index 8988bdca226..c8af87d5806 100644 --- a/chromium/base/bind_internal.h +++ b/chromium/base/bind_internal.h @@ -360,7 +360,7 @@ struct Invoker<StorageType, R(UnboundArgs...)> { return InvokeHelper<is_weak_call, R>::MakeItSo( std::forward<Functor>(functor), - Unwrap(base::get<indices>(std::forward<BoundArgsTuple>(bound)))..., + Unwrap(std::get<indices>(std::forward<BoundArgsTuple>(bound)))..., std::forward<UnboundArgs>(unbound_args)...); } }; @@ -393,7 +393,7 @@ bool ApplyCancellationTraitsImpl(const Functor& functor, const BoundArgsTuple& bound_args, IndexSequence<indices...>) { return CallbackCancellationTraits<Functor, BoundArgsTuple>::IsCancelled( - functor, base::get<indices>(bound_args)...); + functor, std::get<indices>(bound_args)...); } // Relays |base| to corresponding CallbackCancellationTraits<>::Run(). Returns |