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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ipc/ipc_message_utils.h

Issue 794073003: Revert of Revert "Update legacy Tuple-using code." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « ipc/ipc_message_macros.h ('k') | sandbox/linux/seccomp-bpf/codegen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_utils.h
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index c78192a9c3d435e9d3e8b9c284cf106a7691b19b..d4c6268ba0f6fdff252f500c38130fe9cf8c076a 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -520,8 +520,8 @@
};
template <>
-struct ParamTraits<Tuple0> {
- typedef Tuple0 param_type;
+struct ParamTraits<Tuple<>> {
+ typedef Tuple<> param_type;
static void Write(Message* m, const param_type& p) {
}
static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
@@ -532,112 +532,112 @@
};
template <class A>
-struct ParamTraits< Tuple1<A> > {
- typedef Tuple1<A> param_type;
- static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.a);
- }
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
- return ReadParam(m, iter, &r->a);
- }
- static void Log(const param_type& p, std::string* l) {
- LogParam(p.a, l);
+struct ParamTraits<Tuple<A>> {
+ typedef Tuple<A> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, get<0>(p));
+ }
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ return ReadParam(m, iter, &get<0>(*r));
+ }
+ static void Log(const param_type& p, std::string* l) {
+ LogParam(get<0>(p), l);
}
};
template <class A, class B>
-struct ParamTraits< Tuple2<A, B> > {
- typedef Tuple2<A, B> param_type;
- static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.a);
- WriteParam(m, p.b);
- }
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
- return (ReadParam(m, iter, &r->a) &&
- ReadParam(m, iter, &r->b));
- }
- static void Log(const param_type& p, std::string* l) {
- LogParam(p.a, l);
- l->append(", ");
- LogParam(p.b, l);
+struct ParamTraits< Tuple<A, B> > {
+ typedef Tuple<A, B> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, get<0>(p));
+ WriteParam(m, get<1>(p));
+ }
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ return (ReadParam(m, iter, &get<0>(*r)) &&
+ ReadParam(m, iter, &get<1>(*r)));
+ }
+ static void Log(const param_type& p, std::string* l) {
+ LogParam(get<0>(p), l);
+ l->append(", ");
+ LogParam(get<1>(p), l);
}
};
template <class A, class B, class C>
-struct ParamTraits< Tuple3<A, B, C> > {
- typedef Tuple3<A, B, C> param_type;
- static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.a);
- WriteParam(m, p.b);
- WriteParam(m, p.c);
- }
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
- return (ReadParam(m, iter, &r->a) &&
- ReadParam(m, iter, &r->b) &&
- ReadParam(m, iter, &r->c));
- }
- static void Log(const param_type& p, std::string* l) {
- LogParam(p.a, l);
- l->append(", ");
- LogParam(p.b, l);
- l->append(", ");
- LogParam(p.c, l);
+struct ParamTraits< Tuple<A, B, C> > {
+ typedef Tuple<A, B, C> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, get<0>(p));
+ WriteParam(m, get<1>(p));
+ WriteParam(m, get<2>(p));
+ }
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ return (ReadParam(m, iter, &get<0>(*r)) &&
+ ReadParam(m, iter, &get<1>(*r)) &&
+ ReadParam(m, iter, &get<2>(*r)));
+ }
+ static void Log(const param_type& p, std::string* l) {
+ LogParam(get<0>(p), l);
+ l->append(", ");
+ LogParam(get<1>(p), l);
+ l->append(", ");
+ LogParam(get<2>(p), l);
}
};
template <class A, class B, class C, class D>
-struct ParamTraits< Tuple4<A, B, C, D> > {
- typedef Tuple4<A, B, C, D> param_type;
- static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.a);
- WriteParam(m, p.b);
- WriteParam(m, p.c);
- WriteParam(m, p.d);
- }
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
- return (ReadParam(m, iter, &r->a) &&
- ReadParam(m, iter, &r->b) &&
- ReadParam(m, iter, &r->c) &&
- ReadParam(m, iter, &r->d));
- }
- static void Log(const param_type& p, std::string* l) {
- LogParam(p.a, l);
- l->append(", ");
- LogParam(p.b, l);
- l->append(", ");
- LogParam(p.c, l);
- l->append(", ");
- LogParam(p.d, l);
+struct ParamTraits< Tuple<A, B, C, D> > {
+ typedef Tuple<A, B, C, D> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, get<0>(p));
+ WriteParam(m, get<1>(p));
+ WriteParam(m, get<2>(p));
+ WriteParam(m, get<3>(p));
+ }
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ return (ReadParam(m, iter, &get<0>(*r)) &&
+ ReadParam(m, iter, &get<1>(*r)) &&
+ ReadParam(m, iter, &get<2>(*r)) &&
+ ReadParam(m, iter, &get<3>(*r)));
+ }
+ static void Log(const param_type& p, std::string* l) {
+ LogParam(get<0>(p), l);
+ l->append(", ");
+ LogParam(get<1>(p), l);
+ l->append(", ");
+ LogParam(get<2>(p), l);
+ l->append(", ");
+ LogParam(get<3>(p), l);
}
};
template <class A, class B, class C, class D, class E>
-struct ParamTraits< Tuple5<A, B, C, D, E> > {
- typedef Tuple5<A, B, C, D, E> param_type;
- static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.a);
- WriteParam(m, p.b);
- WriteParam(m, p.c);
- WriteParam(m, p.d);
- WriteParam(m, p.e);
- }
- static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
- return (ReadParam(m, iter, &r->a) &&
- ReadParam(m, iter, &r->b) &&
- ReadParam(m, iter, &r->c) &&
- ReadParam(m, iter, &r->d) &&
- ReadParam(m, iter, &r->e));
- }
- static void Log(const param_type& p, std::string* l) {
- LogParam(p.a, l);
- l->append(", ");
- LogParam(p.b, l);
- l->append(", ");
- LogParam(p.c, l);
- l->append(", ");
- LogParam(p.d, l);
- l->append(", ");
- LogParam(p.e, l);
+struct ParamTraits< Tuple<A, B, C, D, E> > {
+ typedef Tuple<A, B, C, D, E> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, get<0>(p));
+ WriteParam(m, get<1>(p));
+ WriteParam(m, get<2>(p));
+ WriteParam(m, get<3>(p));
+ WriteParam(m, get<4>(p));
+ }
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
+ return (ReadParam(m, iter, &get<0>(*r)) &&
+ ReadParam(m, iter, &get<1>(*r)) &&
+ ReadParam(m, iter, &get<2>(*r)) &&
+ ReadParam(m, iter, &get<3>(*r)) &&
+ ReadParam(m, iter, &get<4>(*r)));
+ }
+ static void Log(const param_type& p, std::string* l) {
+ LogParam(get<0>(p), l);
+ l->append(", ");
+ LogParam(get<1>(p), l);
+ l->append(", ");
+ LogParam(get<2>(p), l);
+ l->append(", ");
+ LogParam(get<3>(p), l);
+ l->append(", ");
+ LogParam(get<4>(p), l);
}
};
@@ -912,7 +912,7 @@
Method func) {
Message* reply = SyncMessage::GenerateReply(msg);
if (ok) {
- Tuple1<Message&> t = MakeRefTuple(*reply);
+ Tuple<Message&> t = MakeRefTuple(*reply);
ConnectMessageAndReply(msg, reply);
DispatchToMethod(obj, func, send_params, &t);
} else {
« no previous file with comments | « ipc/ipc_message_macros.h ('k') | sandbox/linux/seccomp-bpf/codegen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698