diff options
| author | tzik <tzik@chromium.org> | 2015-02-05 11:11:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-05 19:12:47 +0000 |
| commit | 8ce65709225bac5922e6b2b80a912cf9796949b1 (patch) | |
| tree | 6b7339e48649d2e469079565a8e7d3e1d0ca06dd /base/bind.h | |
| parent | d5626f6497c92188cc5d88b6778f7bae0b33c1b3 (diff) | |
| download | chromium_src-8ce65709225bac5922e6b2b80a912cf9796949b1.zip chromium_src-8ce65709225bac5922e6b2b80a912cf9796949b1.tar.gz chromium_src-8ce65709225bac5922e6b2b80a912cf9796949b1.tar.bz2 | |
Bind: Use Variadic Templates in bind_internal.h
* Introduce TypeList as helpers.
* Drop bind_internal.h.pump and replace generated codes with Variadic Templates version.
BUG=433164
Review URL: https://codereview.chromium.org/743853002
Cr-Commit-Position: refs/heads/master@{#314847}
Diffstat (limited to 'base/bind.h')
| -rw-r--r-- | base/bind.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/base/bind.h b/base/bind.h index 7874656..51be10d 100644 --- a/base/bind.h +++ b/base/bind.h @@ -52,13 +52,14 @@ base::Callback< typename internal::BindState< typename internal::FunctorTraits<Functor>::RunnableType, typename internal::FunctorTraits<Functor>::RunType, - void()>::UnboundRunType> + internal::TypeList<>>::UnboundRunType> Bind(Functor functor) { // Typedefs for how to store and run the functor. typedef typename internal::FunctorTraits<Functor>::RunnableType RunnableType; typedef typename internal::FunctorTraits<Functor>::RunType RunType; - typedef internal::BindState<RunnableType, RunType, void()> BindState; + typedef internal::BindState<RunnableType, RunType, + internal::TypeList<>> BindState; return Callback<typename BindState::UnboundRunType>( new BindState(internal::MakeRunnable(functor))); @@ -69,7 +70,8 @@ base::Callback< typename internal::BindState< typename internal::FunctorTraits<Functor>::RunnableType, typename internal::FunctorTraits<Functor>::RunType, - void(typename internal::CallbackParamTraits<Args>::StorageType...)> + internal::TypeList< + typename internal::CallbackParamTraits<Args>::StorageType...>> ::UnboundRunType> Bind(Functor functor, const Args&... args) { // Typedefs for how to store and run the functor. @@ -101,8 +103,10 @@ Bind(Functor functor, const Args&... args) { !internal::HasRefCountedParamAsRawPtr<is_method, Args...>::value, "a_parameter_is_refcounted_type_and_needs_scoped_refptr"); - typedef internal::BindState<RunnableType, RunType, - void(typename internal::CallbackParamTraits<Args>::StorageType...)> + typedef internal::BindState< + RunnableType, RunType, + internal::TypeList< + typename internal::CallbackParamTraits<Args>::StorageType...>> BindState; return Callback<typename BindState::UnboundRunType>( |