[pytango] 26/98: Implement TANGO enumeration type (client)

[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 de318b25b35c9bc698de0b5a3ed7c8f83598ecfb
Author: Jose Tiago Coutinho Macara <tiago.coutinho at esrf.fr>
Date:   Fri Dec 11 14:41:27 2015 +0100

    Implement TANGO enumeration type (client)
---
 src/boost/cpp/tgutils.h        | 7 +++++++
 src/boost/python/base_types.py | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/boost/cpp/tgutils.h b/src/boost/cpp/tgutils.h
index 6746dba..ea8d5fd 100644
--- a/src/boost/cpp/tgutils.h
+++ b/src/boost/cpp/tgutils.h
@@ -115,6 +115,11 @@ TSD_SIMPLE__( DEV_STATE,                Tango::DevState  ,  Tango::DevVarStateAr
 TSD_SIMPLE__( DEV_ENCODED,              Tango::DevEncoded,  Tango::DevVarEncodedArray     );
 TSD_SIMPLE__( DEV_PIPE_BLOB,            Tango::DevPipeBlob, void  );
 
+// since enum type is implemented as a short we cannot use tango_type2name because
+// it will conflict with the DevShort template declaration
+DEF_TANGO_NAME2TYPE__( DEV_ENUM,        Tango::DevEnum);
+DEF_TANGO_NAME2ARRAY( DEV_ENUM, Tango::DevVarShortArray, Tango::DevEnum);
+
 TSD_SIMPLE__( DEV_VOID,                 void             , void);
 
 TSD_ARRAY__(  DEVVAR_CHARARRAY,         _CORBA_Octet     ,  Tango::DevVarCharArray);
@@ -259,6 +264,7 @@ DEF_TANGO_SCALAR_ARRAY_NAMES( DEV_STATE,   DEVVAR_STATEARRAY );
 /*        __TANGO_DEPEND_ON_TYPE_AUX_ID(DEV_INT, DOIT_SIMPLE) */\
         __TANGO_DEPEND_ON_TYPE_AUX_ID(DEV_ENCODED, DOIT_SIMPLE) \
         __TANGO_DEPEND_ON_TYPE_AUX_ID(DEV_PIPE_BLOB, DOIT_SIMPLE) \
+        __TANGO_DEPEND_ON_TYPE_AUX_ID(DEV_ENUM, DOIT_SIMPLE) \
         default: \
             assert(false); \
     } } else (void)0
@@ -316,6 +322,7 @@ DEF_TANGO_SCALAR_ARRAY_NAMES( DEV_STATE,   DEVVAR_STATEARRAY );
 /*        __TANGO_DEPEND_ON_TYPE_AUX_NAME(DEV_INT, DOIT_SIMPLE) */\
         __TANGO_DEPEND_ON_TYPE_AUX_NAME(DEV_ENCODED, DOIT_SIMPLE) \
         __TANGO_DEPEND_ON_TYPE_AUX_NAME(DEV_PIPE_BLOB, DOIT_SIMPLE) \
+        __TANGO_DEPEND_ON_TYPE_AUX_NAME(DEV_ENUM, DOIT_SIMPLE) \
         default: \
             assert(false); \
     } } else (void)0
diff --git a/src/boost/python/base_types.py b/src/boost/python/base_types.py
index e6617fa..a026738 100644
--- a/src/boost/python/base_types.py
+++ b/src/boost/python/base_types.py
@@ -358,7 +358,6 @@ def __doc_base_types():
         - DevInt
         - DevEncoded
         - DevEnum
-        - DevPipeBlob
     """ )
 
     document_enum("LockerLanguage", """

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