Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2943)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/bind_internal.h

Issue 8949057: Revert 115441 - Redo r113722 - Add Pass(), which implements move semantics, to scoped_ptr, scoped... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/bind_helpers.h ('k') | base/bind_internal.h.pump » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/bind_internal.h
===================================================================
--- base/bind_internal.h (revision 115443)
+++ base/bind_internal.h (working copy)
@@ -76,6 +76,7 @@
// 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
@@ -166,7 +167,7 @@
}
R Run(typename CallbackParamTraits<A1>::ForwardType a1) {
- return function_(CallbackForward(a1));
+ return function_(a1);
}
private:
@@ -185,7 +186,7 @@
}
R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
- return (object->*method_)(CallbackForward(a1));
+ return (object->*method_)(a1);
}
private:
@@ -204,7 +205,7 @@
}
R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1) {
- return (object->*method_)(CallbackForward(a1));
+ return (object->*method_)(a1);
}
private:
@@ -223,7 +224,7 @@
R Run(typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2) {
- return function_(CallbackForward(a1), CallbackForward(a2));
+ return function_(a1, a2);
}
private:
@@ -243,7 +244,7 @@
R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
+ return (object->*method_)(a1, a2);
}
private:
@@ -263,7 +264,7 @@
R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2));
+ return (object->*method_)(a1, a2);
}
private:
@@ -283,8 +284,7 @@
R Run(typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3) {
- return function_(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3));
+ return function_(a1, a2, a3);
}
private:
@@ -305,8 +305,7 @@
R Run(T* object, typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3));
+ return (object->*method_)(a1, a2, a3);
}
private:
@@ -327,8 +326,7 @@
R Run(const T* object, typename CallbackParamTraits<A1>::ForwardType a1,
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3));
+ return (object->*method_)(a1, a2, a3);
}
private:
@@ -349,8 +347,7 @@
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4) {
- return function_(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4));
+ return function_(a1, a2, a3, a4);
}
private:
@@ -373,8 +370,7 @@
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4));
+ return (object->*method_)(a1, a2, a3, a4);
}
private:
@@ -397,8 +393,7 @@
typename CallbackParamTraits<A2>::ForwardType a2,
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4));
+ return (object->*method_)(a1, a2, a3, a4);
}
private:
@@ -421,8 +416,7 @@
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5) {
- return function_(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+ return function_(a1, a2, a3, a4, a5);
}
private:
@@ -446,8 +440,7 @@
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+ return (object->*method_)(a1, a2, a3, a4, a5);
}
private:
@@ -471,8 +464,7 @@
typename CallbackParamTraits<A3>::ForwardType a3,
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+ return (object->*method_)(a1, a2, a3, a4, a5);
}
private:
@@ -496,9 +488,7 @@
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6) {
- return function_(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6));
+ return function_(a1, a2, a3, a4, a5, a6);
}
private:
@@ -523,9 +513,7 @@
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6));
+ return (object->*method_)(a1, a2, a3, a4, a5, a6);
}
private:
@@ -550,9 +538,7 @@
typename CallbackParamTraits<A4>::ForwardType a4,
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6));
+ return (object->*method_)(a1, a2, a3, a4, a5, a6);
}
private:
@@ -577,9 +563,7 @@
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6,
typename CallbackParamTraits<A7>::ForwardType a7) {
- return function_(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6), CallbackForward(a7));
+ return function_(a1, a2, a3, a4, a5, a6, a7);
}
private:
@@ -605,9 +589,7 @@
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6,
typename CallbackParamTraits<A7>::ForwardType a7) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6), CallbackForward(a7));
+ return (object->*method_)(a1, a2, a3, a4, a5, a6, a7);
}
private:
@@ -633,9 +615,7 @@
typename CallbackParamTraits<A5>::ForwardType a5,
typename CallbackParamTraits<A6>::ForwardType a6,
typename CallbackParamTraits<A7>::ForwardType a7) {
- return (object->*method_)(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6), CallbackForward(a7));
+ return (object->*method_)(a1, a2, a3, a4, a5, a6, a7);
}
private:
@@ -857,7 +837,7 @@
struct InvokeHelper<false, ReturnType, Runnable,
void(A1)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1) {
- return runnable.Run(CallbackForward(a1));
+ return runnable.Run(a1);
}
};
@@ -865,7 +845,7 @@
struct InvokeHelper<false, void, Runnable,
void(A1)> {
static void MakeItSo(Runnable runnable, A1 a1) {
- runnable.Run(CallbackForward(a1));
+ runnable.Run(a1);
}
};
@@ -877,7 +857,7 @@
return;
}
- runnable.Run(CallbackForward(a1));
+ runnable.Run(a1);
}
};
@@ -885,7 +865,7 @@
struct InvokeHelper<false, ReturnType, Runnable,
void(A1, A2)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2));
+ return runnable.Run(a1, a2);
}
};
@@ -893,7 +873,7 @@
struct InvokeHelper<false, void, Runnable,
void(A1, A2)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2));
+ runnable.Run(a1, a2);
}
};
@@ -905,7 +885,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2));
+ runnable.Run(a1, a2);
}
};
@@ -914,8 +894,7 @@
struct InvokeHelper<false, ReturnType, Runnable,
void(A1, A2, A3)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3));
+ return runnable.Run(a1, a2, a3);
}
};
@@ -923,7 +902,7 @@
struct InvokeHelper<false, void, Runnable,
void(A1, A2, A3)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
+ runnable.Run(a1, a2, a3);
}
};
@@ -935,7 +914,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3));
+ runnable.Run(a1, a2, a3);
}
};
@@ -944,8 +923,7 @@
struct InvokeHelper<false, ReturnType, Runnable,
void(A1, A2, A3, A4)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4));
+ return runnable.Run(a1, a2, a3, a4);
}
};
@@ -953,8 +931,7 @@
struct InvokeHelper<false, void, Runnable,
void(A1, A2, A3, A4)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4));
+ runnable.Run(a1, a2, a3, a4);
}
};
@@ -966,8 +943,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4));
+ runnable.Run(a1, a2, a3, a4);
}
};
@@ -977,8 +953,7 @@
void(A1, A2, A3, A4, A5)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
A5 a5) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5));
+ return runnable.Run(a1, a2, a3, a4, a5);
}
};
@@ -987,8 +962,7 @@
struct InvokeHelper<false, void, Runnable,
void(A1, A2, A3, A4, A5)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5));
+ runnable.Run(a1, a2, a3, a4, a5);
}
};
@@ -1001,8 +975,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5));
+ runnable.Run(a1, a2, a3, a4, a5);
}
};
@@ -1012,9 +985,7 @@
void(A1, A2, A3, A4, A5, A6)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
A5 a5, A6 a6) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6));
+ return runnable.Run(a1, a2, a3, a4, a5, a6);
}
};
@@ -1024,8 +995,7 @@
void(A1, A2, A3, A4, A5, A6)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
A6 a6) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
+ runnable.Run(a1, a2, a3, a4, a5, a6);
}
};
@@ -1039,8 +1009,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5), CallbackForward(a6));
+ runnable.Run(a1, a2, a3, a4, a5, a6);
}
};
@@ -1050,9 +1019,7 @@
void(A1, A2, A3, A4, A5, A6, A7)> {
static ReturnType MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4,
A5 a5, A6 a6, A7 a7) {
- return runnable.Run(CallbackForward(a1), CallbackForward(a2),
- CallbackForward(a3), CallbackForward(a4), CallbackForward(a5),
- CallbackForward(a6), CallbackForward(a7));
+ return runnable.Run(a1, a2, a3, a4, a5, a6, a7);
}
};
@@ -1062,9 +1029,7 @@
void(A1, A2, A3, A4, A5, A6, A7)> {
static void MakeItSo(Runnable runnable, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5,
A6 a6, A7 a7) {
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
- CallbackForward(a7));
+ runnable.Run(a1, a2, a3, a4, a5, a6, a7);
}
};
@@ -1078,9 +1043,7 @@
return;
}
- runnable.Run(CallbackForward(a1), CallbackForward(a2), CallbackForward(a3),
- CallbackForward(a4), CallbackForward(a5), CallbackForward(a6),
- CallbackForward(a7));
+ runnable.Run(a1, a2, a3, a4, a5, a6, a7);
}
};
@@ -1143,7 +1106,7 @@
return InvokeHelper<StorageType::IsWeakCall::value, R,
typename StorageType::RunnableType,
void(typename CallbackParamTraits<X1>::ForwardType x1)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1));
+ ::MakeItSo(storage->runnable_, x1);
}
};
@@ -1167,7 +1130,7 @@
return InvokeHelper<StorageType::IsWeakCall::value, R,
typename StorageType::RunnableType,
void(typename Bound1UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1));
+ ::MakeItSo(storage->runnable_, x1);
}
};
@@ -1193,8 +1156,7 @@
typename StorageType::RunnableType,
void(typename CallbackParamTraits<X1>::ForwardType x1,
typename CallbackParamTraits<X2>::ForwardType x2)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2));
+ ::MakeItSo(storage->runnable_, x1, x2);
}
};
@@ -1221,8 +1183,7 @@
typename StorageType::RunnableType,
void(typename Bound1UnwrapTraits::ForwardType,
typename CallbackParamTraits<X2>::ForwardType x2)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2));
+ ::MakeItSo(storage->runnable_, x1, x2);
}
};
@@ -1250,8 +1211,7 @@
typename StorageType::RunnableType,
void(typename Bound1UnwrapTraits::ForwardType,
typename Bound2UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2));
+ ::MakeItSo(storage->runnable_, x1, x2);
}
};
@@ -1281,8 +1241,7 @@
void(typename CallbackParamTraits<X1>::ForwardType x1,
typename CallbackParamTraits<X2>::ForwardType x2,
typename CallbackParamTraits<X3>::ForwardType x3)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3));
+ ::MakeItSo(storage->runnable_, x1, x2, x3);
}
};
@@ -1313,8 +1272,7 @@
void(typename Bound1UnwrapTraits::ForwardType,
typename CallbackParamTraits<X2>::ForwardType x2,
typename CallbackParamTraits<X3>::ForwardType x3)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3));
+ ::MakeItSo(storage->runnable_, x1, x2, x3);
}
};
@@ -1346,8 +1304,7 @@
void(typename Bound1UnwrapTraits::ForwardType,
typename Bound2UnwrapTraits::ForwardType,
typename CallbackParamTraits<X3>::ForwardType x3)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3));
+ ::MakeItSo(storage->runnable_, x1, x2, x3);
}
};
@@ -1380,8 +1337,7 @@
void(typename Bound1UnwrapTraits::ForwardType,
typename Bound2UnwrapTraits::ForwardType,
typename Bound3UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3));
+ ::MakeItSo(storage->runnable_, x1, x2, x3);
}
};
@@ -1414,9 +1370,7 @@
typename CallbackParamTraits<X2>::ForwardType x2,
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4);
}
};
@@ -1450,9 +1404,7 @@
typename CallbackParamTraits<X2>::ForwardType x2,
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4);
}
};
@@ -1487,9 +1439,7 @@
typename Bound2UnwrapTraits::ForwardType,
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4);
}
};
@@ -1525,9 +1475,7 @@
typename Bound2UnwrapTraits::ForwardType,
typename Bound3UnwrapTraits::ForwardType,
typename CallbackParamTraits<X4>::ForwardType x4)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4);
}
};
@@ -1564,9 +1512,7 @@
typename Bound2UnwrapTraits::ForwardType,
typename Bound3UnwrapTraits::ForwardType,
typename Bound4UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4);
}
};
@@ -1602,9 +1548,7 @@
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1641,9 +1585,7 @@
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1681,9 +1623,7 @@
typename CallbackParamTraits<X3>::ForwardType x3,
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1722,9 +1662,7 @@
typename Bound3UnwrapTraits::ForwardType,
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1764,9 +1702,7 @@
typename Bound3UnwrapTraits::ForwardType,
typename Bound4UnwrapTraits::ForwardType,
typename CallbackParamTraits<X5>::ForwardType x5)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1807,9 +1743,7 @@
typename Bound3UnwrapTraits::ForwardType,
typename Bound4UnwrapTraits::ForwardType,
typename Bound5UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5);
}
};
@@ -1848,10 +1782,7 @@
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -1891,10 +1822,7 @@
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -1935,10 +1863,7 @@
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -1980,10 +1905,7 @@
typename CallbackParamTraits<X4>::ForwardType x4,
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -2026,10 +1948,7 @@
typename Bound4UnwrapTraits::ForwardType,
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -2073,10 +1992,7 @@
typename Bound4UnwrapTraits::ForwardType,
typename Bound5UnwrapTraits::ForwardType,
typename CallbackParamTraits<X6>::ForwardType x6)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -2121,10 +2037,7 @@
typename Bound4UnwrapTraits::ForwardType,
typename Bound5UnwrapTraits::ForwardType,
typename Bound6UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6);
}
};
@@ -2166,10 +2079,7 @@
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2212,10 +2122,7 @@
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2259,10 +2166,7 @@
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2307,10 +2211,7 @@
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2356,10 +2257,7 @@
typename CallbackParamTraits<X5>::ForwardType x5,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2406,10 +2304,7 @@
typename Bound5UnwrapTraits::ForwardType,
typename CallbackParamTraits<X6>::ForwardType x6,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2457,10 +2352,7 @@
typename Bound5UnwrapTraits::ForwardType,
typename Bound6UnwrapTraits::ForwardType,
typename CallbackParamTraits<X7>::ForwardType x7)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
@@ -2509,10 +2401,7 @@
typename Bound5UnwrapTraits::ForwardType,
typename Bound6UnwrapTraits::ForwardType,
typename Bound7UnwrapTraits::ForwardType)>
- ::MakeItSo(storage->runnable_, CallbackForward(x1),
- CallbackForward(x2), CallbackForward(x3),
- CallbackForward(x4), CallbackForward(x5),
- CallbackForward(x6), CallbackForward(x7));
+ ::MakeItSo(storage->runnable_, x1, x2, x3, x4, x5, x6, x7);
}
};
« no previous file with comments | « base/bind_helpers.h ('k') | base/bind_internal.h.pump » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698