[dss-commits] r8849 - dss/trunk/core

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-10-15 16:12:08 +0200 (Thu, 15 Oct 2009)
New Revision: 8849

Modified:
   dss/trunk/core/ds485client.cpp
   dss/trunk/core/ds485client.h
Log:
Fixed instatiation of DS485Client

Not sure how that could have ever worked.

Relates to #54

Modified: dss/trunk/core/ds485client.cpp
===================================================================
--- dss/trunk/core/ds485client.cpp	2009-10-15 10:09:37 UTC (rev 8848)
+++ dss/trunk/core/ds485client.cpp	2009-10-15 14:12:08 UTC (rev 8849)
@@ -63,6 +63,10 @@
   : m_pImpl(new DS485ClientImpl)
   { } // ctor
 
+  DS485Client::~DS485Client() {
+    delete m_pImpl;
+  } // dtor
+
   void DS485Client::sendFrameDiscardResult(DS485CommandFrame& _frame) {
     DSS::getInstance()->getDS485Interface().sendFrame(_frame);
   } // sendFrameDiscardResult

Modified: dss/trunk/core/ds485client.h
===================================================================
--- dss/trunk/core/ds485client.h	2009-10-15 10:09:37 UTC (rev 8848)
+++ dss/trunk/core/ds485client.h	2009-10-15 14:12:08 UTC (rev 8849)
@@ -25,7 +25,6 @@
 #include <vector>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/scoped_ptr.hpp>
 
 namespace dss {
 
@@ -35,6 +34,7 @@
   class __attribute__ ((visibility("default"))) DS485Client {
   public:
     DS485Client();
+    ~DS485Client();
 
     typedef void (*FrameCallback_t)(boost::shared_ptr<DS485CommandFrame>);
 
@@ -49,7 +49,7 @@
     /** Unsubscribes the first description that matches \a _functionID and \a _source. */
     void unsubscribeFrom(int _functionID, int _source);
   private:
-    boost::scoped_ptr<DS485ClientImpl> m_pImpl;
+    DS485ClientImpl* m_pImpl;
   }; // DS485Client
 }