[pytango] 20/98: Minimum changes to compile under Tango C++ 9

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.

commit 57dceae6bdc97f708a9c130b742de4d39d17734d
Author: Jose Tiago Coutinho Macara <coutinho at esrf.fr>
Date:   Fri Nov 20 11:36:44 2015 +0100

    Minimum changes to compile under Tango C++ 9
---
 src/boost/cpp/server/attribute.cpp | 48 ++++++++++++++++++++++++++++++++++++++
 src/boost/python/__init__.py       |  9 +++++++
 src/boost/python/release.py        |  2 +-
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/boost/cpp/server/attribute.cpp b/src/boost/cpp/server/attribute.cpp
index ebfdbc6..e92ad9b 100644
--- a/src/boost/cpp/server/attribute.cpp
+++ b/src/boost/cpp/server/attribute.cpp
@@ -393,6 +393,34 @@ namespace PyAttribute
                                        long x, long y)
     { __set_value("set_value_date_quality", att, value, &x, &y, t, &quality); }
     
+    /* According to tango attribute.h these "methods not usable for
+       the external world (outside the lib)" */
+    /*
+    inline bopy::object get_properties(Tango::Attribute &att,
+                                                bopy::object &attr_cfg)
+    {
+        Tango::AttributeConfig tg_attr_cfg;
+        att.get_properties(tg_attr_cfg);
+        return to_py(tg_attr_cfg, attr_cfg);
+    }
+    
+    inline bopy::object get_properties_2(Tango::Attribute &att,
+                                                  bopy::object &attr_cfg)
+    {
+        Tango::AttributeConfig_2 tg_attr_cfg;
+        att.get_properties(tg_attr_cfg);
+        return to_py(tg_attr_cfg, attr_cfg);
+    }
+
+    inline bopy::object get_properties_3(Tango::Attribute &att,
+                                                  bopy::object &attr_cfg)
+    {
+        Tango::AttributeConfig_3 tg_attr_cfg;
+        att.get_properties(tg_attr_cfg);
+        return to_py(tg_attr_cfg, attr_cfg);
+    }
+    */
+
     template<typename TangoScalarType>
     inline void _get_properties_multi_attr_prop(Tango::Attribute &att, bopy::object &multi_attr_prop)
     {
@@ -411,6 +439,26 @@ namespace PyAttribute
 		return multi_attr_prop;
     }
 
+    /*
+    void set_properties(Tango::Attribute &att, bopy::object &attr_cfg,
+                        bopy::object &dev)
+    {
+        Tango::AttributeConfig tg_attr_cfg;
+        from_py_object(attr_cfg, tg_attr_cfg);
+        Tango::DeviceImpl *dev_ptr = extract<Tango::DeviceImpl*>(dev);
+        att.set_properties(tg_attr_cfg, dev_ptr);
+    }
+
+    void set_properties_3(Tango::Attribute &att, bopy::object &attr_cfg,
+                          bopy::object &dev)
+    {
+        Tango::AttributeConfig_3 tg_attr_cfg;
+        from_py_object(attr_cfg, tg_attr_cfg);
+        Tango::DeviceImpl *dev_ptr = extract<Tango::DeviceImpl*>(dev);
+        att.set_properties(tg_attr_cfg, dev_ptr);
+    }
+    */
+
     template<typename TangoScalarType>
     inline void _set_properties_multi_attr_prop(Tango::Attribute &att, bopy::object &multi_attr_prop)
     {
diff --git a/src/boost/python/__init__.py b/src/boost/python/__init__.py
index 9b2f4b6..0e21e17 100644
--- a/src/boost/python/__init__.py
+++ b/src/boost/python/__init__.py
@@ -196,3 +196,12 @@ from .pytango_init import init as __init
 __init()
 
 
+def __leave():
+    try:
+        _PyTango._leavefunc()
+    except:
+        pass
+
+#import atexit
+#atexit.register(__leave)
+
diff --git a/src/boost/python/release.py b/src/boost/python/release.py
index cd5e3b1..aff598d 100644
--- a/src/boost/python/release.py
+++ b/src/boost/python/release.py
@@ -40,7 +40,7 @@ class Release:
             - keywords : (seq<str>) list of keywords
             - license : (str) the license"""
     name = 'PyTango'
-    version_info = (9, 2, 0, 'a', 1)
+    version_info = (9, 2, 0, 'dev', 0)
     version = '.'.join(map(str, version_info[:3]))
     version_long = version + ''.join(map(str, version_info[3:]))
     version_description = 'This version implements the C++ Tango 9.2 API.'

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