Index: base/callback.h |
=================================================================== |
--- base/callback.h (revision 113737) |
+++ base/callback.h (working copy) |
@@ -312,7 +312,7 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1)); |
+ return f(bind_state_.get(), a1); |
} |
private: |
@@ -355,8 +355,8 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2)); |
+ return f(bind_state_.get(), a1, |
+ a2); |
} |
private: |
@@ -401,9 +401,9 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2), |
- internal::CallbackForward(a3)); |
+ return f(bind_state_.get(), a1, |
+ a2, |
+ a3); |
} |
private: |
@@ -450,10 +450,10 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2), |
- internal::CallbackForward(a3), |
- internal::CallbackForward(a4)); |
+ return f(bind_state_.get(), a1, |
+ a2, |
+ a3, |
+ a4); |
} |
private: |
@@ -503,11 +503,11 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2), |
- internal::CallbackForward(a3), |
- internal::CallbackForward(a4), |
- internal::CallbackForward(a5)); |
+ return f(bind_state_.get(), a1, |
+ a2, |
+ a3, |
+ a4, |
+ a5); |
} |
private: |
@@ -559,12 +559,12 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2), |
- internal::CallbackForward(a3), |
- internal::CallbackForward(a4), |
- internal::CallbackForward(a5), |
- internal::CallbackForward(a6)); |
+ return f(bind_state_.get(), a1, |
+ a2, |
+ a3, |
+ a4, |
+ a5, |
+ a6); |
} |
private: |
@@ -618,13 +618,13 @@ |
PolymorphicInvoke f = |
reinterpret_cast<PolymorphicInvoke>(polymorphic_invoke_); |
- return f(bind_state_.get(), internal::CallbackForward(a1), |
- internal::CallbackForward(a2), |
- internal::CallbackForward(a3), |
- internal::CallbackForward(a4), |
- internal::CallbackForward(a5), |
- internal::CallbackForward(a6), |
- internal::CallbackForward(a7)); |
+ return f(bind_state_.get(), a1, |
+ a2, |
+ a3, |
+ a4, |
+ a5, |
+ a6, |
+ a7); |
} |
private: |