replace destroy by RAII; many implementation changes

2016-05-13 12:50:47 -04:00
parent 9f8073aaa2
commit 3cc13e2c5a
18 changed files with 531 additions and 445 deletions
--- a/src/pvaClientNTMultiMonitor.cpp
+++ b/src/pvaClientNTMultiMonitor.cpp
@@ -57,19 +57,19 @@ PvaClientNTMultiMonitor::PvaClientNTMultiMonitor(
  isConnected(false),
  isDestroyed(false)
 {
+    if(PvaClient::getDebug()) cout<< "PvaClientNTMultiMonitor::PvaClientNTMultiMonitor()\n";
 }


 PvaClientNTMultiMonitor::~PvaClientNTMultiMonitor()
 {
-    destroy();
-}
-
-void PvaClientNTMultiMonitor::destroy()
-{
+    if(PvaClient::getDebug()) cout<< "PvaClientNTMultiMonitor::~PvaClientNTMultiMonitor()\n";
    {
        Lock xx(mutex);
-        if(isDestroyed) return;
+        if(isDestroyed) {
+             cerr<< "Why was PvaClientNTMultiMonitor::~PvaClientNTMultiMonitor() called more then once????\n";
+             return;
+        }
        isDestroyed = true;
    }
    pvaClientChannelArray.clear();