diff options
| author | tzik <tzik@chromium.org> | 2015-11-19 15:31:21 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 23:32:15 +0000 |
| commit | 1cec15c4d32cc538687e7e908f277e04005674ed (patch) | |
| tree | 073d9bec8ccfc0b40c144174ef4f99580c85d788 /ipc | |
| parent | 939c137395cff617b96d0b59def364f5f4580032 (diff) | |
| download | chromium_src-1cec15c4d32cc538687e7e908f277e04005674ed.zip chromium_src-1cec15c4d32cc538687e7e908f277e04005674ed.tar.gz chromium_src-1cec15c4d32cc538687e7e908f277e04005674ed.tar.bz2 | |
Call base::DispatchToMethod by the fully qualified name
DispatchToMethod in IPC is looked up in ADL rule for base::Tuple.
That is going to unavailable when we start using std::tuple.
This CL removes the ADL application to avoid the lookup error in advance.
BUG=554987
Review URL: https://codereview.chromium.org/1461813002
Cr-Commit-Position: refs/heads/master@{#360687}
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_message_macros.h | 2 | ||||
| -rw-r--r-- | ipc/ipc_message_utils.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h index daeb617..f9fc28e 100644 --- a/ipc/ipc_message_macros.h +++ b/ipc/ipc_message_macros.h @@ -444,7 +444,7 @@ Method func) { \ Schema::Param p; \ if (Read(msg, &p)) { \ - DispatchToMethod(obj, func, p); \ + base::DispatchToMethod(obj, func, p); \ return true; \ } \ return false; \ diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h index 817d752..97b95e9 100644 --- a/ipc/ipc_message_utils.h +++ b/ipc/ipc_message_utils.h @@ -1023,7 +1023,7 @@ class SyncMessageSchema { Message* reply = SyncMessage::GenerateReply(msg); if (ok) { typename base::TupleTypes<ReplyParam>::ValueTuple reply_params; - DispatchToMethod(obj, func, send_params, &reply_params); + base::DispatchToMethod(obj, func, send_params, &reply_params); WriteParam(reply, reply_params); LogReplyParamsToMessage(reply_params, msg); } else { @@ -1043,7 +1043,7 @@ class SyncMessageSchema { if (ok) { base::Tuple<Message&> t = base::MakeRefTuple(*reply); ConnectMessageAndReply(msg, reply); - DispatchToMethod(obj, func, send_params, &t); + base::DispatchToMethod(obj, func, send_params, &t); } else { NOTREACHED() << "Error deserializing message " << msg->type(); reply->set_reply_error(); |