aboutsummaryrefslogtreecommitdiff
path: root/include/salticidae/network.h
diff options
context:
space:
mode:
authorDeterminant <tederminant@gmail.com>2018-08-03 13:52:09 -0400
committerDeterminant <tederminant@gmail.com>2018-08-03 13:52:09 -0400
commit3f1c768e2d5b5e51dec08499d6a877220f33d7a6 (patch)
tree208dfc45136706e395d16a37bf2bbf77dd548d98 /include/salticidae/network.h
parent37dc1f5bfe6630c224d1b131562166ab5bdd9976 (diff)
rename handler_bind and move to type.h
Diffstat (limited to 'include/salticidae/network.h')
-rw-r--r--include/salticidae/network.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/include/salticidae/network.h b/include/salticidae/network.h
index c7b7f66..63c83be 100644
--- a/include/salticidae/network.h
+++ b/include/salticidae/network.h
@@ -32,11 +32,6 @@
namespace salticidae {
-template<typename ClassType, typename ReturnType, typename... Args, typename... FArgs>
-inline auto handler_bind(ReturnType(ClassType::* f)(Args...), FArgs&&... fargs) {
- return std::function<ReturnType(Args...)>(std::bind(f, std::forward<FArgs>(fargs)...));
-}
-
/** Network of nodes who can send async messages. */
template<typename OpcodeType>
class MsgNetwork: public ConnPool {
@@ -527,8 +522,8 @@ template<typename O, O _, O __>
void PeerNetwork<O, _, __>::listen(NetAddr listen_addr) {
MsgNet::listen(listen_addr);
listen_port = listen_addr.port;
- this->reg_handler(handler_bind(&PeerNetwork::msg_ping, this, _1, _2));
- this->reg_handler(handler_bind(&PeerNetwork::msg_pong, this, _1, _2));
+ this->reg_handler(generic_bind(&PeerNetwork::msg_ping, this, _1, _2));
+ this->reg_handler(generic_bind(&PeerNetwork::msg_pong, this, _1, _2));
}
template<typename O, O _, O __>