diff options
author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 18:00:44 +0000 |
---|---|---|
committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-13 18:00:44 +0000 |
commit | f51223594a70d2a57d71d8bef7f8004597ceca23 (patch) | |
tree | f4ec45f2e511e2a17c9b47706f3613d8a59391d1 /base/bind_internal.h.pump | |
parent | a32da25057698ef8e113e2c9432e2b88164ab4ae (diff) | |
download | chromium_src-f51223594a70d2a57d71d8bef7f8004597ceca23.zip chromium_src-f51223594a70d2a57d71d8bef7f8004597ceca23.tar.gz chromium_src-f51223594a70d2a57d71d8bef7f8004597ceca23.tar.bz2 |
Revert of "Revert of "Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr..."
This reverts commit r114228.
BUG=none
TEST=none
TBR=acolwell
Review URL: http://codereview.chromium.org/8929008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114230 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/bind_internal.h.pump')
-rw-r--r-- | base/bind_internal.h.pump | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump index 53dcbd3..7fd63d8 100644 --- a/base/bind_internal.h.pump +++ b/base/bind_internal.h.pump @@ -82,7 +82,6 @@ namespace internal { // into the Bind() system, doing most of the type resolution. // There are ARITY BindState types. - // RunnableAdapter<> // // The RunnableAdapter<> templates provide a uniform interface for invoking @@ -121,7 +120,7 @@ class RunnableAdapter<R(*)($for ARG , [[A$(ARG)]])> { } R Run($for ARG , [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) { - return function_($for ARG , [[a$(ARG)]]); + return function_($for ARG , [[CallbackForward(a$(ARG))]]); } private: @@ -143,7 +142,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]); R Run(T* object[[]] $if ARITY > 0[[, ]] $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) { - return (object->*method_)($for ARG , [[a$(ARG)]]); + return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]); } private: @@ -165,7 +164,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG)]]); R Run(const T* object[[]] $if ARITY > 0[[, ]] $for ARG, [[typename CallbackParamTraits<A$(ARG)>::ForwardType a$(ARG)]]) { - return (object->*method_)($for ARG , [[a$(ARG)]]); + return (object->*method_)($for ARG , [[CallbackForward(a$(ARG))]]); } private: @@ -291,7 +290,7 @@ struct InvokeHelper<false, ReturnType, Runnable, void($for ARG , [[A$(ARG)]])> { static ReturnType MakeItSo(Runnable runnable[[]] $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) { - return runnable.Run($for ARG , [[a$(ARG)]]); + return runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]); } }; @@ -301,7 +300,7 @@ struct InvokeHelper<false, void, Runnable, void($for ARG , [[A$(ARG)]])> { static void MakeItSo(Runnable runnable[[]] $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) { - runnable.Run($for ARG , [[a$(ARG)]]); + runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]); } }; @@ -316,7 +315,7 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) { return; } - runnable.Run($for ARG , [[a$(ARG)]]); + runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]); } }; @@ -404,7 +403,7 @@ typename CallbackParamTraits<X$(UNBOUND_ARG)>::ForwardType x$(UNBOUND_ARG) ]] )> ::MakeItSo(storage->runnable_ -$if ARITY > 0[[, ]] $for ARG , [[x$(ARG)]]); +$if ARITY > 0[[, ]] $for ARG , [[CallbackForward(x$(ARG))]]); } }; |