After pull conflict resolution.
This commit is contained in:
commit
9992a12b38
217 files changed
+15585
-296
No files matched your search
@@ -78,15 +78,16 @@ Collaboration diagram for core::Subscription:</div>
|
||||
<div class="dyncontent">
|
||||
<div class="center"><img src="classcore_1_1Subscription__coll__graph.png" border="0" usemap="#acore_1_1Subscription_coll__map" alt="Collaboration graph"/></div>
|
||||
<map name="acore_1_1Subscription_coll__map" id="acore_1_1Subscription_coll__map">
|
||||
<area shape="rect" title=" " alt="" coords="1543,171,1681,197"/>
|
||||
<area shape="rect" href="classcore_1_1TCPSession.html" title=" " alt="" coords="1316,171,1449,197"/>
|
||||
<area shape="rect" title=" " alt="" coords="1607,145,1745,172"/>
|
||||
<area shape="rect" href="classcore_1_1SubscriptionHandler.html" title=" " alt="" coords="1316,120,1505,147"/>
|
||||
<area shape="rect" href="classcore_1_1TCPSession.html" title=" " alt="" coords="1344,171,1477,197"/>
|
||||
<area shape="rect" href="classcore_1_1TCPSocket.html" title=" " alt="" coords="851,281,977,308"/>
|
||||
<area shape="rect" href="classcore_1_1TCPServer.html" title=" " alt="" coords="1097,171,1223,197"/>
|
||||
<area shape="rect" href="classcore_1_1Socket.html" title=" " alt="" coords="487,323,588,349"/>
|
||||
<area shape="rect" href="classcore_1_1EPoll.html" title=" " alt="" coords="185,323,275,349"/>
|
||||
<area shape="rect" href="classcore_1_1Command.html" title=" " alt="" coords="5,171,131,197"/>
|
||||
<area shape="rect" href="classcore_1_1CommandList.html" title=" " alt="" coords="304,221,452,248"/>
|
||||
<area shape="rect" href="classcore_1_1SubscriptionManager.html" title=" " alt="" coords="623,73,817,100"/>
|
||||
<area shape="rect" href="classcore_1_1SubscriptionManager.html" title=" " alt="" coords="623,89,817,116"/>
|
||||
<area shape="rect" href="classcore_1_1IPAddress.html" title=" " alt="" coords="476,272,599,299"/>
|
||||
<area shape="rect" href="classcore_1_1Object.html" title=" " alt="" coords="180,272,280,299"/>
|
||||
<area shape="rect" href="classcore_1_1IPAddressList.html" title=" " alt="" coords="841,120,987,147"/>
|
||||
@@ -98,9 +99,12 @@ Public Member Functions</h2></td></tr>
|
||||
<tr class="memitem:a348a4ec8232ada37f5be2b6f756f01f3"><td class="memItemLeft" align="right" valign="top"><a id="a348a4ec8232ada37f5be2b6f756f01f3"></a>
|
||||
 </td><td class="memItemRight" valign="bottom"><b>Subscription</b> (std::string id, std::string mode="*AUTHOR")</td></tr>
|
||||
<tr class="separator:a348a4ec8232ada37f5be2b6f756f01f3"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:a75e36b110e87138d4f5d8f0cbbaca4c1"><td class="memItemLeft" align="right" valign="top"><a id="a75e36b110e87138d4f5d8f0cbbaca4c1"></a>
|
||||
 </td><td class="memItemRight" valign="bottom"><b>Subscription</b> (std::string id, <a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> &session, std::string mode="*AUTHOR")</td></tr>
|
||||
<tr class="separator:a75e36b110e87138d4f5d8f0cbbaca4c1"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:a1b993509cd113d8ed564d710955c94a0"><td class="memItemLeft" align="right" valign="top"><a id="a1b993509cd113d8ed564d710955c94a0"></a>
|
||||
 </td><td class="memItemRight" valign="bottom"><b>Subscription</b> (std::string id, <a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> &session, std::string mode)</td></tr>
|
||||
<tr class="separator:a1b993509cd113d8ed564d710955c94a0"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:ae21b7a4a1084da8959cd8022fa138c0e"><td class="memItemLeft" align="right" valign="top"><a id="ae21b7a4a1084da8959cd8022fa138c0e"></a>
|
||||
 </td><td class="memItemRight" valign="bottom"><b>Subscription</b> (std::string id, <a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> &session, std::string mode, <a class="el" href="classcore_1_1SubscriptionHandler.html">SubscriptionHandler</a> *handler)</td></tr>
|
||||
<tr class="separator:ae21b7a4a1084da8959cd8022fa138c0e"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:a57c23d7c49328eecf8358f84b485f7cb"><td class="memItemLeft" align="right" valign="top"><a id="a57c23d7c49328eecf8358f84b485f7cb"></a>
|
||||
int </td><td class="memItemRight" valign="bottom"><b>subscribe</b> (<a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> &session)</td></tr>
|
||||
<tr class="separator:a57c23d7c49328eecf8358f84b485f7cb"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
@@ -131,6 +135,9 @@ std::string </td><td class="memItemRight" valign="bottom"><b>mode</b></td><
|
||||
<tr class="memitem:a5526427600aa4a5b180f76f201e85f58"><td class="memItemLeft" align="right" valign="top"><a id="a5526427600aa4a5b180f76f201e85f58"></a>
|
||||
<a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> * </td><td class="memItemRight" valign="bottom"><b>owner</b></td></tr>
|
||||
<tr class="separator:a5526427600aa4a5b180f76f201e85f58"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:ab4f020e6bdee846121f508fcdb6f7aeb"><td class="memItemLeft" align="right" valign="top"><a id="ab4f020e6bdee846121f508fcdb6f7aeb"></a>
|
||||
<a class="el" href="classcore_1_1SubscriptionHandler.html">SubscriptionHandler</a> * </td><td class="memItemRight" valign="bottom"><b>handler</b></td></tr>
|
||||
<tr class="separator:ab4f020e6bdee846121f508fcdb6f7aeb"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
<tr class="memitem:ad1a5c1a3e5a6e253eb34795f43d4f9be"><td class="memItemLeft" align="right" valign="top"><a id="ad1a5c1a3e5a6e253eb34795f43d4f9be"></a>
|
||||
std::vector< <a class="el" href="classcore_1_1TCPSession.html">TCPSession</a> * > </td><td class="memItemRight" valign="bottom"><b>subscribers</b></td></tr>
|
||||
<tr class="separator:ad1a5c1a3e5a6e253eb34795f43d4f9be"><td class="memSeparator" colspan="2"> </td></tr>
|
||||
|
||||
Reference in new issue
Block a user