<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161745] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161745">161745</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 22:33:45 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert HandleMessage.h to use variadic templates
https://bugs.webkit.org/show_bug.cgi?id=126469
Reviewed by Anders Carlsson.
* Platform/IPC/HandleMessage.h:
(IPC::callMemberFunctionImpl):
(IPC::callMemberFunction):
Replace massive copy and pasted code with variadic magic.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCHandleMessageh">trunk/Source/WebKit2/Platform/IPC/HandleMessage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161744 => 161745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-11 06:33:01 UTC (rev 161744)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-11 06:33:45 UTC (rev 161745)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-10 Sam Weinig <sam@webkit.org>
+
+ Convert HandleMessage.h to use variadic templates
+ https://bugs.webkit.org/show_bug.cgi?id=126469
+
+ Reviewed by Anders Carlsson.
+
+ * Platform/IPC/HandleMessage.h:
+ (IPC::callMemberFunctionImpl):
+ (IPC::callMemberFunction):
+ Replace massive copy and pasted code with variadic magic.
+
</ins><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCHandleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (161744 => 161745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-01-11 06:33:01 UTC (rev 161744)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2014-01-11 06:33:45 UTC (rev 161745)
</span><span class="lines">@@ -4,379 +4,110 @@
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "MessageDecoder.h"
</span><span class="cx"> #include "MessageEncoder.h"
</span><ins>+#include <wtf/StdLibExtras.h>
</ins><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> // Dispatch functions with no reply arguments.
</span><del>-template<typename C, typename MF>
-void callMemberFunction(std::tuple<>&&, C* object, MF function)
-{
- (object->*function)();
-}
</del><span class="cx">
</span><del>-template<typename C, typename MF, typename P1>
-void callMemberFunction(std::tuple<P1>&& args, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args));
</del><ins>+ (object->*function)(std::get<ArgsIndex>(args)...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2>
-void callMemberFunction(std::tuple<P1, P2>&& args, C* object, MF function)
</del><ins>+template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunction(ArgsTuple&& args, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), std::get<1>(args));
</del><ins>+ callMemberFunctionImpl(object, function, std::forward<ArgsTuple>(args), ArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3>
-void callMemberFunction(std::tuple<P1, P2, P3>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4>
-void callMemberFunction(std::tuple<P1, P2, P3, P4>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7, P8>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<7>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9, typename P10>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7, P8, P9, P10>&& args, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<7>(args), std::get<8>(args), std::get<9>(args));
-}
-
</del><span class="cx"> // Dispatch functions with reply arguments.
</span><span class="cx">
</span><del>-template<typename C, typename MF>
-void callMemberFunction(std::tuple<>&&, std::tuple<>&, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex, typename ReplyArgsTuple, size_t... ReplyArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, ArgsTuple&& args, ReplyArgsTuple& replyArgs, std::index_sequence<ArgsIndex...>, std::index_sequence<ReplyArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)();
</del><ins>+ (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., std::get<ReplyArgsIndex>(replyArgs)...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename R1>
-void callMemberFunction(std::tuple<>&&, std::tuple<R1>& replyArgs, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>, typename ReplyArgsTuple, typename ReplyArgsIndicies = std::make_index_sequence<std::tuple_size<ReplyArgsTuple>::value>>
+void callMemberFunction(ArgsTuple&& args, ReplyArgsTuple& replyArgs, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(replyArgs));
</del><ins>+ callMemberFunctionImpl(object, function, std::forward<ArgsTuple>(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename R1, typename R2>
-void callMemberFunction(std::tuple<>&&, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6>
-void callMemberFunction(std::tuple<>&&, std::tuple<R1, R2, R3, R4, R5, R6>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs), std::get<3>(replyArgs), std::get<4>(replyArgs), std::get<5>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1>
-void callMemberFunction(std::tuple<P1>&& args, std::tuple<>&, C* object, MF function)
-{
- (object->*function)(std::get<0>(args));
-}
-
-template<typename C, typename MF, typename P1, typename R1>
-void callMemberFunction(std::tuple<P1>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1>&& args, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2>
-void callMemberFunction(std::tuple<P1, P2>&& args, std::tuple<>&, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args));
-}
-
-template<typename C, typename MF, typename P1, typename R1, typename R2, typename R3, typename R4>
-void callMemberFunction(std::tuple<P1>&& args, Arguments4<R1, R2, R3, R4>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs), std::get<3>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename R1>
-void callMemberFunction(std::tuple<P1, P2>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename R1>
-void callMemberFunction(std::tuple<P1, P2, P3>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2, P3>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename R1>
-void callMemberFunction(std::tuple<P1, P2, P3, P4>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename R1>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename R1>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename R1>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7, P8>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<7>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2, P3, P4>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4>&& args, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5>&& args, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, std::tuple<R1, R2>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<0>(replyArgs), std::get<1>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename R1, typename R2, typename R3, typename R4>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, std::tuple<R1, R2, R3, R4>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs), std::get<3>(replyArgs));
-}
-
</del><span class="cx"> // Dispatch functions with delayed reply arguments.
</span><del>-template<typename C, typename MF, typename R>
-void callMemberFunction(std::tuple<>&&, PassRefPtr<R> delayedReply, C* object, MF function)
-{
- (object->*function)(delayedReply);
-}
</del><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename R>
-void callMemberFunction(std::tuple<P1>&& args, PassRefPtr<R> delayedReply, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename R, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, PassRefPtr<R> delayedReply, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), delayedReply);
</del><ins>+ (object->*function)(std::get<ArgsIndex>(args)..., delayedReply);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename R>
-void callMemberFunction(std::tuple<P1, P2>&& args, PassRefPtr<R> delayedReply, C* object, MF function)
</del><ins>+template<typename C, typename MF, typename R, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunction(ArgsTuple&& args, PassRefPtr<R> delayedReply, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), std::get<1>(args), delayedReply);
</del><ins>+ callMemberFunctionImpl(object, function, delayedReply, std::forward<ArgsTuple>(args), ArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename R>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7, P8>&& args, PassRefPtr<R> delayedReply, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<7>(args), delayedReply);
-}
</del><ins>+// Dispatch functions with connection parameter with no reply arguments.
</ins><span class="cx">
</span><del>-// Dispatch functions with connection parameter.
-template<typename C, typename MF>
-void callMemberFunction(Connection* connection, std::tuple<>&&, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, Connection* connection, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(connection);
</del><ins>+ (object->*function)(connection, std::get<ArgsIndex>(args)...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1>
-void callMemberFunction(Connection* connection, std::tuple<P1>&& args, C* object, MF function)
</del><ins>+template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunction(Connection* connection, ArgsTuple&& args, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(connection, std::get<0>(args));
</del><ins>+ callMemberFunctionImpl(object, function, connection, std::forward<ArgsTuple>(args), ArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2>&& args, C* object, MF function)
-{
- (object->*function)(connection, std::get<0>(args), std::get<1>(args));
-}
</del><ins>+// Dispatch functions with connection parameter with reply arguments.
</ins><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2, P3>&& args, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex, typename ReplyArgsTuple, size_t... ReplyArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, Connection* connection, ArgsTuple&& args, ReplyArgsTuple& replyArgs, std::index_sequence<ArgsIndex...>, std::index_sequence<ReplyArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(connection, std::get<0>(args), std::get<1>(args), std::get<2>(args));
</del><ins>+ (object->*function)(connection, std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., std::get<ReplyArgsIndex>(replyArgs)...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2, P3, P4>&& args, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>, typename ReplyArgsTuple, typename ReplyArgsIndicies = std::make_index_sequence<std::tuple_size<ReplyArgsTuple>::value>>
+void callMemberFunction(Connection* connection, ArgsTuple&& args, ReplyArgsTuple& replyArgs, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(connection, std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args));
</del><ins>+ callMemberFunctionImpl(object, function, connection, std::forward<ArgsTuple>(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2, P3, P4, P5>&& args, C* object, MF function)
-{
- (object->*function)(connection, std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2, P3, P4, P5, P6>&& args, C* object, MF function)
-{
- (object->*function)(connection, std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename R1>
-void callMemberFunction(Connection* connection, std::tuple<P1, P2>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(connection, std::get<0>(args), std::get<1>(args), std::get<0>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename R1>
-void callMemberFunction(Connection* connection, std::tuple<P1>&& args, std::tuple<R1>& replyArgs, C* object, MF function)
-{
- (object->*function)(connection, std::get<0>(args), std::get<0>(replyArgs));
-}
-
</del><span class="cx"> // Variadic dispatch functions.
</span><span class="cx">
</span><del>-template<typename C, typename MF>
-void callMemberFunction(std::tuple<>&&, MessageDecoder& decoder, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, MessageDecoder& decoder, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(decoder);
</del><ins>+ (object->*function)(std::get<ArgsIndex>(args)..., decoder);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1>
-void callMemberFunction(std::tuple<P1>&& args, MessageDecoder& decoder, C* object, MF function)
</del><ins>+template<typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunction(ArgsTuple&& args, MessageDecoder& decoder, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), decoder);
</del><ins>+ callMemberFunctionImpl(object, function, decoder, std::forward<ArgsTuple>(args), ArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2>
-void callMemberFunction(std::tuple<P1, P2>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), decoder);
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3>
-void callMemberFunction(std::tuple<P1, P2, P3>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), decoder);
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4>
-void callMemberFunction(std::tuple<P1, P2, P3, P4>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), decoder);
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), decoder);
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), decoder);
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7>&& args, MessageDecoder& decoder, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), decoder);
-}
-
</del><span class="cx"> // Variadic dispatch functions with non-variadic reply arguments.
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5>&& args, MessageDecoder& decoder, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex, typename ReplyArgsTuple, size_t... ReplyArgsIndex>
+void callMemberFunctionImpl(C* object, MF function, MessageDecoder& decoder, ArgsTuple&& args, ReplyArgsTuple& replyArgs, std::index_sequence<ArgsIndex...>, std::index_sequence<ReplyArgsIndex...>)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), decoder, std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
</del><ins>+ (object->*function)(std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., decoder, std::get<ReplyArgsIndex>(replyArgs)...);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename R1, typename R2>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6>&& args, MessageDecoder& decoder, std::tuple<R1, R2>& replyArgs, C* object, MF function)
</del><ins>+template <typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>, typename ReplyArgsTuple, typename ReplyArgsIndicies = std::make_index_sequence<std::tuple_size<ReplyArgsTuple>::value>>
+void callMemberFunction(ArgsTuple&& args, MessageDecoder& decoder, ReplyArgsTuple& replyArgs, C* object, MF function)
</ins><span class="cx"> {
</span><del>- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), decoder, std::get<0>(replyArgs), std::get<1>(replyArgs));
</del><ins>+ callMemberFunctionImpl(object, function, decoder, std::forward<ArgsTuple>(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7>&& args, MessageDecoder& decoder, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), decoder, std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
-template<typename C, typename MF, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename R1, typename R2, typename R3>
-void callMemberFunction(std::tuple<P1, P2, P3, P4, P5, P6, P7, P8>&& args, MessageDecoder& decoder, std::tuple<R1, R2, R3>& replyArgs, C* object, MF function)
-{
- (object->*function)(std::get<0>(args), std::get<1>(args), std::get<2>(args), std::get<3>(args), std::get<4>(args), std::get<5>(args), std::get<6>(args), std::get<7>(args), decoder, std::get<0>(replyArgs), std::get<1>(replyArgs), std::get<2>(replyArgs));
-}
-
</del><span class="cx"> // Main dispatch functions
</span><ins>+
</ins><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessage(MessageDecoder& decoder, C* object, MF function)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>