diff --git a/.yapfignore b/.yapfignore
index 9ae923eec4431e88586b7f66c9df321120d0d215..b0370c811f1446fca215104406a41de0cce35cf9 100644
--- a/.yapfignore
+++ b/.yapfignore
@@ -1 +1 @@
-unitTesting/test_python-syntax_error.py
+tests/test_python-syntax_error.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08b96950ab6b4cdea12d0c26eec7725c6a68360f..b22d65c554255e409d691018c72bf7acc633f3d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,6 @@ SET(DOXYGEN_USE_MATHJAX YES)
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
-INCLUDE(cmake/sphinx.cmake)
# Project definition
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
@@ -68,7 +67,6 @@ TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE PYTHON_LIBRARY="${PYTHON_LIBR
INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib)
ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(doc)
ADD_SUBDIRECTORY(tests)
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
diff --git a/README.md b/README.md
index e9f8e75d0554c75003067a36017df4e7a5dc0ed5..b0c5bae90989a979934ee2d4f3684d725716d9d0 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@ dynamic-graph-python
====================
[](https://travis-ci.org/stack-of-tasks/dynamic-graph-python)
-[](https://gepgitlab.laas.fr/stack-of-tasks/dynamic-graph-python/commits/master)
-[](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-python/master/coverage/)
+[](https://gitlab.laas.fr/stack-of-tasks/dynamic-graph-python/commits/master)
+[](http://projects.laas.fr/stack-of-tasks/doc/stack-of-tasks/dynamic-graph-python/master/coverage/)
Python bindings for dynamic-graph.
@@ -119,4 +119,3 @@ Credits
-------
This package authors are credited in the [AUTHORS](AUTHORS) file.
-
diff --git a/cmake b/cmake
index 30355b70d6f78089c790232d0e7bc67719d842b4..fb4c22c319ec5320f9a85527eb1a4130954846f5 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 30355b70d6f78089c790232d0e7bc67719d842b4
+Subproject commit fb4c22c319ec5320f9a85527eb1a4130954846f5
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
deleted file mode 100644
index 936f35c93a693e1a508ad8d45c2f1e3fdd022207..0000000000000000000000000000000000000000
--- a/doc/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 2010, 2011, Florent Lamiraux, Thomas Moulard, JRL, CNRS/AIST
-
-SPHINX_SETUP()
-SPHINX_FINALIZE()
diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
deleted file mode 100644
index 42e3c79bb2b9116bd1b8fa3bb5738ead730a4900..0000000000000000000000000000000000000000
--- a/doc/sphinx/conf.py.in
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @PROJECT_NAME@ documentation build configuration file, created by
-# sphinx-quickstart on Mon Nov 22 16:45:27 2010.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os
-from sphinx import version_info as sphinx_version
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path = [os.path.abspath('@CMAKE_BINARY_DIR@/src')]+sys.path
-sys.path = [os.path.abspath('@CMAKE_SOURCE_DIR@/src')]+sys.path
-
-# -- General configuration -----------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo']
-extensions.append('sphinx.ext.pngmath' if sphinx_version < (1, 4) else 'sphinx.ext.imgmath')
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'@PROJECT_NAME@'
-copyright = u'2010, Florent Lamiraux'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '1.0'
-# The full version, including alpha/beta/rc tags.
-release = '1.0'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of documents that shouldn't be included in the build.
-#unused_docs = []
-
-# List of directories, relative to source directory, that shouldn't be searched
-# for source files.
-exclude_trees = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. Major themes that come with
-# Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-# The name for this set of Sphinx documents. If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_use_modindex = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = ''
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = '@PROJECT_NAME@doc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
- ('index', '@PROJECT_NAME@.tex', u'@PROJECT_NAME@ Documentation',
- u'Florent Lamiraux', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_use_modindex = True
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
diff --git a/doc/sphinx/index.rst.in b/doc/sphinx/index.rst.in
deleted file mode 100644
index 9a49507e990c6861da1c2b2bf0882486e61cba95..0000000000000000000000000000000000000000
--- a/doc/sphinx/index.rst.in
+++ /dev/null
@@ -1,42 +0,0 @@
-.. dynamic-graph-python documentation master file, created by
- sphinx-quickstart on Mon Nov 22 16:45:27 2010.
- You can adapt this file completely to your liking, but it should at least
- contain the root `toctree` directive.
-
-Welcome to dynamic-graph-python's documentation!
-================================================
-
-.. toctree::
- :maxdepth: 2
-
-Python module dynamic_graph implements bindings for dynamic-graph_ library. To each main C++ class is associated a Python class. Main classes are listed below.
-
-Entity
-------
-maps dynamicgraph::Entity_ C++ class.
-
-.. autoclass:: dynamic_graph.entity.Entity
- :members:
-
-SignalBase
-----------
-maps dynamicgraph::SignalBase_ C++ class.
-
-.. autoclass:: dynamic_graph.signal_base.SignalBase
- :members:
-
-Other funtions of the module
-----------------------------
-.. automodule:: dynamic_graph
- :members:
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
-
-.. _dynamic-graph: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/index.html
-.. _Entity: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/classdynamicgraph_1_1_entity.html
-.. _SignalBase: file://@DYNAMIC_GRAPH_DOXYGENDOCDIR@/classdynamicgraph_1_1_signal_base.html
diff --git a/package.xml b/package.xml
index 017d35b47499be60c388e6d4f5ce60b943d50822..9b2850de6a66d1889e9169925983878d16fb2d5d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,7 @@
-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
<name>dynamic-graph-python</name>
- <version>3.5.2</version>
+ <version>3.5.3</version>
<description>
Dynamic graph library Python bindings
</description>
@@ -11,17 +12,20 @@
<author>Nicolas Mansard</author>
<author>Olivier Stasse</author>
- <build_depend>roscpp</build_depend>
- <build_depend>dynamic-graph</build_depend>
-
- <exec_depend>roscpp</exec_depend>
- <exec_depend>dynamic-graph</exec_depend>
-
- <build_export_depend>roscpp</build_export_depend>
- <build_export_depend>dynamic-graph</build_export_depend>
-
- <buildtool_depend>catkin</buildtool_depend>
-
+ <build_depend>git</build_depend>
+ <build_depend>doxygen</build_depend>
<doc_depend>doxygen</doc_depend>
+ <!-- The following tags are recommended by REP-136 -->
+ <exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
+ <exec_depend condition="$ROS_VERSION == 2">ament_cmake</exec_depend>
+ <depend>dynamic-graph</depend>
+ <depend>roscpp</depend>
+ <depend>boost</depend>
+
+ <buildtool_depend>cmake</buildtool_depend>
+
+ <export>
+ <build_type>cmake</build_type>
+ </export>
</package>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b600bd214edf2c3588f595df51ceb6779bb64a04..b8cf40d3eedd630f6dbe398e3772f5ed366a9e0f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,6 +16,6 @@ FOREACH(source ${PYTHON_SOURCES})
ENDFOREACH(source)
# --- ADD the wrap on the dg modules
-LINK_DIRECTORIES(${DYNAMIC_GRAPH_PLUGINDIR})
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer" tracer tracer-wrap)
-DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" tracer-real-time tracer_real_time-wrap)
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer" dynamic-graph::tracer tracer-wrap)
+DYNAMIC_GRAPH_PYTHON_MODULE("tracer_real_time" dynamic-graph::tracer-real-time
+ tracer_real_time-wrap)
diff --git a/src/dynamic_graph/debug-py.cc b/src/dynamic_graph/debug-py.cc
index 503fb4177632ad813a3bd8977594f3c7513e6c92..e612f0d2858bb1527749968d2e66e1c0d24c9f8d 100644
--- a/src/dynamic_graph/debug-py.cc
+++ b/src/dynamic_graph/debug-py.cc
@@ -22,8 +22,8 @@ namespace dynamicgraph {
namespace python {
#if PY_MAJOR_VERSION == 2
- extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
namespace debug {
@@ -35,7 +35,7 @@ PyObject* addLoggerFileOutputStream(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
char* filename;
if (!PyArg_ParseTuple(args, "s", &filename)) return NULL;
std::string sfilename(filename);
@@ -58,7 +58,7 @@ PyObject* closeLoggerFileOutputStream(
#else
PyObject*, PyObject*
#endif
- ) {
+) {
try {
for (std::map<std::string, ofstreamShrPtr>::iterator it = mapOfFiles_.begin(); it != mapOfFiles_.end(); ++it) {
it->second->close();
@@ -74,7 +74,7 @@ PyObject* addLoggerCoutOutputStream(
#else
PyObject*, PyObject*
#endif
- ) {
+) {
try {
dgADD_OSTREAM_TO_RTLOG(std::cout);
}
@@ -88,7 +88,7 @@ PyObject* realTimeLoggerDestroy(
#else
PyObject*, PyObject*
#endif
- ) {
+) {
try {
RealTimeLogger::destroy();
}
@@ -102,7 +102,7 @@ PyObject* realTimeLoggerSpinOnce(
#else
PyObject*, PyObject*
#endif
- ) {
+) {
try {
RealTimeLogger::instance().spinOnce();
}
@@ -116,7 +116,7 @@ PyObject* realTimeLoggerInstance(
#else
PyObject*, PyObject*
#endif
- ) {
+) {
try {
RealTimeLogger::instance();
}
diff --git a/src/dynamic_graph/dynamic-graph-py.cc b/src/dynamic_graph/dynamic-graph-py.cc
index 6a9d26cc6420e7f4b33628c5df61de9bdf55e22a..e26b8bdc1abeb337f8462c900de1bc8f968e0c87 100644
--- a/src/dynamic_graph/dynamic-graph-py.cc
+++ b/src/dynamic_graph/dynamic-graph-py.cc
@@ -15,8 +15,8 @@ namespace dynamicgraph {
namespace python {
#if PY_MAJOR_VERSION == 2
- PyObject* dgpyError;
-# endif
+PyObject* dgpyError;
+#endif
/**
\brief plug a signal into another one.
@@ -27,7 +27,7 @@ PyObject* plug(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* objOut = NULL;
PyObject* objIn = NULL;
void* pObjOut;
@@ -51,20 +51,20 @@ PyObject* plug(
pObjIn = PyCapsule_GetPointer(objIn, "dynamic_graph.Signal");
SignalBase<int>* signalIn = (SignalBase<int>*)pObjIn;
if (signalIn == NULL) {
- std::ostringstream oss;
- oss << "dynamic_graph.plug(a, b): Argument 'b' must be of type 'dynamic_graph.Signal', but got "
- << PyCapsule_GetName(objIn);
- PyErr_SetString(PyExc_TypeError, oss.str().c_str());
- return NULL;
+ std::ostringstream oss;
+ oss << "dynamic_graph.plug(a, b): Argument 'b' must be of type 'dynamic_graph.Signal', but got "
+ << PyCapsule_GetName(objIn);
+ PyErr_SetString(PyExc_TypeError, oss.str().c_str());
+ return NULL;
}
pObjOut = PyCapsule_GetPointer(objOut, "dynamic_graph.Signal");
SignalBase<int>* signalOut = (SignalBase<int>*)pObjOut;
if (signalOut == NULL) {
- std::ostringstream oss;
- oss << "dynamic_graph.plug(a, b): Argument 'a' must be of type 'dynamic_graph.Signal', but got "
- << PyCapsule_GetName(objOut);
- PyErr_SetString(PyExc_TypeError, oss.str().c_str());
- return NULL;
+ std::ostringstream oss;
+ oss << "dynamic_graph.plug(a, b): Argument 'a' must be of type 'dynamic_graph.Signal', but got "
+ << PyCapsule_GetName(objOut);
+ PyErr_SetString(PyExc_TypeError, oss.str().c_str());
+ return NULL;
}
std::ostringstream os;
@@ -81,7 +81,7 @@ PyObject* enableTrace(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* boolean;
char* filename = NULL;
diff --git a/src/dynamic_graph/entity-py.cc b/src/dynamic_graph/entity-py.cc
index 41c4cad69fe1fc545a2301123fc4a02ce620e711..b8f2c2441d91929ae2a27dbc904f72622045efd5 100644
--- a/src/dynamic_graph/entity-py.cc
+++ b/src/dynamic_graph/entity-py.cc
@@ -33,8 +33,8 @@ namespace python {
using namespace convert;
#if PY_MAJOR_VERSION == 2
- extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
namespace entity {
@@ -47,7 +47,7 @@ PyObject* create(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
char* className = NULL;
char* instanceName = NULL;
@@ -85,7 +85,7 @@ PyObject* getName(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
void* pointer = NULL;
std::string name;
@@ -115,7 +115,7 @@ PyObject* getClassName(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
void* pointer = NULL;
std::string name;
@@ -145,7 +145,7 @@ PyObject* hasSignal(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
char* name = NULL;
PyObject* object = NULL;
void* pointer = NULL;
@@ -181,7 +181,7 @@ PyObject* getSignal(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
char* name = NULL;
PyObject* object = NULL;
void* pointer = NULL;
@@ -213,7 +213,7 @@ PyObject* listSignals(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
@@ -246,9 +246,9 @@ PyObject* executeCommand(
#if PY_MAJOR_VERSION >= 3
PyObject* m, PyObject* args
#else
- PyObject* , PyObject* args
+ PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
PyObject* argTuple = NULL;
char* commandName = NULL;
@@ -344,7 +344,7 @@ PyObject* getCommandDocstring(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
char* commandName;
if (!PyArg_ParseTuple(args, "Os", &object, &commandName)) {
@@ -380,7 +380,7 @@ PyObject* getDocString(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) {
return NULL;
@@ -411,7 +411,7 @@ PyObject* display(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
/* Retrieve the entity instance. */
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object) || (!PyCapsule_CheckExact(object))) {
@@ -438,7 +438,7 @@ PyObject* setLoggerVerbosityLevel(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
PyObject* objectVerbosityLevel = NULL;
if (!PyArg_ParseTuple(args, "OO", &object, &objectVerbosityLevel)) return NULL;
@@ -500,7 +500,7 @@ PyObject* getLoggerVerbosityLevel(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -532,7 +532,7 @@ PyObject* getStreamPrintPeriod(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -563,7 +563,7 @@ PyObject* setStreamPrintPeriod(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
double streamPrintPeriod = 0;
if (!PyArg_ParseTuple(args, "Od", &object, &streamPrintPeriod)) return NULL;
@@ -603,7 +603,7 @@ PyObject* getTimeSample(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -634,7 +634,7 @@ PyObject* setTimeSample(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PyObject* object = NULL;
double timeSample;
if (!PyArg_ParseTuple(args, "Od", &object, &timeSample)) return NULL;
diff --git a/src/dynamic_graph/pool-py.cc b/src/dynamic_graph/pool-py.cc
index aecb0a8432afa55f9fcc694363096cb5b8b6f3d6..68f0ce698f3f3c9811d5b40b4642a4dcea913e8b 100644
--- a/src/dynamic_graph/pool-py.cc
+++ b/src/dynamic_graph/pool-py.cc
@@ -11,8 +11,8 @@ namespace dynamicgraph {
namespace python {
#if PY_MAJOR_VERSION == 2
- extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
namespace pool {
@@ -22,7 +22,7 @@ PyObject* writeGraph(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
char* filename;
if (!PyArg_ParseTuple(args, "s", &filename)) return NULL;
try {
@@ -41,7 +41,7 @@ PyObject* getEntityList(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
if (!PyArg_ParseTuple(args, "")) return NULL;
std::vector<std::string> entityNames;
diff --git a/src/dynamic_graph/signal-base-py.cc b/src/dynamic_graph/signal-base-py.cc
index ca11e8e71345b1a8f979f4ddb51605aed1c5d18e..743cb1f7aba7274142510503df6b4ccdc2049fc3 100644
--- a/src/dynamic_graph/signal-base-py.cc
+++ b/src/dynamic_graph/signal-base-py.cc
@@ -22,8 +22,8 @@ namespace dynamicgraph {
namespace python {
#if PY_MAJOR_VERSION == 2
- extern PyObject* dgpyError;
-# endif
+extern PyObject* dgpyError;
+#endif
using namespace convert;
@@ -96,7 +96,7 @@ PyObject* createSignalWrapper(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
PythonSignalContainer* psc = getPythonSignalContainer();
if (psc == NULL) return NULL;
@@ -159,7 +159,7 @@ PyObject* setTime(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
int time;
@@ -182,7 +182,7 @@ PyObject* display(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -206,7 +206,7 @@ PyObject* displayDependencies(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
int time;
@@ -230,7 +230,7 @@ PyObject* getValue(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -330,7 +330,7 @@ PyObject* getName(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -354,7 +354,7 @@ PyObject* getClassName(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -378,7 +378,7 @@ PyObject* setValue(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
char* valueString = NULL;
@@ -405,7 +405,7 @@ PyObject* recompute(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
unsigned int time;
@@ -427,7 +427,7 @@ PyObject* unplug(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -448,7 +448,7 @@ PyObject* isPlugged(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
@@ -473,7 +473,7 @@ PyObject* getPlugged(
#else
PyObject*, PyObject* args
#endif
- ) {
+) {
void* pointer = NULL;
PyObject* object = NULL;
if (!PyArg_ParseTuple(args, "O", &object)) return NULL;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index acec15856ade25393b6b7eb18978c6260e39d2af..7f74b238181809148d5264abee72eb59901fba2a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,7 +35,10 @@ SET_TARGET_PROPERTIES(${PYTHON_MODULE} PROPERTIES
PREFIX ""
OUTPUT_NAME ${LIBRARY_NAME}/wrap)
-TARGET_LINK_LIBRARIES(${PYTHON_MODULE} "-Wl,--no-as-needed")
+IF(UNIX AND NOT APPLE)
+ TARGET_LINK_LIBRARIES(${PYTHON_MODULE} "-Wl,--no-as-needed")
+ENDIF(UNIX AND NOT APPLE)
+
TARGET_LINK_LIBRARIES(${PYTHON_MODULE} ${LIBRARY_NAME} ${PYTHON_LIBRARY})
TARGET_INCLUDE_DIRECTORIES(${PYTHON_MODULE} SYSTEM PUBLIC ${PYTHON_INCLUDE_DIRS})
diff --git a/tests/custom_entity.cpp b/tests/custom_entity.cpp
index 8df5d46465ab9203bb44208081fa76e9944538e0..90632d7ada1ad224e7466faf335c87fd39f5bdf6 100644
--- a/tests/custom_entity.cpp
+++ b/tests/custom_entity.cpp
@@ -34,8 +34,7 @@ class CustomEntity : public Entity {
using namespace dynamicgraph::command;
- this->addCommand("act", makeCommandVoid0( *this, &CustomEntity::act,
- docCommandVoid0( "act on input signal")));
+ this->addCommand("act", makeCommandVoid0(*this, &CustomEntity::act, docCommandVoid0("act on input signal")));
}
void addSignal() { signalRegistration(m_sigdSIN << m_sigdTimeDepSOUT); }
@@ -49,21 +48,19 @@ class CustomEntity : public Entity {
const double &aDouble = m_sigdSIN(inTime);
res = aDouble;
logger().stream(MSG_TYPE_ERROR) << "start update " << res << '\n';
- DYNAMIC_GRAPH_ENTITY_DEBUG (*this) << "This is a message of level MSG_TYPE_DEBUG\n";
- DYNAMIC_GRAPH_ENTITY_INFO (*this) << "This is a message of level MSG_TYPE_INFO\n";
- DYNAMIC_GRAPH_ENTITY_WARNING (*this) << "This is a message of level MSG_TYPE_WARNING\n";
- DYNAMIC_GRAPH_ENTITY_ERROR (*this) << "This is a message of level MSG_TYPE_ERROR\n";
- DYNAMIC_GRAPH_ENTITY_DEBUG_STREAM (*this) << "This is a message of level MSG_TYPE_DEBUG_STREAM\n";
- DYNAMIC_GRAPH_ENTITY_INFO_STREAM (*this) << "This is a message of level MSG_TYPE_INFO_STREAM\n";
- DYNAMIC_GRAPH_ENTITY_WARNING_STREAM (*this) << "This is a message of level MSG_TYPE_WARNING_STREAM\n";
- DYNAMIC_GRAPH_ENTITY_ERROR_STREAM (*this) << "This is a message of level MSG_TYPE_ERROR_STREAM\n";
+ DYNAMIC_GRAPH_ENTITY_DEBUG(*this) << "This is a message of level MSG_TYPE_DEBUG\n";
+ DYNAMIC_GRAPH_ENTITY_INFO(*this) << "This is a message of level MSG_TYPE_INFO\n";
+ DYNAMIC_GRAPH_ENTITY_WARNING(*this) << "This is a message of level MSG_TYPE_WARNING\n";
+ DYNAMIC_GRAPH_ENTITY_ERROR(*this) << "This is a message of level MSG_TYPE_ERROR\n";
+ DYNAMIC_GRAPH_ENTITY_DEBUG_STREAM(*this) << "This is a message of level MSG_TYPE_DEBUG_STREAM\n";
+ DYNAMIC_GRAPH_ENTITY_INFO_STREAM(*this) << "This is a message of level MSG_TYPE_INFO_STREAM\n";
+ DYNAMIC_GRAPH_ENTITY_WARNING_STREAM(*this) << "This is a message of level MSG_TYPE_WARNING_STREAM\n";
+ DYNAMIC_GRAPH_ENTITY_ERROR_STREAM(*this) << "This is a message of level MSG_TYPE_ERROR_STREAM\n";
logger().stream(MSG_TYPE_ERROR) << "end update\n";
return res;
}
- void act() {
- m_sigdSIN.accessCopy();
- }
+ void act() { m_sigdSIN.accessCopy(); }
};
DYNAMICGRAPH_FACTORY_ENTITY_PLUGIN(CustomEntity, "CustomEntity");
} // namespace dynamicgraph