diff options
| author | tzik <tzik@chromium.org> | 2015-12-14 22:41:49 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-15 06:42:38 +0000 |
| commit | ce3ecf87d878414a8b475549c72ae799f1e1c5c9 (patch) | |
| tree | cfeb81b71fea92c6c2a6b6171ad2a1f18c21d446 /base/bind.h | |
| parent | 1c3ff0ea380d91301215c7bfe966b992e62c2bdb (diff) | |
| download | chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.zip chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.tar.gz chromium_src-ce3ecf87d878414a8b475549c72ae799f1e1c5c9.tar.bz2 | |
Clean up base::Callback stuff
* Typo fix
* Remove unused or duplicated forward decls
* Make Callback ctor explicit
* Simplify BindState param by expanding TypeList
BUG=
Review URL: https://codereview.chromium.org/1507143003
Cr-Commit-Position: refs/heads/master@{#365184}
Diffstat (limited to 'base/bind.h')
| -rw-r--r-- | base/bind.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/base/bind.h b/base/bind.h index 94da5ac..9b55924 100644 --- a/base/bind.h +++ b/base/bind.h @@ -51,15 +51,13 @@ template <typename Functor> base::Callback< typename internal::BindState< typename internal::FunctorTraits<Functor>::RunnableType, - typename internal::FunctorTraits<Functor>::RunType, - internal::TypeList<>>::UnboundRunType> + typename internal::FunctorTraits<Functor>::RunType>::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, - internal::TypeList<>> BindState; + typedef internal::BindState<RunnableType, RunType> BindState; return Callback<typename BindState::UnboundRunType>( new BindState(internal::MakeRunnable(functor))); @@ -70,8 +68,7 @@ base::Callback< typename internal::BindState< typename internal::FunctorTraits<Functor>::RunnableType, typename internal::FunctorTraits<Functor>::RunType, - internal::TypeList< - typename internal::CallbackParamTraits<Args>::StorageType...>> + typename internal::CallbackParamTraits<Args>::StorageType...> ::UnboundRunType> Bind(Functor functor, const Args&... args) { // Typedefs for how to store and run the functor. @@ -105,8 +102,7 @@ Bind(Functor functor, const Args&... args) { typedef internal::BindState< RunnableType, RunType, - internal::TypeList< - typename internal::CallbackParamTraits<Args>::StorageType...>> + typename internal::CallbackParamTraits<Args>::StorageType...> BindState; return Callback<typename BindState::UnboundRunType>( |