Chromium Code Reviews| Index: base/bind_internal.h.pump |
| diff --git a/base/bind_internal.h.pump b/base/bind_internal.h.pump |
| index ac228e6eeac9e9c4123f99fb8f458cd561b565d8..d315e8573fa5acd1e6bb89034cbb2f3504e6ae7f 100644 |
| --- a/base/bind_internal.h.pump |
| +++ b/base/bind_internal.h.pump |
| @@ -286,6 +286,7 @@ struct InvokeHelper; |
| $for ARITY [[ |
| $range ARG 1..ARITY |
| +$range ARG2 2..ARITY |
|
awong
2013/06/03 20:13:42
Can we call this ARG_FROM_2 or maybe even somethin
|
| template <typename ReturnType, typename Runnable[[]] |
| $if ARITY > 0 [[,]] $for ARG , [[typename A$(ARG)]]> |
| @@ -318,7 +319,13 @@ $if ARITY > 0[[, ]] $for ARG , [[A$(ARG) a$(ARG)]]) { |
| return; |
| } |
| - runnable.Run($for ARG , [[CallbackForward(a$(ARG))]]); |
| +$if ARITY > 1 [[ |
| + runnable.Run(a1.get(), $for ARG2 , [[CallbackForward(a$(ARG2))]]); |
| + |
| +]] $else [[ |
| + runnable.Run(a1.get()); |
| + |
| +]] |
| } |
| }; |