[pytango] 146/483: fixes #3570972
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:34 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 3e0e283a04a279a6e4f7e3650d58198abbfd3ee0
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Mon Oct 1 08:24:55 2012 +0000
fixes #3570972
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@21185 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
Makefile | 2 +-
PyTango/db.py | 4 ++--
PyTango/device_server.py | 2 +-
doc/quicktour.rst | 7 ++++---
doc/revision.rst | 9 ++++++++-
setup.py | 1 +
src/defs.h | 10 +++++++++-
7 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 91dfe4a..5d40d84 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ INCLUDE_DIRS = \
$(PY_INC) \
$(NUMPY_INC)
-CCFLAGS = -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -fPIC -std=c++0x $(INCLUDE_DIRS)
+CCFLAGS = -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -fPIC -std=c++0x -DPYTANGO_HAS_UNIQUE_PTR $(INCLUDE_DIRS)
LIB_NAME = _PyTango.so
LIB_NAME_STATIC = _PyTangoStatic.so
diff --git a/PyTango/db.py b/PyTango/db.py
index 7611e1a..c7eb770 100644
--- a/PyTango/db.py
+++ b/PyTango/db.py
@@ -1933,9 +1933,9 @@ def __doc_Database():
""" )
document_method("unexport_event", """
- export_event(self, event) -> None
+ unexport_event(self, event) -> None
- Export an event to the database.
+ Un-export an event from the database.
Parameters :
- event : (str) event
diff --git a/PyTango/device_server.py b/PyTango/device_server.py
index 0da51b3..e001ea1 100644
--- a/PyTango/device_server.py
+++ b/PyTango/device_server.py
@@ -1303,7 +1303,7 @@ def __doc_Attribute():
""" )
document_method("is_rds_alarm", """
- is_rds_alarmself) -> bool
+ is_rds_alarm(self) -> bool
Check if the attribute is in RDS alarm condition.
diff --git a/doc/quicktour.rst b/doc/quicktour.rst
index ec51701..a881b76 100644
--- a/doc/quicktour.rst
+++ b/doc/quicktour.rst
@@ -111,10 +111,11 @@ determine if it is running or not.
Result [8]: 'The device is in RUNNING state.'
.. note::
- Did you notice that you didn't write PyTango.DeviceProxy but instead just
- DeviceProxy? This is because :ref:`itango` automatically exports the
+
+ Did you notice that you didn't write `PyTango.DeviceProxy` but instead just
+ `DeviceProxy` ? This is because :ref:`itango` automatically exports the
:class:`~PyTango.DeviceProxy`, :class:`~PyTango.AttributeProxy`,
- :class:`PyTango.Database` and :class:`~PyTango.Group` classes to the
+ :class:`~PyTango.Database` and :class:`~PyTango.Group` classes to the
namespace. If you are writting code outside :ref:`itango` you **MUST**
use the `PyTango` module prefix.
diff --git a/doc/revision.rst b/doc/revision.rst
index cea73b0..fd70096 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -65,7 +65,9 @@ History of modifications:
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
| 24/04/12 | `8.13 <http://www.tango-controls.org/static/PyTango/v723/doc/html/index.html>`_ | Update to PyTango 7.2.3 | T\. Coutinho |
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
-| /09/12 | `8.14 <http://www.tango-controls.org/static/PyTango/v800/doc/html/index.html>`_ | Update to PyTango 8.0.0 | T\. Coutinho |
+| 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 |
+----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
.. _version-history:
@@ -76,6 +78,11 @@ Version history
+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| version | Changes |
+============+==============================================================================================================================================================================+
+| 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>`_ |
+| | - `3570972: [pytango] [pytango] warning/error when building 8.0.0 <https://sourceforge.net/tracker/?func=detail&aid=3570972&group_id=57612&atid=484769>`_ |
++------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| 8.0.0 | Features: |
| | - Implemented tango C++ 8.0 API |
| | - Python 3k compatible |
diff --git a/setup.py b/setup.py
index 0dbd527..9e9063a 100644
--- a/setup.py
+++ b/setup.py
@@ -215,6 +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', '') ]
dftbuild_ext.build_extension(self, ext)
if sphinx:
diff --git a/src/defs.h b/src/defs.h
index b6c604f..4f20c7c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -33,12 +33,20 @@ typedef std::vector<double> StdDoubleVector;
/* HAS_UNIQUE_PTR definition comes from tango. It tells PyTango if Tango itself
is using the new C++0x unique_ptr or not. In PyTango we try to use the same
as TangoC++ whenever possible. */
-#ifdef HAS_UNIQUE_PTR
+#ifdef PYTANGO_HAS_UNIQUE_PTR
#define unique_pointer std::unique_ptr
#else
#define unique_pointer std::auto_ptr
#endif
+/*
+#ifdef HAS_UNIQUE_PTR
+typedef std::unique_ptr unique_pointer;
+#else
+typedef std::auto_ptr unique_pointer;
+#endif
+*/
+
namespace PyTango
{
enum ExtractAs {
--
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