[pytango] 11/25: Fix auto tango monitor

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to tag v8.1.9
in repository pytango.

commit 8be58b765be5021c844282411e8539a3e37c1691
Author: Vincent Michel <vincent.michel at maxlab.lu.se>
Date:   Fri Apr 22 17:28:43 2016 +0200

    Fix auto tango monitor
---
 src/boost/cpp/server/auto_monitor.cpp | 9 +++++----
 src/boost/python/auto_monitor.py      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/boost/cpp/server/auto_monitor.cpp b/src/boost/cpp/server/auto_monitor.cpp
index 676da31..2106ca6 100644
--- a/src/boost/cpp/server/auto_monitor.cpp
+++ b/src/boost/cpp/server/auto_monitor.cpp
@@ -23,14 +23,14 @@ class AutoTangoMonitor
   Tango::DeviceClass                *klass;
 
 public:
-  AutoTangoMonitor(Tango::DeviceImpl *dev)
+  AutoTangoMonitor(Tango::DeviceImpl *di)
   {
-    this.dev = dev;
+    dev = di;
   }
 
-  AutoTangoMonitor(Tango::DeviceClass *klass)
+  AutoTangoMonitor(Tango::DeviceClass *dc)
   {
-    this.klass = klass;
+    klass = dc;
   }
 
   void acquire()
@@ -55,6 +55,7 @@ public:
     if (mon != NULL)
     {
       delete mon;
+      mon = NULL;
     }
   }
 
diff --git a/src/boost/python/auto_monitor.py b/src/boost/python/auto_monitor.py
index 4b7c566..d6ee330 100644
--- a/src/boost/python/auto_monitor.py
+++ b/src/boost/python/auto_monitor.py
@@ -21,7 +21,7 @@ from ._PyTango import AutoTangoMonitor, AutoTangoAllowThreads
 
 
 def __AutoTangoMonitor__enter__(self):
-    self._acquire
+    self._acquire()
     return self
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git