Update to latest DelegateMQ library source

Author: endurodave

DelegateMQ/DelegateMQ.h

@@ -94,6 +94,9 @@
 #elif defined(DMQ_TRANSPORT_WIN32_UDP)
     #include "predef/dispatcher/Dispatcher.h"
     #include "predef/transport/win32-udp/Win32UdpTransport.h"
+#elif defined(DMQ_TRANSPORT_MQTT)
+    #include "predef/dispatcher/Dispatcher.h"
+    #include "predef/transport/mqtt/MqttTransport.h"
 #elif defined(DMQ_TRANSPORT_NONE)
     // Create a custom application-specific transport
 #else

DelegateMQ/External.cmake

@@ -20,6 +20,17 @@ if(DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_ZEROMQ")
         message(FATAL_ERROR "ZeroMQ not found!")
     endif()
 endif()
+
+# MQTT C library
+# https://github.com/eclipse-paho/paho.mqtt.c
+if(DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_MQTT")
+    set_and_check(MQTT_INCLUDE_DIR "${DMQ_ROOT_DIR}/../../../mqtt/paho-c/include")
+    set_and_check(MQTT_LIBRARY_DIR "${DMQ_ROOT_DIR}/../../../mqtt/paho-c/lib")
+    set_and_check(MQTT_BINARY_DIR "${DMQ_ROOT_DIR}/../../../mqtt/paho-c/bin")
+    #set_and_check(MQTT_INCLUDE_DIR "/usr/local/include")
+    #set_and_check(MQTT_LIBRARY_DIR "/usr/local/lib")
+    #set_and_check(MQTT_BINARY_DIR "/usr/local/bin/MQTTVersion")
+endif()
 
 # MessagePack C++ library (msgpack.hpp)
 # https://github.com/msgpack/msgpack-c/tree/cpp_master

DelegateMQ/Predef.cmake

@@ -26,16 +26,22 @@ elseif (DMQ_SERIALIZE STREQUAL "DMQ_SERIALIZE_RAPIDJSON")
 	add_compile_definitions(DMQ_SERIALIZE_RAPIDJSON)
 elseif (DMQ_SERIALIZE STREQUAL "DMQ_SERIALIZE_MSGPACK")
 	add_compile_definitions(DMQ_SERIALIZE_MSGPACK)
+else()
+	message(FATAL_ERROR "Must set DMQ_SERIALIZE option.")
 endif()
 
 if (DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_NONE")
 	add_compile_definitions(DMQ_TRANSPORT_NONE)
 elseif (DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_ZEROMQ")
 	add_compile_definitions(DMQ_TRANSPORT_ZEROMQ)
+elseif (DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_MQTT")
+	add_compile_definitions(DMQ_TRANSPORT_MQTT)
 elseif (DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_WIN32_PIPE")
 	add_compile_definitions(DMQ_TRANSPORT_WIN32_PIPE)
 elseif (DMQ_TRANSPORT STREQUAL "DMQ_TRANSPORT_WIN32_UDP")
 	add_compile_definitions(DMQ_TRANSPORT_WIN32_UDP)
+else()
+	message(FATAL_ERROR "Must set DMQ_TRANSPORT option.")
 endif()
 
 if (DMQ_ALLOCATOR STREQUAL "ON")

DelegateMQ/delegate/Delegate.h

@@ -140,8 +140,9 @@ class DelegateFree<RetType(Args...)> : public Delegate<RetType(Args...)> {
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override { 
         return new(std::nothrow) ClassType(*this); 
     }
@@ -349,8 +350,9 @@ class DelegateMember<TClass, RetType(Args...)> : public Delegate<RetType(Args...
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }
@@ -547,8 +549,9 @@ class DelegateFunction<RetType(Args...)> : public Delegate<RetType(Args...)> {
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override { 
         return new(std::nothrow) ClassType(*this); 
     }

DelegateMQ/delegate/DelegateAsync.h

@@ -182,9 +182,9 @@ class DelegateFreeAsync<RetType(Args...)> : public DelegateFree<RetType(Args...)
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }
@@ -482,9 +482,9 @@ class DelegateMemberAsync<TClass, RetType(Args...)> : public DelegateMember<TCla
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }
@@ -723,9 +723,9 @@ class DelegateFunctionAsync<RetType(Args...)> : public DelegateFunction<RetType(
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }

DelegateMQ/delegate/DelegateAsyncWait.h

@@ -208,9 +208,9 @@ class DelegateFreeAsyncWait<RetType(Args...)> : public DelegateFree<RetType(Args
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }
@@ -611,9 +611,9 @@ class DelegateMemberAsyncWait<TClass, RetType(Args...)> : public DelegateMember<
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }
@@ -933,9 +933,9 @@ class DelegateFunctionAsyncWait<RetType(Args...)> : public DelegateFunction<RetT
     /// @brief Creates a copy of the current object.
     /// @details Clones the current instance of the class by creating a new object
     /// and copying the state of the current object to it. 
-    /// @return A pointer to a new `ClassType` instance.
-    /// @post The caller is responsible for deleting the clone object.
-    /// @throws std::bad_alloc If dynamic memory allocation fails and DMQ_ASSERTS not defined.
+    /// @return A pointer to a new `ClassType` instance or nullptr if allocation fails.
+    /// @post The caller is responsible for deleting the clone object and checking for 
+    /// nullptr.
     virtual ClassType* Clone() const override {
         return new(std::nothrow) ClassType(*this);
     }

DelegateMQ/delegate/DelegateOpt.h

@@ -33,6 +33,7 @@
     using xlist = std::list<T, Alloc>;
 
     typedef std::basic_ostringstream<char, std::char_traits<char>> xostringstream;
+    typedef std::basic_stringstream<char, std::char_traits<char>> xstringstream;
 
     // Not using xallocator; define as nothing
     #define XALLOCATOR