Merge pull request #1 from DennisPurdack/libmodbuspp-ascii-support

(re-)added virtual destructors to prevent memory leaks

Author: fboor

include/modbuspp/asciilayer.h

@@ -46,6 +46,11 @@ namespace Modbus {
        */
       AsciiLayer (const std::string & port, const std::string & settings);
 
+      /**
+      * @brief Destructor
+      */
+      virtual ~AsciiLayer() = default;
+
       /**
        * @brief Name of the serial port
        *

src/asciilayer_p.h

@@ -25,6 +25,7 @@ namespace Modbus {
 
     public:
       Private (const std::string & port, const std::string & settings);
+      virtual ~Private() = default;
 
       int oneByteTime;
   };

src/device_p.h

@@ -28,6 +28,7 @@ namespace Modbus {
 
     public:
       Private (Device * q);
+      virtual ~Private() = default;
       virtual void setBackend (Net net, const std::string & connection,
                                const std::string & settings);
       virtual void setConfig (const nlohmann::json & config);

src/master_p.h

@@ -26,6 +26,7 @@ namespace Modbus {
 
     public:
       Private (Master * q);
+      virtual ~Private() = default;
 
       void setBackend (Net net, const std::string & connection,
                                const std::string & settings) override;
@@ -39,4 +40,3 @@ namespace Modbus {
 }
 
 /* ========================================================================== */
-

src/netlayer_p.h

@@ -24,6 +24,7 @@ namespace Modbus {
     public:
       Private (Net n, const std::string & c, const std::string & s, uint16_t m) :
         net (n), connection (c), settings (s), maxAduLength (m)  {}
+      virtual ~Private() = default;
 
       Net net;
       std::string connection;

src/router_p.h

@@ -25,6 +25,7 @@ namespace Modbus {
 
     public:
       Private (Router * q);
+      virtual ~Private() = default;
       virtual void setConfig (const nlohmann::json & config);
 
       virtual bool open();

src/rtulayer_p.h

@@ -25,6 +25,7 @@ namespace Modbus {
 
     public:
       Private (const std::string & port, const std::string & settings);
+      virtual ~Private() = default;
 
       int oneByteTime;
   };

src/server.cpp

@@ -496,7 +496,7 @@ namespace Modbus {
 
   // ---------------------------------------------------------------------------
   // static
-  void * Server::Private::loop (std::future<void> run, Private * d) {
+  void Server::Private::loop (std::future<void> run, Private * d) {
     int rc;
 
     while (run.wait_for (std::chrono::milliseconds (100)) == std::future_status::timeout) {

src/server_p.h

@@ -30,6 +30,7 @@ namespace Modbus {
       static const int MAX_CONNECTIONS = 16;
     public:
       Private (Server * q);
+      virtual ~Private() = default;
       virtual void setBackend (Net net, const std::string & connection,
                                const std::string & settings);
       virtual void setConfig (const nlohmann::json & config);
@@ -41,7 +42,7 @@ namespace Modbus {
 
       BufferedSlave * addSlave (int slaveAddr, Device * master);
 
-      static void * loop (std::future<void> run, Private * d);
+      static void loop (std::future<void> run, Private * d);
       static int receive (Private * d);
 
       int listen_sock = -1;

src/slave_p.h

@@ -28,6 +28,7 @@ namespace Modbus {
     public:
       Private (Slave * q);
       Private (Slave * q, int s, Device * d);
+      virtual ~Private() = default;
 
       inline modbus_t * ctx() {
         return dev->backend().context();