Use inline.

Author: evoskuil

include/bitcoin/node/protocols/protocol_bitcoind.hpp

@@ -34,7 +34,7 @@ class BCN_API protocol_bitcoind
 public:
     typedef std::shared_ptr<protocol_bitcoind> ptr;
 
-    protocol_bitcoind(const auto& session,
+    inline protocol_bitcoind(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_http(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_bitcoind
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_http::start();
     }

include/bitcoin/node/protocols/protocol_electrum.hpp

@@ -34,7 +34,7 @@ class BCN_API protocol_electrum
 public:
     typedef std::shared_ptr<protocol_electrum> ptr;
 
-    protocol_electrum(const auto& session,
+    inline protocol_electrum(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_tcp(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_electrum
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_tcp::start();
     }

include/bitcoin/node/protocols/protocol_explore.hpp

@@ -38,7 +38,7 @@ class BCN_API protocol_explore
     using interface = interface::explore;
     using dispatcher = network::rpc::dispatcher<interface>;
 
-    protocol_explore(const auto& session,
+    inline protocol_explore(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_html(session, channel, options),

include/bitcoin/node/protocols/protocol_html.hpp

@@ -30,20 +30,22 @@ namespace node {
 /// Abstract base for HTML protocols, thread safe.
 class BCN_API protocol_html
   : public node::protocol,
-    public network::protocol_http
+    public network::protocol_http,
+    protected network::tracker<protocol_html>
 {
 public:
     /// http channel, but html settings.
     using options_t = server::settings::html_server;
     using channel_t = node::channel_http;
 
 protected:
-    protocol_html(const auto& session,
+    inline protocol_html(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol_http(session, channel, options),
-        options_(options)
+        options_(options),
+        network::tracker<protocol_html>(session->log)
     {
     }
 

include/bitcoin/node/protocols/protocol_http.hpp

@@ -40,7 +40,7 @@ class BCN_API protocol_http
     using channel_t = node::channel_http;
 
 protected:
-    protocol_http(const auto& session,
+    inline protocol_http(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),

include/bitcoin/node/protocols/protocol_peer.hpp

@@ -44,7 +44,7 @@ class BCN_API protocol_peer
     /// -----------------------------------------------------------------------
     /// static_pointer_cast relies on create_channel().
 
-    protocol_peer(const auto& session,
+    inline protocol_peer(const auto& session,
         const network::channel::ptr& channel) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol_peer(session, channel),

include/bitcoin/node/protocols/protocol_tcp.hpp

@@ -40,7 +40,7 @@ class BCN_API protocol_tcp
     using channel_t = node::channel_tcp;
 
 protected:
-    protocol_tcp(const auto& session,
+    inline protocol_tcp(const auto& session,
         const network::channel::ptr& channel, const options_t&) NOEXCEPT
       : node::protocol(session, channel),
         network::protocol(session, channel),

include/bitcoin/node/protocols/protocol_web.hpp

@@ -34,7 +34,7 @@ class BCN_API protocol_web
 public:
     typedef std::shared_ptr<protocol_web> ptr;
 
-    protocol_web(const auto& session,
+    inline protocol_web(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol_html(session, channel, options),
@@ -43,7 +43,7 @@ class BCN_API protocol_web
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         node::protocol_html::start();
     }

include/bitcoin/node/protocols/protocol_ws.hpp

@@ -39,7 +39,7 @@ class BCN_API protocol_ws
     // Replace base class channel_t (network::channel_ws). 
     using channel_t = node::channel_ws;
 
-    protocol_ws(const auto& session,
+    inline protocol_ws(const auto& session,
         const network::channel::ptr& channel,
         const options_t& options) NOEXCEPT
       : node::protocol(session, channel),
@@ -49,7 +49,7 @@ class BCN_API protocol_ws
     }
 
     /// Public start is required.
-    void start() NOEXCEPT override
+    inline void start() NOEXCEPT override
     {
         network::protocol_ws::start();
     }

include/bitcoin/node/sessions/session_server.hpp

@@ -39,8 +39,8 @@ class full_node;
 /// and attachment can be overridden and/or augmented with other protocols.
 template <typename Protocol>
 class session_server
-  : public network::session_server,
-    public node::session,
+  : public node::session,
+    public network::session_server,
     protected network::tracker<session_server<Protocol>>
 {
 public:
@@ -53,10 +53,10 @@ class session_server
     /// Construct an instance (network should be started).
     inline session_server(full_node& node, uint64_t identifier,
         const options_t& options) NOEXCEPT
-      : network::session_server((network::net&)node, identifier, options),
-        node::session(node),
-        network::tracker<session_server<Protocol>>(node),
-        options_(options)
+      : node::session(node),
+        network::session_server((network::net&)node, identifier, options),
+        options_(options),
+        network::tracker<session_server<Protocol>>(node)
     {
     }