Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • cberge/dynamic-graph
  • ostasse/dynamic-graph
  • gsaurel/dynamic-graph
  • stack-of-tasks/dynamic-graph
4 results
Show changes
Commits on Source (19)
# pre-commit run -a (Guilhem Saurel, 2022-07-27)
e9a222fb0a1f236e534e21c66cb623fd8d25b8d6
# pre-commit: details (Guilhem Saurel, 2022-04-14) # pre-commit: details (Guilhem Saurel, 2022-04-14)
1c0f3cc1048a8b2a8206510a51a237b2f1e68a34 1c0f3cc1048a8b2a8206510a51a237b2f1e68a34
......
...@@ -2,12 +2,12 @@ ci: ...@@ -2,12 +2,12 @@ ci:
autoupdate_branch: 'devel' autoupdate_branch: 'devel'
repos: repos:
- repo: https://github.com/pre-commit/mirrors-clang-format - repo: https://github.com/pre-commit/mirrors-clang-format
rev: v13.0.1 rev: v14.0.6
hooks: hooks:
- id: clang-format - id: clang-format
args: [-i, --style=Google] args: [--style=Google]
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0 rev: v4.3.0
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: check-ast - id: check-ast
...@@ -24,3 +24,7 @@ repos: ...@@ -24,3 +24,7 @@ repos:
- id: fix-byte-order-marker - id: fix-byte-order-marker
- id: mixed-line-ending - id: mixed-line-ending
- id: trailing-whitespace - id: trailing-whitespace
- repo: https://github.com/cheshirekow/cmake-format-precommit
rev: v0.6.13
hooks:
- id: cmake-format
CMAKE_MINIMUM_REQUIRED(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
# Project properties # Project properties
SET(PROJECT_ORG stack-of-tasks) set(PROJECT_ORG stack-of-tasks)
SET(PROJECT_NAME dynamic-graph) set(PROJECT_NAME dynamic-graph)
SET(PROJECT_DESCRIPTION "Dynamic graph library") set(PROJECT_DESCRIPTION "Dynamic graph library")
SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}") set(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
# Project options # Project options
OPTION(SUFFIX_SO_VERSION "Suffix library name with its version" ON) option(SUFFIX_SO_VERSION "Suffix library name with its version" ON)
# Project configuration # Project configuration
SET(PROJECT_USE_CMAKE_EXPORT TRUE) set(PROJECT_USE_CMAKE_EXPORT TRUE)
SET(CUSTOM_HEADER_DIR ${PROJECT_NAME}) set(CUSTOM_HEADER_DIR ${PROJECT_NAME})
SET(CXX_DISABLE_WERROR TRUE) set(CXX_DISABLE_WERROR TRUE)
# Doxygen setup # Doxygen setup
SET(DOXYGEN_USE_MATHJAX YES) set(DOXYGEN_USE_MATHJAX YES)
SET(DOXYGEN_USE_TEMPLATE_CSS YES) set(DOXYGEN_USE_TEMPLATE_CSS YES)
# JRL-cmakemodule setup # JRL-cmakemodule setup
INCLUDE(cmake/base.cmake) include(cmake/base.cmake)
INCLUDE(cmake/boost.cmake) include(cmake/boost.cmake)
# Project definition # Project definition
COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX) compute_project_args(PROJECT_ARGS LANGUAGES CXX)
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS}) project(${PROJECT_NAME} ${PROJECT_ARGS})
CHECK_MINIMAL_CXX_STANDARD(14 ENFORCE) check_minimal_cxx_standard(14 ENFORCE)
INCLUDE(cmake/pthread.cmake) # needs to be included after the CXX definition include(cmake/pthread.cmake) # needs to be included after the CXX definition
# Project dependencies # Project dependencies
IF(BUILD_TESTING) if(BUILD_TESTING)
FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework) find_package(Boost REQUIRED COMPONENTS unit_test_framework)
ENDIF() endif()
ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS serialization system thread) add_project_dependency(Boost REQUIRED COMPONENTS serialization system thread)
ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED) add_project_dependency(Eigen3 REQUIRED)
SEARCH_FOR_PTHREAD() search_for_pthread()
IF(Boost_VERSION GREATER 107299 OR Boost_VERSION_MACRO GREATER 107299) if(Boost_VERSION GREATER 107299 OR Boost_VERSION_MACRO GREATER 107299)
# Silence a warning about a deprecated use of boost bind by boost >= 1.73 # Silence a warning about a deprecated use of boost bind by boost >= 1.73
# without dropping support for boost < 1.73 # without dropping support for boost < 1.73
ADD_DEFINITIONS(-DBOOST_BIND_GLOBAL_PLACEHOLDERS) add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
ENDIF() endif()
# Add configuration headers for plug-ins. # Add configuration headers for plug-ins.
GENERATE_CONFIGURATION_HEADER( generate_configuration_header(${HEADER_DIR} config-tracer.hh DG_TRACER
${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS) tracer_EXPORTS)
GENERATE_CONFIGURATION_HEADER( generate_configuration_header(${HEADER_DIR} config-tracer-real-time.hh
${HEADER_DIR} DG_TRACERREALTIME tracer_real_time_EXPORTS)
config-tracer-real-time.hh DG_TRACERREALTIME tracer_real_time_EXPORTS)
# Verbosity level # Verbosity level
IF(NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) if(NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG) add_definitions(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
ENDIF(NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")) endif(NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
# Main Library # Main Library
SET(${PROJECT_NAME}_HEADERS set(${PROJECT_NAME}_HEADERS
include/${CUSTOM_HEADER_DIR}/fwd.hh include/${CUSTOM_HEADER_DIR}/fwd.hh
include/${CUSTOM_HEADER_DIR}/debug.h include/${CUSTOM_HEADER_DIR}/debug.h
include/${CUSTOM_HEADER_DIR}/real-time-logger.h include/${CUSTOM_HEADER_DIR}/real-time-logger.h
include/${CUSTOM_HEADER_DIR}/real-time-logger-def.h include/${CUSTOM_HEADER_DIR}/real-time-logger-def.h
include/${CUSTOM_HEADER_DIR}/dynamic-graph-api.h
include/${CUSTOM_HEADER_DIR}/dynamic-graph-api.h include/${CUSTOM_HEADER_DIR}/entity.h
include/${CUSTOM_HEADER_DIR}/factory.h
include/${CUSTOM_HEADER_DIR}/entity.h include/${CUSTOM_HEADER_DIR}/pool.h
include/${CUSTOM_HEADER_DIR}/factory.h include/${CUSTOM_HEADER_DIR}/exception-abstract.h
include/${CUSTOM_HEADER_DIR}/pool.h include/${CUSTOM_HEADER_DIR}/exception-factory.h
include/${CUSTOM_HEADER_DIR}/exception-signal.h
include/${CUSTOM_HEADER_DIR}/exception-abstract.h include/${CUSTOM_HEADER_DIR}/exception-traces.h
include/${CUSTOM_HEADER_DIR}/exception-factory.h include/${CUSTOM_HEADER_DIR}/signal.h
include/${CUSTOM_HEADER_DIR}/exception-signal.h include/${CUSTOM_HEADER_DIR}/signal-array.h
include/${CUSTOM_HEADER_DIR}/exception-traces.h include/${CUSTOM_HEADER_DIR}/signal-base.h
include/${CUSTOM_HEADER_DIR}/signal-ptr.h
include/${CUSTOM_HEADER_DIR}/signal.h include/${CUSTOM_HEADER_DIR}/signal-time-dependent.h
include/${CUSTOM_HEADER_DIR}/signal-array.h include/${CUSTOM_HEADER_DIR}/signal-ptr.t.cpp
include/${CUSTOM_HEADER_DIR}/signal-base.h include/${CUSTOM_HEADER_DIR}/signal.t.cpp
include/${CUSTOM_HEADER_DIR}/signal-ptr.h include/${CUSTOM_HEADER_DIR}/time-dependency.h
include/${CUSTOM_HEADER_DIR}/signal-time-dependent.h include/${CUSTOM_HEADER_DIR}/time-dependency.t.cpp
include/${CUSTOM_HEADER_DIR}/signal-ptr.t.cpp # Kept for a brittle backward compatiblity.
include/${CUSTOM_HEADER_DIR}/signal.t.cpp include/${CUSTOM_HEADER_DIR}/signal-caster.h
include/${CUSTOM_HEADER_DIR}/time-dependency.h include/${CUSTOM_HEADER_DIR}/signal-cast-helper.h
include/${CUSTOM_HEADER_DIR}/time-dependency.t.cpp include/${CUSTOM_HEADER_DIR}/all-signals.h
# Kept for a brittle backward compatiblity. include/${CUSTOM_HEADER_DIR}/signal-helper.h
include/${CUSTOM_HEADER_DIR}/signal-caster.h include/${CUSTOM_HEADER_DIR}/entity-helper.h
include/${CUSTOM_HEADER_DIR}/signal-cast-helper.h include/${CUSTOM_HEADER_DIR}/tracer.h
include/${CUSTOM_HEADER_DIR}/all-signals.h include/${CUSTOM_HEADER_DIR}/tracer-real-time.h
include/${CUSTOM_HEADER_DIR}/signal-helper.h include/${CUSTOM_HEADER_DIR}/command.h
include/${CUSTOM_HEADER_DIR}/entity-helper.h include/${CUSTOM_HEADER_DIR}/eigen-io.h
include/${CUSTOM_HEADER_DIR}/linear-algebra.h
include/${CUSTOM_HEADER_DIR}/tracer.h include/${CUSTOM_HEADER_DIR}/value.h
include/${CUSTOM_HEADER_DIR}/tracer-real-time.h include/${CUSTOM_HEADER_DIR}/command-setter.h
include/${CUSTOM_HEADER_DIR}/command-setter.t.cpp
include/${CUSTOM_HEADER_DIR}/command.h include/${CUSTOM_HEADER_DIR}/command-getter.h
include/${CUSTOM_HEADER_DIR}/eigen-io.h include/${CUSTOM_HEADER_DIR}/command-getter.t.cpp
include/${CUSTOM_HEADER_DIR}/linear-algebra.h include/${CUSTOM_HEADER_DIR}/command-direct-getter.h
include/${CUSTOM_HEADER_DIR}/value.h include/${CUSTOM_HEADER_DIR}/command-direct-setter.h
include/${CUSTOM_HEADER_DIR}/command-bind.h
include/${CUSTOM_HEADER_DIR}/command-setter.h include/${CUSTOM_HEADER_DIR}/all-commands.h
include/${CUSTOM_HEADER_DIR}/command-setter.t.cpp include/${CUSTOM_HEADER_DIR}/logger.h)
include/${CUSTOM_HEADER_DIR}/command-getter.h
include/${CUSTOM_HEADER_DIR}/command-getter.t.cpp set(${PROJECT_NAME}_SOURCES
include/${CUSTOM_HEADER_DIR}/command-direct-getter.h src/debug/debug.cpp
include/${CUSTOM_HEADER_DIR}/command-direct-setter.h src/debug/real-time-logger.cpp
include/${CUSTOM_HEADER_DIR}/command-bind.h src/debug/logger.cpp
include/${CUSTOM_HEADER_DIR}/all-commands.h src/dgraph/entity.cpp
src/dgraph/factory.cpp
include/${CUSTOM_HEADER_DIR}/logger.h src/dgraph/pool.cpp
) src/exception/exception-abstract.cpp
src/exception/exception-factory.cpp
SET(${PROJECT_NAME}_SOURCES src/exception/exception-signal.cpp
src/debug/debug.cpp src/exception/exception-traces.cpp
src/debug/real-time-logger.cpp src/mt/process-list.cpp
src/debug/logger.cpp src/signal/signal-array.cpp
src/command/value.cpp
src/dgraph/entity.cpp src/command/command.cpp)
src/dgraph/factory.cpp
src/dgraph/pool.cpp add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES}
${${PROJECT_NAME}_HEADERS})
src/exception/exception-abstract.cpp modernize_target_link_libraries(
src/exception/exception-factory.cpp ${PROJECT_NAME}
src/exception/exception-signal.cpp SCOPE
src/exception/exception-traces.cpp PUBLIC
TARGETS
src/mt/process-list.cpp Eigen3::Eigen
INCLUDE_DIRS
src/signal/signal-array.cpp ${EIGEN3_INCLUDE_DIR})
target_include_directories(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
src/command/value.cpp target_link_libraries(${PROJECT_NAME} PUBLIC Boost::serialization Boost::system
src/command/command.cpp Boost::thread)
)
if(UNIX)
ADD_LIBRARY(${PROJECT_NAME} SHARED target_link_libraries(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} pthread)
${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS}) endif(UNIX)
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR})
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>) if(SUFFIX_SO_VERSION)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC Boost::serialization Boost::system Boost::thread) set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
endif(SUFFIX_SO_VERSION)
IF(UNIX)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${CMAKE_DL_LIBS} pthread) install(
ENDIF(UNIX) TARGETS ${PROJECT_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
IF(SUFFIX_SO_VERSION) DESTINATION lib)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
ENDIF(SUFFIX_SO_VERSION) set(DYNAMIC_GRAPH_PLUGINDIR "lib/${PROJECT_NAME}-plugins")
set(PACKAGE_EXTRA_MACROS
INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${TARGETS_EXPORT_NAME} DESTINATION lib) "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})")
set(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}")
SET(DYNAMIC_GRAPH_PLUGINDIR "lib/${PROJECT_NAME}-plugins") add_subdirectory(src)
SET(PACKAGE_EXTRA_MACROS "set(DYNAMIC_GRAPH_PLUGINDIR ${DYNAMIC_GRAPH_PLUGINDIR})") if(BUILD_TESTING)
SET(PKG_CONFIG_EXTRA "plugindir=${DYNAMIC_GRAPH_PLUGINDIR}") add_subdirectory(tests)
endif(BUILD_TESTING)
ADD_SUBDIRECTORY(src)
IF(BUILD_TESTING) pkg_config_append_libs(${PROJECT_NAME})
ADD_SUBDIRECTORY(tests) install(FILES package.xml DESTINATION share/${PROJECT_NAME})
ENDIF(BUILD_TESTING)
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})
Subproject commit e77c9c32b1d69b21e447cf64f1ad1590aab61159 Subproject commit 72d1acd6e6879eaf73a554c1070b6d46a4ac30ff
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="3"> <package format="3">
<name>dynamic-graph</name> <name>dynamic-graph</name>
<version>4.4.1</version> <version>4.4.2</version>
<description> <description>
Dynamic graph library Dynamic graph library
</description> </description>
......
SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
SET(plugins set(plugins traces/tracer traces/tracer-real-time)
traces/tracer
traces/tracer-real-time
)
SET(tracer-real-time_deps tracer) set(tracer-real-time_deps tracer)
FOREACH(plugin ${plugins}) foreach(plugin ${plugins})
GET_FILENAME_COMPONENT(LIBRARY_NAME ${plugin} NAME) get_filename_component(LIBRARY_NAME ${plugin} NAME)
ADD_LIBRARY(${LIBRARY_NAME} SHARED "${plugin}.cpp") add_library(${LIBRARY_NAME} SHARED "${plugin}.cpp")
IF(SUFFIX_SO_VERSION) if(SUFFIX_SO_VERSION)
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION}) set_target_properties(${LIBRARY_NAME} PROPERTIES SOVERSION
ENDIF(SUFFIX_SO_VERSION) ${PROJECT_VERSION})
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH $ORIGIN) endif(SUFFIX_SO_VERSION)
set_target_properties(${LIBRARY_NAME} PROPERTIES INSTALL_RPATH $ORIGIN)
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${PROJECT_NAME} ${${LIBRARY_NAME}_deps}) target_link_libraries(${LIBRARY_NAME} PUBLIC ${PROJECT_NAME}
${${LIBRARY_NAME}_deps})
INSTALL(TARGETS ${LIBRARY_NAME} EXPORT ${TARGETS_EXPORT_NAME} install(
TARGETS ${LIBRARY_NAME}
EXPORT ${TARGETS_EXPORT_NAME}
DESTINATION ${DYNAMIC_GRAPH_PLUGINDIR}) DESTINATION ${DYNAMIC_GRAPH_PLUGINDIR})
ENDFOREACH(plugin) endforeach(plugin)
# Copyright 2010-2020, Olivier Stasse, Guilhem Saurel, JRL, CNRS/AIST, LAAS-CNRS # Copyright 2010-2020, Olivier Stasse, Guilhem Saurel, JRL, CNRS/AIST, LAAS-CNRS
ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) add_definitions(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN)
ADD_DEFINITIONS(-DTESTS_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data") add_definitions(-DTESTS_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
ADD_DEFINITIONS(-DTESTS_PLUGINDIR="${LIBRARY_OUTPUT_PATH}") add_definitions(-DTESTS_PLUGINDIR="${LIBRARY_OUTPUT_PATH}")
ADD_DEFINITIONS(-DTESTS_DYNLIBSUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}") add_definitions(-DTESTS_DYNLIBSUFFIX="${CMAKE_SHARED_LIBRARY_SUFFIX}")
MACRO(DYNAMIC_GRAPH_TEST NAME) macro(DYNAMIC_GRAPH_TEST NAME)
ADD_UNIT_TEST(${NAME} "${NAME}.cpp") add_unit_test(${NAME} "${NAME}.cpp")
TARGET_LINK_LIBRARIES(${NAME} PRIVATE ${PROJECT_NAME} Boost::unit_test_framework) target_link_libraries(${NAME} PRIVATE ${PROJECT_NAME}
ENDMACRO(DYNAMIC_GRAPH_TEST) Boost::unit_test_framework)
endmacro(DYNAMIC_GRAPH_TEST)
# Signal cast test. # Signal cast test.
SET(signalcast_libs signal-cast-registerer-libA signal-cast-registerer-libB) set(signalcast_libs signal-cast-registerer-libA signal-cast-registerer-libB)
FOREACH(lib ${signalcast_libs}) foreach(lib ${signalcast_libs})
ADD_LIBRARY(${lib} SHARED "${lib}.cpp") add_library(${lib} SHARED "${lib}.cpp")
TARGET_LINK_LIBRARIES(${lib} PRIVATE ${PROJECT_NAME}) target_link_libraries(${lib} PRIVATE ${PROJECT_NAME})
ENDFOREACH() endforeach()
DYNAMIC_GRAPH_TEST(signal-cast-registerer) dynamic_graph_test(signal-cast-registerer)
# Unit testing. # Unit testing.
IF(NOT APPLE) if(NOT APPLE)
DYNAMIC_GRAPH_TEST(entity) dynamic_graph_test(entity)
ENDIF(NOT APPLE) endif(NOT APPLE)
DYNAMIC_GRAPH_TEST(custom-entity) dynamic_graph_test(custom-entity)
DYNAMIC_GRAPH_TEST(factory) dynamic_graph_test(factory)
DYNAMIC_GRAPH_TEST(pool) dynamic_graph_test(pool)
DYNAMIC_GRAPH_TEST(signal-time-dependent) dynamic_graph_test(signal-time-dependent)
DYNAMIC_GRAPH_TEST(value) dynamic_graph_test(value)
DYNAMIC_GRAPH_TEST(signal-ptr) dynamic_graph_test(signal-ptr)
DYNAMIC_GRAPH_TEST(real-time-logger) dynamic_graph_test(real-time-logger)
DYNAMIC_GRAPH_TEST(debug-trace) dynamic_graph_test(debug-trace)
DYNAMIC_GRAPH_TEST(debug-tracer) dynamic_graph_test(debug-tracer)
TARGET_LINK_LIBRARIES(debug-tracer PRIVATE tracer) target_link_libraries(debug-tracer PRIVATE tracer)
DYNAMIC_GRAPH_TEST(debug-real-time-tracer) dynamic_graph_test(debug-real-time-tracer)
TARGET_LINK_LIBRARIES(debug-real-time-tracer PRIVATE tracer-real-time tracer) target_link_libraries(debug-real-time-tracer PRIVATE tracer-real-time tracer)
DYNAMIC_GRAPH_TEST(debug-logger) dynamic_graph_test(debug-logger)
DYNAMIC_GRAPH_TEST(debug-logger-winit) dynamic_graph_test(debug-logger-winit)
DYNAMIC_GRAPH_TEST(signal-all) dynamic_graph_test(signal-all)
DYNAMIC_GRAPH_TEST(command-test) dynamic_graph_test(command-test)
DYNAMIC_GRAPH_TEST(test-mt) dynamic_graph_test(test-mt)
TARGET_LINK_LIBRARIES(test-mt PRIVATE tracer) target_link_libraries(test-mt PRIVATE tracer)
DYNAMIC_GRAPH_TEST(exceptions) dynamic_graph_test(exceptions)
...@@ -45,11 +45,9 @@ class DummyClass { ...@@ -45,11 +45,9 @@ class DummyClass {
++call; ++call;
timedata = t; timedata = t;
BOOST_FOREACH (sigDouble_t *ptr, inputsig) BOOST_FOREACH (sigDouble_t *ptr, inputsig) ptr->access(timedata);
ptr->access(timedata);
BOOST_FOREACH (sigString_t *ptr, inputsigV) BOOST_FOREACH (sigString_t *ptr, inputsigV) ptr->access(timedata);
ptr->access(timedata);
res = (*this)(); res = (*this)();
return res; return res;
......
...@@ -34,11 +34,9 @@ class DummyClass { ...@@ -34,11 +34,9 @@ class DummyClass {
++call; ++call;
timedata = t; timedata = t;
BOOST_FOREACH (sigDouble_t *ptr, inputsig) BOOST_FOREACH (sigDouble_t *ptr, inputsig) ptr->access(timedata);
ptr->access(timedata);
BOOST_FOREACH (sigString_t *ptr, inputsigV) BOOST_FOREACH (sigString_t *ptr, inputsigV) ptr->access(timedata);
ptr->access(timedata);
res = (*this)(); res = (*this)();
return res; return res;
......