Index: base/callback.h.pump |
diff --git a/base/callback.h.pump b/base/callback.h.pump |
index 37ee56df3e2e8332f18c7745af5ee45ed280ac0e..e236254d8a3f85aa4a20d79b13f66f631f416918 100644 |
--- a/base/callback.h.pump |
+++ b/base/callback.h.pump |
@@ -128,7 +128,7 @@ $var MAX_ARITY = 7 |
// the rest when you execute the callback. |
// |
// void MyFunc(int i, const std::string& str) {} |
-// base::Callback<void(int)> cb = base::Bind(&MyFunc, 23); |
+// base::Callback<void(const std::string&)> cb = base::Bind(&MyFunc, 23); |
// cb.Run("hello world"); |
// |
// When calling a function bound parameters are first, followed by unbound |
@@ -380,15 +380,16 @@ class Callback<R($for ARG , [[A$(ARG)]])> : public internal::CallbackBase { |
// Note that this constructor CANNOT be explicit, and that Bind() CANNOT |
// return the exact Callback<> type. See base/bind.h for details. |
- template <typename Runnable, typename RunType, typename BoundArgsType> |
- Callback(internal::BindState<Runnable, RunType, BoundArgsType>* bind_state) |
+ template <typename Runnable, typename BindRunType, typename BoundArgsType> |
+ Callback(internal::BindState<Runnable, BindRunType, |
+ BoundArgsType>* bind_state) |
: CallbackBase(bind_state) { |
// Force the assignment to a local variable of PolymorphicInvoke |
// so the compiler will typecheck that the passed in Run() method has |
// the correct type. |
PolymorphicInvoke invoke_func = |
- &internal::BindState<Runnable, RunType, BoundArgsType> |
+ &internal::BindState<Runnable, BindRunType, BoundArgsType> |
::InvokerType::Run; |
polymorphic_invoke_ = reinterpret_cast<InvokeFuncStorage>(invoke_func); |
} |