Merge pull request #444 from jonesmz/virtual-functions

Use virtual functions for notifications from mqtt_cpp::endpoint to other code, instead of multiple std::functions

Author: redboltz

include/mqtt/async_client.hpp

@@ -0,0 +1,22 @@
+// Copyright Takatoshi Kondo 2018
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#if !defined(MQTT_ATTRIBUTES_HPP)
+#define MQTT_ATTRIBUTES_HPP
+
+#include <mqtt/namespace.hpp>
+
+#ifdef _MSC_VER
+
+#define MQTT_ALWAYS_INLINE
+
+#else // GCC or Clang
+
+#define MQTT_ALWAYS_INLINE [[gnu::always_inline]]
+
+#endif // _MSC_VER
+
+#endif // MQTT_ATTRIBUTES_HPP

include/mqtt/attributes.hpp

@@ -19,32 +19,32 @@
 namespace MQTT_NS {
 
 struct protocol_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "protocol error";
     }
 };
 
 struct remaining_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "remaining length error";
     }
 };
 
 struct variable_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "variable length error";
     }
 };
 
 struct utf8string_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "utf8string length error";
     }
 };
 
 struct utf8string_contents_error : std::exception {
     utf8string_contents_error(utf8string::validation r):r(r) {}
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         if (r == utf8string::validation::ill_formed) {
             return "utf8string ill_formed";
         }
@@ -57,13 +57,13 @@ struct utf8string_contents_error : std::exception {
 };
 
 struct will_message_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "will message length error";
     }
 };
 
 struct password_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "password length error";
     }
 };
@@ -74,7 +74,7 @@ struct bytes_transferred_error : std::exception {
         ss << "bytes transferred error. expected: " << expected << " actual: " << actual;
         msg = ss.str();
     }
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return msg.data();
     }
     std::string msg;
@@ -95,19 +95,19 @@ struct write_bytes_transferred_error : bytes_transferred_error {
 };
 
 struct packet_id_exhausted_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "packet_id exhausted error";
     }
 };
 
 struct property_parse_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "property parse error";
     }
 };
 
 struct property_length_error : std::exception {
-    virtual char const* what() const noexcept {
+    char const* what() const noexcept override final {
         return "property length error";
     }
 };

include/mqtt/callable_overlay.hpp

@@ -27,6 +27,7 @@
 #include <mqtt/endpoint.hpp>
 #include <mqtt/null_strand.hpp>
 #include <mqtt/move.hpp>
+#include <mqtt/callable_overlay.hpp>
 
 namespace MQTT_NS {
 
@@ -41,7 +42,7 @@ template <
 class server {
 public:
     using socket_t = tcp_endpoint<as::ip::tcp::socket, Strand>;
-    using endpoint_t = endpoint<Mutex, LockGuard, PacketIdBytes>;
+    using endpoint_t = callable_overlay<endpoint<Mutex, LockGuard, PacketIdBytes>>;
 
     /**
      * @brief Accept handler
@@ -183,7 +184,7 @@ template <
 class server_tls {
 public:
     using socket_t = tcp_endpoint<as::ssl::stream<as::ip::tcp::socket>, Strand>;
-    using endpoint_t = endpoint<Mutex, LockGuard, PacketIdBytes>;
+    using endpoint_t = callable_overlay<endpoint<Mutex, LockGuard, PacketIdBytes>>;
 
     /**
      * @brief Accept handler
@@ -386,7 +387,7 @@ template <
 class server_ws {
 public:
     using socket_t = ws_endpoint<as::ip::tcp::socket, Strand>;
-    using endpoint_t = endpoint<Mutex, LockGuard, PacketIdBytes>;
+    using endpoint_t = callable_overlay<endpoint<Mutex, LockGuard, PacketIdBytes>>;
 
     /**
      * @brief Accept handler
@@ -596,7 +597,7 @@ template <
 class server_tls_ws {
 public:
     using socket_t = ws_endpoint<as::ssl::stream<as::ip::tcp::socket>, Strand>;
-    using endpoint_t = endpoint<Mutex, LockGuard, PacketIdBytes>;
+    using endpoint_t = callable_overlay<endpoint<Mutex, LockGuard, PacketIdBytes>>;
 
     /**
      * @brief Accept handler