[pytango] 149/483: fixes #3574099

Sandor Bodo-Merle sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:35 UTC 2017


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

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 02a2a3bd4b754bccd81aff43125e2aeafcc5bd0b
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date:   Thu Oct 4 07:43:27 2012 +0000

    fixes #3574099
    
    git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21207 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
 doc/revision.rst | 4 +++-
 setup.py         | 2 +-
 src/tgutils.h    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index 15c5416..747d21c 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -67,7 +67,7 @@ History of modifications:
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
 | 21/09/12 | `8.14 <http://www.tango-controls.org/static/PyTango/v800/doc/html/index.html>`_  | Update to PyTango 8.0.0                             | T\. Coutinho          |
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
-| --/--/12 | `8.15 <http://www.tango-controls.org/static/PyTango/v800/doc/html/index.html>`_  | Update to PyTango 8.0.1                             | T\. Coutinho          |
+| --/--/12 | `8.15 <http://www.tango-controls.org/static/PyTango/v801/doc/html/index.html>`_  | Update to PyTango 8.0.1                             | T\. Coutinho          |
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
 
 .. _version-history:
@@ -81,8 +81,10 @@ Version history
 | 8.0.1      | Bug fixes:                                                                                                                                                                   |
 |            |     - from sourceforge:                                                                                                                                                      |
 |            |         - `3570970: [pytango] problem during the python3 building <https://sourceforge.net/tracker/?func=detail&aid=3570970&group_id=57612&atid=484769>`_                    |
+|            |         - `3570971: [pytango] itango does not work without qtconsole <https://sourceforge.net/tracker/?func=detail&aid=3570971&group_id=57612&atid=484769>`_                 |
 |            |         - `3570972: [pytango] warning/error when building 8.0.0 <https://sourceforge.net/tracker/?func=detail&aid=3570972&group_id=57612&atid=484769>`_                      |
 |            |         - `3570975: [pytango] problem during use of python3 version <https://sourceforge.net/tracker/?func=detail&aid=3570975&group_id=57612&atid=484769>`_                  |
+|            |         - `3574099: [pytango] compile error with gcc < 4.5 <https://sourceforge.net/tracker/?func=detail&aid=3574099&group_id=57612&atid=484769>`_                           |
 +------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 8.0.0      | Features:                                                                                                                                                                    |
 |            |     - Implemented tango C++ 8.0 API                                                                                                                                          |
diff --git a/setup.py b/setup.py
index 9e9063a..d3fb67d 100644
--- a/setup.py
+++ b/setup.py
@@ -215,7 +215,7 @@ class build_ext(dftbuild_ext):
     def build_extension(self, ext):
         if self.use_cpp_0x:
             ext.extra_compile_args += ['-std=c++0x']
-            ext.define_macros += [ ('PYTANGO_HAS_UNIQUE_PTR', '') ]
+            ext.define_macros += [ ('PYTANGO_HAS_UNIQUE_PTR', '1') ]
         dftbuild_ext.build_extension(self, ext)
 
 if sphinx:
diff --git a/src/tgutils.h b/src/tgutils.h
index 5a8f9ef..88cd837 100644
--- a/src/tgutils.h
+++ b/src/tgutils.h
@@ -176,7 +176,7 @@ DEF_TANGO_SCALAR_ARRAY_NAMES( DEV_ULONG64, DEVVAR_ULONG64ARRAY );
 
 #define __TANGO_DEPEND_ON_TYPE_AUX_NAME(tid_, DOIT) \
     case Tango:: tid_: { \
-        typedef typename TANGO_const2type(Tango:: tid_) TangoType; \
+        typedef TANGO_const2type(Tango:: tid_) TangoType; \
         DOIT; \
         break; \
     }

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



More information about the debian-science-commits mailing list