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

Side by Side Diff: ipc/ipc_message_templates_impl.h

Issue 1770013002: Replace base::Tuple in //ipc with std::tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +#include Created 4 years, 9 months 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 unified diff | Download patch
« no previous file with comments | « ipc/ipc_message_templates.h ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_ 5 #ifndef IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_
6 #define IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_ 6 #define IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_
7 7
8 #include <tuple>
9
8 namespace IPC { 10 namespace IPC {
9 11
10 template <typename... Ts> 12 template <typename... Ts>
11 class ParamDeserializer : public MessageReplyDeserializer { 13 class ParamDeserializer : public MessageReplyDeserializer {
12 public: 14 public:
13 explicit ParamDeserializer(const base::Tuple<Ts&...>& out) : out_(out) {} 15 explicit ParamDeserializer(const std::tuple<Ts&...>& out) : out_(out) {}
14 16
15 bool SerializeOutputParameters(const IPC::Message& msg, 17 bool SerializeOutputParameters(const IPC::Message& msg,
16 base::PickleIterator iter) override { 18 base::PickleIterator iter) override {
17 return ReadParam(&msg, &iter, &out_); 19 return ReadParam(&msg, &iter, &out_);
18 } 20 }
19 21
20 base::Tuple<Ts&...> out_; 22 std::tuple<Ts&...> out_;
21 }; 23 };
22 24
23 template <typename Meta, typename... Ins> 25 template <typename Meta, typename... Ins>
24 MessageT<Meta, base::Tuple<Ins...>, void>::MessageT(Routing routing, 26 MessageT<Meta, std::tuple<Ins...>, void>::MessageT(Routing routing,
25 const Ins&... ins) 27 const Ins&... ins)
26 : Message(routing.id, ID, PRIORITY_NORMAL) { 28 : Message(routing.id, ID, PRIORITY_NORMAL) {
27 WriteParam(this, base::MakeRefTuple(ins...)); 29 WriteParam(this, std::tie(ins...));
28 } 30 }
29 31
30 template <typename Meta, typename... Ins> 32 template <typename Meta, typename... Ins>
31 bool MessageT<Meta, base::Tuple<Ins...>, void>::Read(const Message* msg, 33 bool MessageT<Meta, std::tuple<Ins...>, void>::Read(const Message* msg,
32 Param* p) { 34 Param* p) {
33 base::PickleIterator iter(*msg); 35 base::PickleIterator iter(*msg);
34 return ReadParam(msg, &iter, p); 36 return ReadParam(msg, &iter, p);
35 } 37 }
36 38
37 template <typename Meta, typename... Ins> 39 template <typename Meta, typename... Ins>
38 void MessageT<Meta, base::Tuple<Ins...>, void>::Log(std::string* name, 40 void MessageT<Meta, std::tuple<Ins...>, void>::Log(std::string* name,
39 const Message* msg, 41 const Message* msg,
40 std::string* l) { 42 std::string* l) {
41 if (name) 43 if (name)
42 *name = Meta::kName; 44 *name = Meta::kName;
43 if (!msg || !l) 45 if (!msg || !l)
44 return; 46 return;
45 Param p; 47 Param p;
46 if (Read(msg, &p)) 48 if (Read(msg, &p))
47 LogParam(p, l); 49 LogParam(p, l);
48 } 50 }
49 51
50 template <typename Meta, typename... Ins, typename... Outs> 52 template <typename Meta, typename... Ins, typename... Outs>
51 MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>::MessageT( 53 MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>::MessageT(
52 Routing routing, 54 Routing routing,
53 const Ins&... ins, 55 const Ins&... ins,
54 Outs*... outs) 56 Outs*... outs)
55 : SyncMessage( 57 : SyncMessage(
56 routing.id, 58 routing.id,
57 ID, 59 ID,
58 PRIORITY_NORMAL, 60 PRIORITY_NORMAL,
59 new ParamDeserializer<Outs...>(base::MakeRefTuple(*outs...))) { 61 new ParamDeserializer<Outs...>(std::tie(*outs...))) {
60 WriteParam(this, base::MakeRefTuple(ins...)); 62 WriteParam(this, std::tie(ins...));
61 } 63 }
62 64
63 template <typename Meta, typename... Ins, typename... Outs> 65 template <typename Meta, typename... Ins, typename... Outs>
64 bool MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>::ReadSendParam( 66 bool MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>::ReadSendParam(
65 const Message* msg, 67 const Message* msg,
66 SendParam* p) { 68 SendParam* p) {
67 base::PickleIterator iter = SyncMessage::GetDataIterator(msg); 69 base::PickleIterator iter = SyncMessage::GetDataIterator(msg);
68 return ReadParam(msg, &iter, p); 70 return ReadParam(msg, &iter, p);
69 } 71 }
70 72
71 template <typename Meta, typename... Ins, typename... Outs> 73 template <typename Meta, typename... Ins, typename... Outs>
72 bool MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>::ReadReplyParam( 74 bool MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>::ReadReplyParam(
73 const Message* msg, 75 const Message* msg,
74 ReplyParam* p) { 76 ReplyParam* p) {
75 base::PickleIterator iter = SyncMessage::GetDataIterator(msg); 77 base::PickleIterator iter = SyncMessage::GetDataIterator(msg);
76 return ReadParam(msg, &iter, p); 78 return ReadParam(msg, &iter, p);
77 } 79 }
78 80
79 template <typename Meta, typename... Ins, typename... Outs> 81 template <typename Meta, typename... Ins, typename... Outs>
80 void MessageT<Meta, 82 void MessageT<Meta,
81 base::Tuple<Ins...>, 83 std::tuple<Ins...>,
82 base::Tuple<Outs...>>::WriteReplyParams(Message* reply, 84 std::tuple<Outs...>>::WriteReplyParams(Message* reply,
83 const Outs&... outs) { 85 const Outs&... outs) {
84 WriteParam(reply, base::MakeRefTuple(outs...)); 86 WriteParam(reply, std::tie(outs...));
85 } 87 }
86 88
87 template <typename Meta, typename... Ins, typename... Outs> 89 template <typename Meta, typename... Ins, typename... Outs>
88 void MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>::Log( 90 void MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>::Log(
89 std::string* name, 91 std::string* name,
90 const Message* msg, 92 const Message* msg,
91 std::string* l) { 93 std::string* l) {
92 if (name) 94 if (name)
93 *name = Meta::kName; 95 *name = Meta::kName;
94 if (!msg || !l) 96 if (!msg || !l)
95 return; 97 return;
96 if (msg->is_sync()) { 98 if (msg->is_sync()) {
97 SendParam p; 99 SendParam p;
98 if (ReadSendParam(msg, &p)) 100 if (ReadSendParam(msg, &p))
99 LogParam(p, l); 101 LogParam(p, l);
100 AddOutputParamsToLog(msg, l); 102 AddOutputParamsToLog(msg, l);
101 } else { 103 } else {
102 ReplyParam p; 104 ReplyParam p;
103 if (ReadReplyParam(msg, &p)) 105 if (ReadReplyParam(msg, &p))
104 LogParam(p, l); 106 LogParam(p, l);
105 } 107 }
106 } 108 }
107 109
108 } // namespace IPC 110 } // namespace IPC
109 111
110 #endif // IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_ 112 #endif // IPC_IPC_MESSAGE_TEMPLATES_IMPL_H_
OLDNEW
« no previous file with comments | « ipc/ipc_message_templates.h ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698