diff options
| author | tzik <tzik@chromium.org> | 2016-02-16 07:04:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 15:05:12 +0000 |
| commit | 463eb426b5621e116c2025e279e204cc483a7e29 (patch) | |
| tree | dce93e5074041f362f9f36f23481adcca8750f45 /base/tuple.h | |
| parent | 1570bad784b3dd9fa1daf0bf125635a2b77f08cb (diff) | |
| download | chromium_src-463eb426b5621e116c2025e279e204cc483a7e29.zip chromium_src-463eb426b5621e116c2025e279e204cc483a7e29.tar.gz chromium_src-463eb426b5621e116c2025e279e204cc483a7e29.tar.bz2 | |
Remove UnwrapTraits
Remove UnwrapTraits::ForwardType, which is no longer used, and extract
UnwrapTraits::Unwrap to be non member function.
BUG=554299
Review URL: https://codereview.chromium.org/1698223002
Cr-Commit-Position: refs/heads/master@{#375576}
Diffstat (limited to 'base/tuple.h')
| -rw-r--r-- | base/tuple.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/tuple.h b/base/tuple.h index d07d38c..8898fe0 100644 --- a/base/tuple.h +++ b/base/tuple.h @@ -200,7 +200,7 @@ inline void DispatchToMethodImpl(const ObjT& obj, Method method, const Tuple<Ts...>& arg, IndexSequence<Ns...>) { - (obj->*method)(base::internal::UnwrapTraits<Ts>::Unwrap(get<Ns>(arg))...); + (obj->*method)(internal::Unwrap(get<Ns>(arg))...); } template <typename ObjT, typename Method, typename... Ts> @@ -216,7 +216,7 @@ template <typename Function, typename... Ts, size_t... Ns> inline void DispatchToFunctionImpl(Function function, const Tuple<Ts...>& arg, IndexSequence<Ns...>) { - (*function)(base::internal::UnwrapTraits<Ts>::Unwrap(get<Ns>(arg))...); + (*function)(internal::Unwrap(get<Ns>(arg))...); } template <typename Function, typename... Ts> @@ -238,8 +238,7 @@ inline void DispatchToMethodImpl(const ObjT& obj, Tuple<OutTs...>* out, IndexSequence<InNs...>, IndexSequence<OutNs...>) { - (obj->*method)(base::internal::UnwrapTraits<InTs>::Unwrap(get<InNs>(in))..., - &get<OutNs>(*out)...); + (obj->*method)(internal::Unwrap(get<InNs>(in))..., &get<OutNs>(*out)...); } template <typename ObjT, typename Method, typename... InTs, typename... OutTs> |