| Index: ipc/ipc_message_templates.h
|
| diff --git a/ipc/ipc_message_templates.h b/ipc/ipc_message_templates.h
|
| index 17dfc1b9ff221169167c2f3103089a219e14fa5e..95cf92e18c9c9c758f52e0eb3e56d8fdcd1b8205 100644
|
| --- a/ipc/ipc_message_templates.h
|
| +++ b/ipc/ipc_message_templates.h
|
| @@ -35,7 +35,7 @@ void DispatchToMethodImpl(ObjT* obj,
|
| const Tuple& tuple,
|
| base::IndexSequence<Ns...>) {
|
| // TODO(mdempsky): Apply UnwrapTraits like base::DispatchToMethod?
|
| - (obj->*method)(parameter, base::get<Ns>(tuple)...);
|
| + (obj->*method)(parameter, std::get<Ns>(tuple)...);
|
| }
|
|
|
| // The following function is for async IPCs which have a dispatcher with an
|
| @@ -45,7 +45,7 @@ typename std::enable_if<sizeof...(Args) == sizeof...(Ts)>::type
|
| DispatchToMethod(ObjT* obj,
|
| void (ObjT::*method)(P*, Args...),
|
| P* parameter,
|
| - const base::Tuple<Ts...>& tuple) {
|
| + const std::tuple<Ts...>& tuple) {
|
| DispatchToMethodImpl(obj, method, parameter, tuple,
|
| base::MakeIndexSequence<sizeof...(Ts)>());
|
| }
|
| @@ -84,9 +84,9 @@ class MessageT;
|
|
|
| // Asynchronous message partial specialization.
|
| template <typename Meta, typename... Ins>
|
| -class MessageT<Meta, base::Tuple<Ins...>, void> : public Message {
|
| +class MessageT<Meta, std::tuple<Ins...>, void> : public Message {
|
| public:
|
| - using Param = base::Tuple<Ins...>;
|
| + using Param = std::tuple<Ins...>;
|
| enum { ID = Meta::ID };
|
|
|
| // TODO(mdempsky): Remove. Uses of MyMessage::Schema::Param can be replaced
|
| @@ -127,11 +127,11 @@ class MessageT<Meta, base::Tuple<Ins...>, void> : public Message {
|
|
|
| // Synchronous message partial specialization.
|
| template <typename Meta, typename... Ins, typename... Outs>
|
| -class MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>
|
| +class MessageT<Meta, std::tuple<Ins...>, std::tuple<Outs...>>
|
| : public SyncMessage {
|
| public:
|
| - using SendParam = base::Tuple<Ins...>;
|
| - using ReplyParam = base::Tuple<Outs...>;
|
| + using SendParam = std::tuple<Ins...>;
|
| + using ReplyParam = std::tuple<Outs...>;
|
| enum { ID = Meta::ID };
|
|
|
| // TODO(mdempsky): Remove. Uses of MyMessage::Schema::{Send,Reply}Param can
|
| @@ -186,7 +186,7 @@ class MessageT<Meta, base::Tuple<Ins...>, base::Tuple<Outs...>>
|
| bool ok = ReadSendParam(msg, &send_params);
|
| Message* reply = SyncMessage::GenerateReply(msg);
|
| if (ok) {
|
| - base::Tuple<Message&> t = base::MakeRefTuple(*reply);
|
| + std::tuple<Message&> t = std::tie(*reply);
|
| ConnectMessageAndReply(msg, reply);
|
| base::DispatchToMethod(obj, func, send_params, &t);
|
| } else {
|
|
|