From 561acdbdffd1ebd364391c22d7ea5a9a8121edfd Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 3 Jul 2025 07:58:50 +0200 Subject: [PATCH 01/87] Services & Actions Signed-off-by: Eugenio Collado --- ddsenabler/examples/CMakeLists.txt | 38 +- ddsenabler/examples/action/CLIParser.hpp | 276 +++++++ ddsenabler/examples/action/CMakeLists.txt | 49 ++ ddsenabler/examples/action/Readme.md | 19 + ddsenabler/examples/{ => action}/config.yml | 0 ddsenabler/examples/action/main.cpp | 683 ++++++++++++++++ .../persistence/actions/fibonacci__action_ | 19 + ddsenabler/examples/persistence/goals/1 | 3 + ddsenabler/examples/persistence/goals/2 | 3 + ddsenabler/examples/persistence/goals/3 | 3 + ddsenabler/examples/persistence/requests/1 | 4 + ddsenabler/examples/persistence/requests/2 | 4 + ddsenabler/examples/persistence/requests/3 | 4 + .../persistence/services/add_two_ints | 7 + ...tion_msgs__msg__dds___GoalStatusArray_.bin | Bin 0 -> 1301 bytes ...n_msgs__srv__dds___CancelGoal_Request_.bin | Bin 0 -> 1029 bytes ..._msgs__srv__dds___CancelGoal_Response_.bin | Bin 0 -> 1097 bytes ...tion__dds___Fibonacci_FeedbackMessage_.bin | Bin 0 -> 925 bytes ...on__dds___Fibonacci_GetResult_Request_.bin | Bin 0 -> 577 bytes ...n__dds___Fibonacci_GetResult_Response_.bin | Bin 0 -> 649 bytes ...ion__dds___Fibonacci_SendGoal_Request_.bin | Bin 0 -> 905 bytes ...on__dds___Fibonacci_SendGoal_Response_.bin | Bin 0 -> 625 bytes ...rfaces__srv__dds___AddTwoInts_Request_.bin | Bin 0 -> 261 bytes ...faces__srv__dds___AddTwoInts_Response_.bin | Bin 0 -> 241 bytes .../types/rcl_interfaces__msg__dds___Log_.bin | Bin 0 -> 653 bytes ...interfaces__msg__dds___ParameterEvent_.bin | Bin 0 -> 1709 bytes ...srv__dds___DescribeParameters_Request_.bin | Bin 0 -> 261 bytes ...rv__dds___DescribeParameters_Response_.bin | Bin 0 -> 1529 bytes ..._srv__dds___GetParameterTypes_Request_.bin | Bin 0 -> 261 bytes ...srv__dds___GetParameterTypes_Response_.bin | Bin 0 -> 257 bytes ...ces__srv__dds___GetParameters_Request_.bin | Bin 0 -> 253 bytes ...es__srv__dds___GetParameters_Response_.bin | Bin 0 -> 961 bytes ...es__srv__dds___ListParameters_Request_.bin | Bin 0 -> 289 bytes ...s__srv__dds___ListParameters_Response_.bin | Bin 0 -> 569 bytes ...dds___SetParametersAtomically_Request_.bin | Bin 0 -> 1277 bytes ...ds___SetParametersAtomically_Response_.bin | Bin 0 -> 589 bytes ...ces__srv__dds___SetParameters_Request_.bin | Bin 0 -> 1233 bytes ...es__srv__dds___SetParameters_Response_.bin | Bin 0 -> 557 bytes ...n__msg__dds___ParticipantEntitiesInfo_.bin | Bin 0 -> 1025 bytes ...srv__dds___GetTypeDescription_Request_.bin | Bin 0 -> 373 bytes ...rv__dds___GetTypeDescription_Response_.bin | Bin 0 -> 2685 bytes .../examples/{ => publish}/CLIParser.hpp | 2 +- ddsenabler/examples/publish/CMakeLists.txt | 49 ++ ddsenabler/examples/publish/config.yml | 26 + ddsenabler/examples/{ => publish}/main.cpp | 13 +- ddsenabler/examples/service/CLIParser.hpp | 259 +++++++ ddsenabler/examples/service/CMakeLists.txt | 49 ++ ddsenabler/examples/service/Readme.md | 19 + ddsenabler/examples/service/config.yml | 26 + ddsenabler/examples/service/main.cpp | 534 +++++++++++++ ddsenabler/include/ddsenabler/CallbackSet.hpp | 41 + ddsenabler/include/ddsenabler/DDSEnabler.hpp | 267 ++++++- ddsenabler/src/cpp/DDSEnabler.cpp | 407 ++++++++++ ddsenabler/test/DDSEnablerTester.hpp | 52 ++ .../test/ddsEnablerTests/CMakeLists.txt | 8 + .../test/ddsEnablerTests/DdsEnablerTest.cpp | 66 ++ ...tion_msgs__msg__dds___GoalStatusArray_.bin | Bin 0 -> 1301 bytes ...n_msgs__srv__dds___CancelGoal_Request_.bin | Bin 0 -> 1029 bytes ..._msgs__srv__dds___CancelGoal_Response_.bin | Bin 0 -> 1097 bytes ...tion__dds___Fibonacci_FeedbackMessage_.bin | Bin 0 -> 925 bytes ...on__dds___Fibonacci_GetResult_Request_.bin | Bin 0 -> 577 bytes ...n__dds___Fibonacci_GetResult_Response_.bin | Bin 0 -> 649 bytes ...ion__dds___Fibonacci_SendGoal_Request_.bin | Bin 0 -> 905 bytes ...on__dds___Fibonacci_SendGoal_Response_.bin | Bin 0 -> 625 bytes ...rfaces__srv__dds___AddTwoInts_Request_.bin | Bin 0 -> 261 bytes ...faces__srv__dds___AddTwoInts_Response_.bin | Bin 0 -> 241 bytes .../rcl_interfaces__msg__dds___Log_.bin | Bin 0 -> 653 bytes ...interfaces__msg__dds___ParameterEvent_.bin | Bin 0 -> 1709 bytes ...srv__dds___DescribeParameters_Request_.bin | Bin 0 -> 261 bytes ...rv__dds___DescribeParameters_Response_.bin | Bin 0 -> 1529 bytes ..._srv__dds___GetParameterTypes_Request_.bin | Bin 0 -> 261 bytes ...srv__dds___GetParameterTypes_Response_.bin | Bin 0 -> 257 bytes ...ces__srv__dds___GetParameters_Request_.bin | Bin 0 -> 253 bytes ...es__srv__dds___GetParameters_Response_.bin | Bin 0 -> 961 bytes ...es__srv__dds___ListParameters_Request_.bin | Bin 0 -> 289 bytes ...s__srv__dds___ListParameters_Response_.bin | Bin 0 -> 569 bytes ...dds___SetParametersAtomically_Request_.bin | Bin 0 -> 1277 bytes ...ds___SetParametersAtomically_Response_.bin | Bin 0 -> 589 bytes ...ces__srv__dds___SetParameters_Request_.bin | Bin 0 -> 1233 bytes ...es__srv__dds___SetParameters_Response_.bin | Bin 0 -> 557 bytes ...n__msg__dds___ParticipantEntitiesInfo_.bin | Bin 0 -> 1025 bytes ddsenabler/test/test_files/test_action.json | 19 + ddsenabler/test/test_files/test_service.json | 7 + ...srv__dds___GetTypeDescription_Request_.bin | Bin 0 -> 373 bytes ...rv__dds___GetTypeDescription_Response_.bin | Bin 0 -> 2685 bytes .../ddsenabler_participants/Callbacks.hpp | 273 +++++++ .../ddsenabler_participants/Constants.hpp | 13 + .../EnablerParticipant.hpp | 108 ++- .../ddsenabler_participants/Handler.hpp | 372 ++++++++- .../InternalRpcReader.hpp | 103 +++ .../ddsenabler_participants/RpcStructs.hpp | 328 ++++++++ .../ddsenabler_participants/RpcUtils.hpp | 127 +++ .../include/ddsenabler_participants/Utils.hpp | 120 +++ .../ddsenabler_participants/Writer.hpp | 177 +++++ .../src/cpp/EnablerParticipant.cpp | 731 ++++++++++++++++-- ddsenabler_participants/src/cpp/Handler.cpp | 508 +++++++++++- ddsenabler_participants/src/cpp/RpcUtils.cpp | 247 ++++++ .../src/cpp/Utils.cpp | 253 +++++- ddsenabler_participants/src/cpp/Writer.cpp | 600 +++++++++++++- ddsenabler_test/compose/CMakeLists.txt | 7 + .../actions/action_client/compose.yml | 34 + .../actions/action_client/config.yml | 2 + .../actions/action_client_cancel/compose.yml | 33 + .../actions/action_client_cancel/config.yml | 2 + .../actions/action_server/compose.yml | 55 ++ .../actions/action_server/config.yml | 2 + .../persistence/actions/fibonacci__action_ | 19 + .../test_cases/actions/persistence/goals/1 | 3 + .../test_cases/actions/persistence/goals/2 | 3 + .../test_cases/actions/persistence/goals/3 | 3 + .../test_cases/actions/persistence/requests/1 | 4 + .../test_cases/actions/persistence/requests/2 | 4 + .../test_cases/actions/persistence/requests/3 | 4 + ...tion_msgs__msg__dds___GoalStatusArray_.bin | Bin 0 -> 1301 bytes ...n_msgs__srv__dds___CancelGoal_Request_.bin | Bin 0 -> 1029 bytes ..._msgs__srv__dds___CancelGoal_Response_.bin | Bin 0 -> 1097 bytes ...tion__dds___Fibonacci_FeedbackMessage_.bin | Bin 0 -> 925 bytes ...on__dds___Fibonacci_GetResult_Request_.bin | Bin 0 -> 577 bytes ...n__dds___Fibonacci_GetResult_Response_.bin | Bin 0 -> 649 bytes ...ion__dds___Fibonacci_SendGoal_Request_.bin | Bin 0 -> 905 bytes ...on__dds___Fibonacci_SendGoal_Response_.bin | Bin 0 -> 625 bytes ...rfaces__srv__dds___AddTwoInts_Request_.bin | Bin 0 -> 261 bytes ...faces__srv__dds___AddTwoInts_Response_.bin | Bin 0 -> 241 bytes .../types/rcl_interfaces__msg__dds___Log_.bin | Bin 0 -> 653 bytes ...interfaces__msg__dds___ParameterEvent_.bin | Bin 0 -> 1709 bytes ...srv__dds___DescribeParameters_Request_.bin | Bin 0 -> 261 bytes ...rv__dds___DescribeParameters_Response_.bin | Bin 0 -> 1529 bytes ..._srv__dds___GetParameterTypes_Request_.bin | Bin 0 -> 261 bytes ...srv__dds___GetParameterTypes_Response_.bin | Bin 0 -> 257 bytes ...ces__srv__dds___GetParameters_Request_.bin | Bin 0 -> 253 bytes ...es__srv__dds___GetParameters_Response_.bin | Bin 0 -> 961 bytes ...es__srv__dds___ListParameters_Request_.bin | Bin 0 -> 289 bytes ...s__srv__dds___ListParameters_Response_.bin | Bin 0 -> 569 bytes ...dds___SetParametersAtomically_Request_.bin | Bin 0 -> 1277 bytes ...ds___SetParametersAtomically_Response_.bin | Bin 0 -> 589 bytes ...ces__srv__dds___SetParameters_Request_.bin | Bin 0 -> 1233 bytes ...es__srv__dds___SetParameters_Response_.bin | Bin 0 -> 557 bytes ...n__msg__dds___ParticipantEntitiesInfo_.bin | Bin 0 -> 1025 bytes ...srv__dds___GetTypeDescription_Request_.bin | Bin 0 -> 373 bytes ...rv__dds___GetTypeDescription_Response_.bin | Bin 0 -> 2685 bytes .../actions/run_action_server_timeout.sh | 20 + .../publish/discovered_type/compose.yml | 2 +- .../publish/requested_type/compose.yml | 2 +- .../reception/topics_json/compose.yml | 2 +- .../reception/topics_yaml/compose.yml | 2 +- .../test_cases/services/persistence/goals/1 | 3 + .../test_cases/services/persistence/goals/2 | 3 + .../test_cases/services/persistence/goals/3 | 3 + .../services/persistence/requests/1 | 4 + .../services/persistence/requests/2 | 4 + .../services/persistence/requests/3 | 4 + .../persistence/services/add_two_ints | 7 + ...tion_msgs__msg__dds___GoalStatusArray_.bin | Bin 0 -> 1301 bytes ...n_msgs__srv__dds___CancelGoal_Request_.bin | Bin 0 -> 1029 bytes ..._msgs__srv__dds___CancelGoal_Response_.bin | Bin 0 -> 1097 bytes ...tion__dds___Fibonacci_FeedbackMessage_.bin | Bin 0 -> 925 bytes ...on__dds___Fibonacci_GetResult_Request_.bin | Bin 0 -> 577 bytes ...n__dds___Fibonacci_GetResult_Response_.bin | Bin 0 -> 649 bytes ...ion__dds___Fibonacci_SendGoal_Request_.bin | Bin 0 -> 905 bytes ...on__dds___Fibonacci_SendGoal_Response_.bin | Bin 0 -> 625 bytes ...rfaces__srv__dds___AddTwoInts_Request_.bin | Bin 0 -> 261 bytes ...faces__srv__dds___AddTwoInts_Response_.bin | Bin 0 -> 241 bytes .../types/rcl_interfaces__msg__dds___Log_.bin | Bin 0 -> 653 bytes ...interfaces__msg__dds___ParameterEvent_.bin | Bin 0 -> 1709 bytes ...srv__dds___DescribeParameters_Request_.bin | Bin 0 -> 261 bytes ...rv__dds___DescribeParameters_Response_.bin | Bin 0 -> 1529 bytes ..._srv__dds___GetParameterTypes_Request_.bin | Bin 0 -> 261 bytes ...srv__dds___GetParameterTypes_Response_.bin | Bin 0 -> 257 bytes ...ces__srv__dds___GetParameters_Request_.bin | Bin 0 -> 253 bytes ...es__srv__dds___GetParameters_Response_.bin | Bin 0 -> 961 bytes ...es__srv__dds___ListParameters_Request_.bin | Bin 0 -> 289 bytes ...s__srv__dds___ListParameters_Response_.bin | Bin 0 -> 569 bytes ...dds___SetParametersAtomically_Request_.bin | Bin 0 -> 1277 bytes ...ds___SetParametersAtomically_Response_.bin | Bin 0 -> 589 bytes ...ces__srv__dds___SetParameters_Request_.bin | Bin 0 -> 1233 bytes ...es__srv__dds___SetParameters_Response_.bin | Bin 0 -> 557 bytes ...n__msg__dds___ParticipantEntitiesInfo_.bin | Bin 0 -> 1025 bytes ...srv__dds___GetTypeDescription_Request_.bin | Bin 0 -> 373 bytes ...rv__dds___GetTypeDescription_Response_.bin | Bin 0 -> 2685 bytes .../services/run_service_server_timeout.sh | 21 + .../services/service_client/compose.yml | 33 + .../services/service_client/config.yml | 2 + .../services/service_server/compose.yml | 54 ++ .../services/service_server/config.yml | 2 + .../src/cpp/EnablerConfiguration.cpp | 17 - 185 files changed, 7114 insertions(+), 162 deletions(-) create mode 100644 ddsenabler/examples/action/CLIParser.hpp create mode 100644 ddsenabler/examples/action/CMakeLists.txt create mode 100644 ddsenabler/examples/action/Readme.md rename ddsenabler/examples/{ => action}/config.yml (100%) create mode 100644 ddsenabler/examples/action/main.cpp create mode 100644 ddsenabler/examples/persistence/actions/fibonacci__action_ create mode 100644 ddsenabler/examples/persistence/goals/1 create mode 100644 ddsenabler/examples/persistence/goals/2 create mode 100644 ddsenabler/examples/persistence/goals/3 create mode 100644 ddsenabler/examples/persistence/requests/1 create mode 100644 ddsenabler/examples/persistence/requests/2 create mode 100644 ddsenabler/examples/persistence/requests/3 create mode 100644 ddsenabler/examples/persistence/services/add_two_ints create mode 100644 ddsenabler/examples/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin create mode 100644 ddsenabler/examples/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/action_msgs__srv__dds___CancelGoal_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin create mode 100644 ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/example_interfaces__srv__dds___AddTwoInts_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/example_interfaces__srv__dds___AddTwoInts_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___Log_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameters_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameters_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParameters_Response_.bin create mode 100644 ddsenabler/examples/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin create mode 100644 ddsenabler/examples/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin create mode 100644 ddsenabler/examples/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin rename ddsenabler/examples/{ => publish}/CLIParser.hpp (99%) create mode 100644 ddsenabler/examples/publish/CMakeLists.txt create mode 100644 ddsenabler/examples/publish/config.yml rename ddsenabler/examples/{ => publish}/main.cpp (93%) create mode 100644 ddsenabler/examples/service/CLIParser.hpp create mode 100644 ddsenabler/examples/service/CMakeLists.txt create mode 100644 ddsenabler/examples/service/Readme.md create mode 100644 ddsenabler/examples/service/config.yml create mode 100644 ddsenabler/examples/service/main.cpp create mode 100644 ddsenabler/test/test_files/action_msgs__msg__dds___GoalStatusArray_.bin create mode 100644 ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin create mode 100644 ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin create mode 100644 ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin create mode 100644 ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin create mode 100644 ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin create mode 100644 ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin create mode 100644 ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin create mode 100644 ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin create mode 100644 ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__msg__dds___Log_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin create mode 100644 ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin create mode 100644 ddsenabler/test/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin create mode 100644 ddsenabler/test/test_files/test_action.json create mode 100644 ddsenabler/test/test_files/test_service.json create mode 100644 ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin create mode 100644 ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin create mode 100644 ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp create mode 100644 ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp create mode 100644 ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp create mode 100644 ddsenabler_participants/include/ddsenabler_participants/Utils.hpp create mode 100644 ddsenabler_participants/src/cpp/RpcUtils.cpp rename ddsenabler/examples/utils.hpp => ddsenabler_participants/src/cpp/Utils.cpp (54%) create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client/config.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client_cancel/config.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_server/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_server/config.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/actions/fibonacci__action_ create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/goals/1 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/goals/2 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/goals/3 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/1 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/2 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/3 create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__srv__dds___CancelGoal_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/example_interfaces__srv__dds___AddTwoInts_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/example_interfaces__srv__dds___AddTwoInts_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___Log_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin create mode 100755 ddsenabler_test/compose/test_cases/actions/run_action_server_timeout.sh create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/1 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/2 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/3 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/requests/1 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/requests/2 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/requests/3 create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/services/add_two_ints create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__srv__dds___CancelGoal_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/example_interfaces__srv__dds___AddTwoInts_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/example_interfaces__srv__dds___AddTwoInts_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___Log_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParameters_Response_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin create mode 100644 ddsenabler_test/compose/test_cases/services/persistence/types/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin create mode 100755 ddsenabler_test/compose/test_cases/services/run_service_server_timeout.sh create mode 100644 ddsenabler_test/compose/test_cases/services/service_client/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_client/config.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_server/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_server/config.yml diff --git a/ddsenabler/examples/CMakeLists.txt b/ddsenabler/examples/CMakeLists.txt index fc89d7fe..e11940ae 100644 --- a/ddsenabler/examples/CMakeLists.txt +++ b/ddsenabler/examples/CMakeLists.txt @@ -12,38 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 3.20) -project(ddsenabler_example LANGUAGES CXX) +# Add subdirectories for examples +add_subdirectory(publish) +add_subdirectory(service) +add_subdirectory(action) -add_executable(ddsenabler_example main.cpp) - -target_link_libraries(ddsenabler_example PRIVATE ddsenabler) - -# Install rule -install(TARGETS ddsenabler_example - RUNTIME DESTINATION bin -) - -# Copy the json files over to the build directory -file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) -foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) - get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${JSON_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json - COPYONLY) - install(FILES ${JSON_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) -endforeach() - -# Copy the yaml files over to the build directory -file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) -foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) - get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${YAML_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml - COPYONLY) - install(FILES ${YAML_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) -endforeach() diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp new file mode 100644 index 00000000..3e7d2643 --- /dev/null +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -0,0 +1,276 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include +#include +#include +#include + +#include + +#pragma once + +class CLIParser +{ +public: + + CLIParser() = delete; + + struct example_config + { + std::string config_file_path = ""; + std::string action_name = "fibonacci/_action/"; + bool announce_server = true; + uint32_t timeout = 30; + std::string persistence_path = ""; + uint32_t expected_requests = 0; + uint32_t request_initial_wait = 0; + bool cancel_requests = false; + }; + + /** + * @brief Print usage help message and exit with the given return code + * + * @param return_code return code to exit with + * + * @warning This method finishes the execution of the program with the input return code + */ + static void print_help( + uint8_t return_code) + { + std::cout << "Usage: ddsenabler_example_action [options]" << std::endl; + std::cout << "" << std::endl; + std::cout << "--config Path to the configuration file" << std::endl; + std::cout << " (Default: '')" << std::endl; + std::cout << "--action-name Name of the action to be registered" << std::endl; + std::cout << " (Default: 'Fibonacci/_action/')" << std::endl; + std::cout << "--announce-server Whether to be server or client" << std::endl; + std::cout << " (Default: true)" << std::endl; + std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; + std::cout << " program if expectations are not met" << std::endl; + std::cout << " (Default: 30)" << std::endl; + std::cout << "--persistence-path Path to the persistence directory" << std::endl; + std::cout << " (Default: '')" << std::endl; + std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; + std::cout << "--expected-requests Number of requests expected to be received" << std::endl; + std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; + std::cout << "--request-initial-wait Time (seconds) to wait before starting" << std::endl; + std::cout << " requests publication since server matching" << std::endl; + std::cout << " (Default: 0)" << std::endl; + std::cout << "--cancel-requests Whether to cancel requests after sending them" << std::endl; + std::cout << " (Default: false)" << std::endl; + std::exit(return_code); + } + + /** + * @brief Parse the command line options and return the configuration_config object + * + * @param argc number of arguments + * @param argv array of arguments + * @return configuration_config object with the parsed options + * + * @warning This method finishes the execution of the program if the input arguments are invalid + */ + static example_config parse_cli_options( + int argc, + char* argv[]) + { + example_config config; + + if (argc < 2) + { + std::cerr << "Configuration file path is required" << std::endl; + print_help(EXIT_FAILURE); + } + + for (int i = 1; i < argc; ++i) + { + std::string arg = argv[i]; + + if (arg == "-h" || arg == "--help") + { + print_help(EXIT_SUCCESS); + } + else if (arg == "--config") + { + if (++i < argc) + { + config.config_file_path = argv[i]; + if (!std::filesystem::exists(config.config_file_path)) + { + std::cerr << "Invalid configuration file path: " << config.config_file_path << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --config argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--action-name") + { + if (++i < argc) + { + config.action_name = argv[i]; + } + else + { + std::cerr << "Failed to parse --action-name argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--announce-server") + { + if (++i < argc) + { + config.announce_server = (std::string(argv[i]) == "true") || + (std::string(argv[i]) == "True") || + (std::string(argv[i]) == "1"); + } + else + { + std::cerr << "Failed to parse --announce-server argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--timeout") + { + if (++i < argc) + { + try + { + config.timeout = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --timeout argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --timeout argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--persistence-path") + { + if (++i < argc) + { + config.persistence_path = argv[i]; + } + else + { + std::cerr << "Failed to parse --persistence-path argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--expected-requests") + { + if (++i < argc) + { + try + { + config.expected_requests = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --expected-requests argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--request-initial-wait") + { + if (++i < argc) + { + try + { + config.request_initial_wait = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --request-initial-wait argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--cancel-requests") + { + if (++i < argc) + { + config.cancel_requests = (std::string(argv[i]) == "true") || + (std::string(argv[i]) == "True") || + (std::string(argv[i]) == "1"); + } + else + { + std::cerr << "Failed to parse --cancel-requests argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse unknown argument: " << arg << std::endl; + print_help(EXIT_FAILURE); + } + } + + if (config.config_file_path.empty()) + { + std::cerr << "Configuration file path is required" << std::endl; + print_help(EXIT_FAILURE); + } + + return config; + } + + /** + * @brief Parse the signal number into the signal name + * + * @param signum signal number + * @return std::string signal name + */ + static std::string parse_signal( + const int& signum) + { + switch (signum) + { + case SIGINT: + return "SIGINT"; + case SIGTERM: + return "SIGTERM"; +#ifndef _WIN32 + case SIGQUIT: + return "SIGQUIT"; + case SIGHUP: + return "SIGHUP"; +#endif // _WIN32 + default: + return "UNKNOWN SIGNAL"; + } + } + +}; diff --git a/ddsenabler/examples/action/CMakeLists.txt b/ddsenabler/examples/action/CMakeLists.txt new file mode 100644 index 00000000..d047b32e --- /dev/null +++ b/ddsenabler/examples/action/CMakeLists.txt @@ -0,0 +1,49 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.20) +project(ddsenabler_example_action LANGUAGES CXX) + +add_executable(ddsenabler_example_action main.cpp) + +target_link_libraries(ddsenabler_example_action PRIVATE ddsenabler) + +# Install rule +install(TARGETS ddsenabler_example_action + RUNTIME DESTINATION bin +) + +# Copy the json files over to the build directory +file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) +foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) + get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${JSON_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json + COPYONLY) + install(FILES ${JSON_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() + +# Copy the yaml files over to the build directory +file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) +foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) + get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${YAML_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml + COPYONLY) + install(FILES ${YAML_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md new file mode 100644 index 00000000..6a892efd --- /dev/null +++ b/ddsenabler/examples/action/Readme.md @@ -0,0 +1,19 @@ +# Service Example Readme + +This example demonstrates the usage of the FIWARE DDS Enabler for implementing a service. The example includes a client and a server setup for the desired service. + +By default, the example is prepared for the `Fibonacci` service, providing a standard reply with a constant result of the Fibonacci sequence of order 5 for any request. + +Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The Persistence/goals directory must be modified to suit the specific action type and its expected goal requests. + +## Example Commands + +### CLIENT +```bash +./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +``` + +### SERVER +```bash +./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +``` \ No newline at end of file diff --git a/ddsenabler/examples/config.yml b/ddsenabler/examples/action/config.yml similarity index 100% rename from ddsenabler/examples/config.yml rename to ddsenabler/examples/action/config.yml diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp new file mode 100644 index 00000000..be9edb57 --- /dev/null +++ b/ddsenabler/examples/action/main.cpp @@ -0,0 +1,683 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file main.cpp + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ddsenabler_participants/Utils.hpp" + +#include "ddsenabler/dds_enabler_runner.hpp" +#include "ddsenabler/DDSEnabler.hpp" + +#include "CLIParser.hpp" + +CLIParser::example_config config; +bool action_discovered_ = false; +uint32_t received_results_ = 0; +std::vector> received_requests_; +std::mutex app_mutex_; +std::condition_variable app_cv_; +bool stop_app_ = false; + +const std::string REQUESTS_SUBDIR = "goals"; +const std::string TYPES_SUBDIR = "types"; +const std::string ACTION_SUBDIR = "actions"; + +// Static log callback +void test_log_callback( + const char* file_name, + int line_no, + const char* func_name, + int category, + const char* msg) +{ + // NOTE: Default stdout logs can be disabled via configuration ("logging": {"stdout": false}) to avoid duplicated traces + + std::stringstream ss; + ss << file_name << ":" << line_no << " (" << func_name << "): " << msg << std::endl; + if (category == eprosima::utils::Log::Kind::Warning) + { + std::cerr << "[WARNING] " << ss.str(); + } + else if (category == eprosima::utils::Log::Kind::Error) + { + std::cerr << "[ERROR] " << ss.str(); + } +} + +// Static type notification callback +static void test_type_notification_callback( + const char* type_name, + const char* serialized_type, + const unsigned char* serialized_type_internal, + uint32_t serialized_type_internal_size, + const char* data_placeholder) +{ + std::lock_guard lock(app_mutex_); + std::cout << "Type callback received: " << type_name << std::endl; + if (!config.persistence_path.empty() && + !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + serialized_type_internal, serialized_type_internal_size)) + { + std::cerr << "Failed to save type: " << type_name << std::endl; + } +} + +// Static type query callback +static bool test_type_query_callback( + const char* type_name, + std::unique_ptr& serialized_type_internal, + uint32_t& serialized_type_internal_size) +{ + if (config.persistence_path.empty()) + { + std::cerr << "Persistence path is not set, cannot query type: " << type_name << std::endl; + return false; + } + + // Load the type from file + if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + serialized_type_internal, serialized_type_internal_size)) + { + std::cerr << "Failed to load type: " << type_name << std::endl; + return false; + } + return true; +} + +// Static data notification callback +static void test_data_notification_callback( + const char* topic_name, + const char* json, + int64_t publish_time) +{ +} + +// Static topic notification callback +static void test_topic_notification_callback( + const char* topic_name, + const char* type_name, + const char* serialized_qos) +{ +} + +// Static type query callback +static bool test_topic_query_callback( + const char* topic_name, + std::string& type_name, + std::string& serialized_qos) +{ + return false; +} + +// Static action notification callback +static void test_action_notification_callback( + const char* action_name, + const char* goal_request_action_type, + const char* goal_reply_action_type, + const char* cancel_request_action_type, + const char* cancel_reply_action_type, + const char* result_request_action_type, + const char* result_reply_action_type, + const char* feedback_action_type, + const char* status_action_type, + const char* goal_request_action_serialized_qos, + const char* goal_reply_action_serialized_qos, + const char* cancel_request_action_serialized_qos, + const char* cancel_reply_action_serialized_qos, + const char* result_request_action_serialized_qos, + const char* result_reply_action_serialized_qos, + const char* feedback_action_serialized_qos, + const char* status_action_serialized_qos) +{ + std::lock_guard lock(app_mutex_); + if (config.action_name == std::string(action_name)) + { + std::cout << "Action callback received: " << action_name << std::endl; + + std::string action_file = (std::filesystem::path( + config.persistence_path) / + ACTION_SUBDIR + ).string(); + if (!config.persistence_path.empty()) + { + eprosima::ddsenabler::participants::utils::save_action_to_file( + action_file, + action_name, + goal_request_action_type, + goal_reply_action_type, + cancel_request_action_type, + cancel_reply_action_type, + result_request_action_type, + result_reply_action_type, + feedback_action_type, + status_action_type, + goal_request_action_serialized_qos, + goal_reply_action_serialized_qos, + cancel_request_action_serialized_qos, + cancel_reply_action_serialized_qos, + result_request_action_serialized_qos, + result_reply_action_serialized_qos, + feedback_action_serialized_qos, + status_action_serialized_qos); + + action_discovered_ = true; + app_cv_.notify_all(); + } + } +} + +// Static action query callback +static bool test_action_query_callback( + const char* action_name, + std::string& goal_request_action_type, + std::string& goal_reply_action_type, + std::string& cancel_request_action_type, + std::string& cancel_reply_action_type, + std::string& result_request_action_type, + std::string& result_reply_action_type, + std::string& feedback_action_type, + std::string& status_action_type, + std::string& goal_request_action_serialized_qos, + std::string& goal_reply_action_serialized_qos, + std::string& cancel_request_action_serialized_qos, + std::string& cancel_reply_action_serialized_qos, + std::string& result_request_action_serialized_qos, + std::string& result_reply_action_serialized_qos, + std::string& feedback_action_serialized_qos, + std::string& status_action_serialized_qos) +{ + std::lock_guard lock(app_mutex_); + if (config.action_name == std::string(action_name)) + { + std::cout << "Action query callback received: " << action_name << std::endl; + + if (!config.persistence_path.empty()) + { + std::string action_file = (std::filesystem::path( + config.persistence_path) / + ACTION_SUBDIR + ).string(); + if (!eprosima::ddsenabler::participants::utils::load_action_from_file( + action_file, + action_name, + goal_request_action_type, + goal_reply_action_type, + cancel_request_action_type, + cancel_reply_action_type, + result_request_action_type, + result_reply_action_type, + feedback_action_type, + status_action_type, + goal_request_action_serialized_qos, + goal_reply_action_serialized_qos, + cancel_request_action_serialized_qos, + cancel_reply_action_serialized_qos, + result_request_action_serialized_qos, + result_reply_action_serialized_qos, + feedback_action_serialized_qos, + status_action_serialized_qos)) + { + std::cerr << "Failed to load action: " << action_name << std::endl; + return false; + } + return true; + } + } + return false; +} + +// Static action goal request notification callback +static bool test_action_goal_request_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + if (config.action_name == std::string(action_name)) + { + std::cout << "Action goal request callback received: " << action_name << std::endl; + received_requests_.emplace_back(goal_id, json); + app_cv_.notify_all(); + return true; + } + return false; +} + +// Static action result notification callback +static void test_action_result_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + std::cout << "Action result callback received: " << action_name << std::endl; + received_results_++; + app_cv_.notify_all(); +} + +// Static action feedback notification callback +static void test_action_feedback_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + std::cout << "Action feedback callback received for action: " << action_name + << " with UUID: " << goal_id << std::endl; +} + +// Static action status notification callback +static void test_action_status_notification_callback( + const char* action_name, + const eprosima::ddsenabler::participants::UUID& goal_id, + eprosima::ddsenabler::participants::STATUS_CODE statusCode, + const char* statusMessage, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + std::cout << "Action status callback received: " << statusCode << ": " << statusMessage << std::endl; +} + +// Static action cancel request notification callback +static void test_action_cancel_request_notification_callback( + const char* action_name, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t timestamp, + uint64_t request_id, + int64_t publish_time) +{ + // NOT IMPLEMENTED +} + +void init_persistence( + const std::string& persistence_path) +{ + auto ensure_directory_exists = [](const std::filesystem::path& path) + { + if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) + { + std::cerr << "Failed to create directory: " << path << std::endl; + } + }; + + if (!persistence_path.empty()) + { + ensure_directory_exists(persistence_path); + std::vector subdirs = {TYPES_SUBDIR, ACTION_SUBDIR}; + if (config.announce_server) + { + subdirs.push_back(REQUESTS_SUBDIR); + } + for (const auto& sub : subdirs) + { + ensure_directory_exists(std::filesystem::path(persistence_path) / sub); + } + } +} + +void get_sorted_files( + const std::string& directory, + std::vector>& files) +{ + for (const auto& entry : std::filesystem::directory_iterator(directory)) + { + if (entry.is_regular_file()) + { + std::string filename = entry.path().filename().string(); + try + { + // assumes name is just a number + files.emplace_back(entry.path(), static_cast(std::stoll(filename))); + } + catch (const std::invalid_argument& e) + { + std::cerr << "Skipping non-numeric file: " << filename << std::endl; + } + } + } + + // Sort files by numeric value + std::sort(files.begin(), files.end(), + [](const auto& a, const auto& b) + { + return a.second < b.second; + }); +} + +bool wait_for_action_discovery( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + []() + { + return action_discovered_; + })) + { + std::cerr << "Timeout waiting for service discovery." << std::endl; + return false; + } + return true; +} + +bool wait_for_action_request( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + []() + { + return !received_requests_.empty(); + })) + { + std::cerr << "Timeout waiting for service request." << std::endl; + return false; + } + return true; +} + +bool wait_for_action_result( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv, + uint32_t sent_requests) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + [&sent_requests]() + { + return received_results_ >= sent_requests; + })) + { + std::cerr << "Timeout waiting for action result." << std::endl; + return false; + } + return true; +} + + +bool client_routine( + std::shared_ptr enabler, + const std::string& action_name, + const std::string& goal_path, + uint32_t timeout, + uint32_t request_initial_wait, + bool cancel_requests, + std::mutex& app_mutex, + std::condition_variable& app_cv, + bool& stop_app) +{ + // Wait for service to be discovered + if (!wait_for_action_discovery(timeout, app_mutex, app_cv)) + { + std::cerr << "Failed to discover service: " << action_name << std::endl; + return false; + } + + // Wait a bit before starting to publish so types and topics can be discovered + std::this_thread::sleep_for(std::chrono::seconds(request_initial_wait)); + + // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) + std::vector> sample_files; + get_sorted_files(goal_path, sample_files); + uint32_t sent_requests = 0; + for (const auto& [path, number] : sample_files) + { + eprosima::ddsenabler::participants::UUID request_id; + std::ifstream file(path, std::ios::binary); + if (file) + { + std::string file_content((std::istreambuf_iterator(file)), std::istreambuf_iterator()); + if (enabler->send_action_goal(action_name, file_content, request_id)) + { + std::cout << "Published content from file: " << path.filename() << " in service: " + << action_name << " with request ID: " << request_id << std::endl; + sent_requests++; + } + else + { + std::cerr << "Failed to publish content from file: " << path.filename() << " in service: " + << action_name << std::endl; + return false; + } + } + else + { + std::cerr << "Failed to open file: " << path << std::endl; + } + if (cancel_requests) + { + std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time + // Cancel the request after sending it + if (!enabler->cancel_action_goal(action_name, request_id)) + { + std::cerr << "Failed to send action cancel request for ID: " << request_id << std::endl; + return false; + } + std::cout << "Sent cancel request for action: " << action_name << " with ID: " << request_id << std::endl; + } + + // Wait publish period or until stop signal is received + else if (!wait_for_action_result(timeout, app_mutex, app_cv, sent_requests)) + { + std::cerr << "Failed to receive service reply." << std::endl; + return false; + } + } + return true; +} + +bool server_specific_logic( + std::shared_ptr enabler, + const std::string& action_name, + uint64_t fibonacci_number, + const eprosima::ddsenabler::participants::UUID& request_id) +{ + std::vector fibonacci_sequence = {0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610}; + std::string json = "{\"sequence\": ["; + std::string feedback_json = "{\"partial_sequence\": ["; + for (size_t i = 0; i < fibonacci_number; ++i) + { + json += std::to_string(fibonacci_sequence[i]); + feedback_json += std::to_string(fibonacci_sequence[i]); + + std::string feedback_tmp = feedback_json; + feedback_tmp += "]}"; + if (!enabler->send_action_feedback( + action_name.c_str(), + feedback_tmp.c_str(), + request_id)) + { + std::cerr << "Failed to send action feedback" << std::endl; + return false; + } + std::this_thread::sleep_for(std::chrono::milliseconds(500)); + if (i != fibonacci_number - 1) + { + json += ", "; + feedback_json += ", "; + } + } + json += "]}"; + + if (!enabler->send_action_result( + action_name.c_str(), + request_id, + eprosima::ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED, + json.c_str())) + { + std::cerr << "Failed to send action result" << std::endl; + return false; + } + + return true; +} + +bool server_routine( + std::shared_ptr enabler, + const std::string& action_name, + uint32_t expected_requests, + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv, + bool& stop_app) +{ + // Announce action + if (!enabler->announce_action(action_name)) + { + std::cerr << "Failed to announce action: " << action_name << std::endl; + return false; + } + + std::cout << "Action announced: " << action_name << std::endl; + + while (true) + { + if (!wait_for_action_request(timeout, app_mutex, app_cv)) + { + std::cerr << "Timeout waiting for action request." << std::endl; + return false; + } + + // Pop the last request from the received requests vector + eprosima::ddsenabler::participants::UUID request_id = received_requests_.back().first; + std::string goal_json = received_requests_.back().second; + uint64_t fibonacci_number = 5; // Default Fibonacci number, can be parsed from json if needed + received_requests_.pop_back(); + std::cout << "Received request for action: " << action_name << " with request ID: " << request_id << std::endl; + std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time + + // Send Feedback & Result + if(!server_specific_logic( + enabler, + action_name, + fibonacci_number, + request_id)) + { + std::cerr << "Failed to process action: " << action_name << " with request ID: " << request_id << std::endl; + return false; + } + + // Check if we have received the expected number of requests + { + std::lock_guard lock(app_mutex); + if (++received_results_ >= expected_requests) + { + break; + } + } + } + + // Revoke service + if (!enabler->revoke_action(action_name)) + { + std::cerr << "Failed to revoke service: " << action_name << std::endl; + return false; + } + + return true; +} + +void signal_handler( + int signum) +{ + std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; + { + std::lock_guard lock(app_mutex_); + stop_app_ = true; + } + app_cv_.notify_all(); +} + +int main( + int argc, + char** argv) +{ + using namespace eprosima::ddsenabler; + + eprosima::utils::Log::ReportFilenames(true); + + // Parse CLI options + config = CLIParser::parse_cli_options(argc, argv); + + // Initialize persistence if required + init_persistence(config.persistence_path); + + // Set up callbacks + CallbackSet callbacks{ + test_log_callback, + { + test_type_notification_callback, + test_topic_notification_callback, + test_data_notification_callback, + test_type_query_callback, + test_topic_query_callback + }, + { + // NOTE: Service callbacks are not used in this example, but can be added if needed + }, + { + test_action_notification_callback, + test_action_goal_request_notification_callback, + test_action_feedback_notification_callback, + test_action_cancel_request_notification_callback, + test_action_result_notification_callback, + test_action_status_notification_callback, + test_action_query_callback + } + }; + + std::shared_ptr enabler; + if (!create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler)) + { + std::cerr << "Failed to create DDSEnabler instance." << std::endl; + return EXIT_FAILURE; + } + + bool ret = false; + // Service logic based on announce_server flag + if (config.announce_server) + { + + ret = server_routine(enabler, config.action_name, config.expected_requests, config.timeout, app_mutex_, app_cv_, stop_app_); + } + else + { + auto goal_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); + ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, config.cancel_requests, app_mutex_, app_cv_, stop_app_); + } + + return ret ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/ddsenabler/examples/persistence/actions/fibonacci__action_ b/ddsenabler/examples/persistence/actions/fibonacci__action_ new file mode 100644 index 00000000..22db6867 --- /dev/null +++ b/ddsenabler/examples/persistence/actions/fibonacci__action_ @@ -0,0 +1,19 @@ +{ + "action_name": "fibonacci/_action/", + "cancel_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "cancel_reply_action_type": "action_msgs::srv::dds_::CancelGoal_Response_", + "cancel_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "cancel_request_action_type": "action_msgs::srv::dds_::CancelGoal_Request_", + "feedback_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "feedback_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_FeedbackMessage_", + "goal_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "goal_reply_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_SendGoal_Response_", + "goal_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "goal_request_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_SendGoal_Request_", + "result_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "result_reply_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_GetResult_Response_", + "result_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "result_request_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_GetResult_Request_", + "status_action_serialized_qos": "reliability: true\ndurability: true\nownership: false\nkeyed: false", + "status_action_type": "action_msgs::msg::dds_::GoalStatusArray_" +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/goals/1 b/ddsenabler/examples/persistence/goals/1 new file mode 100644 index 00000000..8402bb25 --- /dev/null +++ b/ddsenabler/examples/persistence/goals/1 @@ -0,0 +1,3 @@ +{ + "order": 3 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/goals/2 b/ddsenabler/examples/persistence/goals/2 new file mode 100644 index 00000000..461fa735 --- /dev/null +++ b/ddsenabler/examples/persistence/goals/2 @@ -0,0 +1,3 @@ +{ + "order": 5 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/goals/3 b/ddsenabler/examples/persistence/goals/3 new file mode 100644 index 00000000..853b8317 --- /dev/null +++ b/ddsenabler/examples/persistence/goals/3 @@ -0,0 +1,3 @@ +{ + "order": 7 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/requests/1 b/ddsenabler/examples/persistence/requests/1 new file mode 100644 index 00000000..0fbddba4 --- /dev/null +++ b/ddsenabler/examples/persistence/requests/1 @@ -0,0 +1,4 @@ +{ + "a": 1, + "b": 2 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/requests/2 b/ddsenabler/examples/persistence/requests/2 new file mode 100644 index 00000000..9e5938e4 --- /dev/null +++ b/ddsenabler/examples/persistence/requests/2 @@ -0,0 +1,4 @@ +{ + "a": 2, + "b": 3 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/requests/3 b/ddsenabler/examples/persistence/requests/3 new file mode 100644 index 00000000..fe99b20a --- /dev/null +++ b/ddsenabler/examples/persistence/requests/3 @@ -0,0 +1,4 @@ +{ + "a": 3, + "b": 4 +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/services/add_two_ints b/ddsenabler/examples/persistence/services/add_two_ints new file mode 100644 index 00000000..5af99fa0 --- /dev/null +++ b/ddsenabler/examples/persistence/services/add_two_ints @@ -0,0 +1,7 @@ +{ + "reply_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "reply_type_name": "example_interfaces::srv::dds_::AddTwoInts_Response_", + "request_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "request_type_name": "example_interfaces::srv::dds_::AddTwoInts_Request_", + "service_name": "add_two_ints" +} \ No newline at end of file diff --git a/ddsenabler/examples/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin b/ddsenabler/examples/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b2666b485208d5c75e4eaddcea453f1b4ca49c5 GIT binary patch literal 1301 zcmb7EOOo0!5Ope*L*xi47K6=a3{|s`Z2TdE85{h;8_J)60U12l4A{4rBV?H)o88F580emB!1}Oq*Y(C%NvlOmEfnwx)&9!vkFse$qEtBZQvD4zf{2NBmJ->hUJ^ zNtx>86iDQh>Ruh@+BOU({b?>XVRPt*y3+*IdpfB?PiA{9$cIcYGcf!aA&k%n#);%@ zuOEHpZLoCx%s0ikc8WU|S)6$k)cGOY;uUw+#|kdQvAJGNHNVL3UHyjp56!uQ^c?py zKZ#le>c-ik;}o&fTg8F3Pbfa{(`~T}4QoZc5ldP*^Lu$L0%p8m`vJGYhiq=E^+{Lp zJ+U8c>uKZ7e4=KI7iL0fkj2`d2w5;fW9At}7(G3@nJdqaFO%wSqXlwnQLBt6$d8*; z*Q$iY^FDrvAL+`^FJzFFXP1a_e@Z-W<~l2uLt#}@DIjEA`wI!tSZ&xkmxv8m zG2k^kG4dI3^kE%zt~j4Z6GO|?u34?`_Jv~B3B|*4{-#OSke=f#c@5Mm@bP^*a63+x z8eS8eF>fK$0lNe|9o2zx7@7Ls-EFYk^`bnkY^Ia%5OC8$oQE$k*BIQZ4$v9y1?9nN zF9JtQ{&B|Z|3>S7@BaY!WB&tEEAw-2o3?gA;ca8lxwLM4{Gu@_l>T<#-*qo;eAvOb nUIc{qU1fM#-yi=|gORD$fLVUCM`!|T$&Fv>QY0O&1y=80o(g{o literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin b/ddsenabler/examples/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..3312fb7d0c1bdff5828d78c9b30010552eda61aa GIT binary patch literal 1029 zcmbVLU2@tm5O$}%M9+{;8=F9YnLJ2#Y@i9mHvT~`j4fjfk-@}v0N&G;xScDj2m*_rTIk z5{NRfL>+3PPAvb-a&ybV$KEVg8`kW5%yOC#tZ#{m`F(kIit)%8!9{4>J)wl$7+-7|v5GmS3wajvthYlsw~cdc z8T3}z5BBtFwQwz;hM;2t|J8?g zCfZ;67>l60Wx+}66si-!LtpR?)C1gr0T8|;v<>)q$25txuaL+CHX^f*04?^2Ip z)k^Klb|lY??eW;(Hy-JO^zoAi!OVVe4Myr?R>asX%*FkUUXN`K8+6dj>^DXH+A9RZldYZY&K{fYU(LHYQ zJ`GrvTI?Ju?3`NumE`7ug!ADdmmAWYhQxB4kXzqkHSslZ)`om&3Tg?el?Q|odH|m) z{-Ik8gmpmk{nz$TlAGsbV6*78je>W+8@t?Lf8K3hH>#)ijnyslSn1sIH?`Qm@w^1? zXt7_~+ql+`TwyuM*(DA9EDl_j6mCg!#wZ)rR7sn~q2!iw9^509wc&#K{?c?=J&p?8HA1iYTL9Vvb58f)SbtE4~CqPmkWt(^k(f^ZI6QhFUMW0zU{r ze%z#%SqoOX+I``8-qQ=ftLOz*;~XEW6TM6|ucDKl(|hCSCyyz9_kt{*2TJe58~);m z4ra<992rrd9!PKzT!r$C(E)x*3Y&%E58xP5A;^zU!WGIvbA%uOUrFf7G*`1o868Rc o9nc)&+qS`IYFuHa{j<)zd$|aXdCellJV%OO#erJDI+uIt7hl3crvLx| literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin b/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin new file mode 100644 index 0000000000000000000000000000000000000000..fac6aee92c1c40e6410c8788f2e2c699efde0400 GIT binary patch literal 925 zcmb_aS#p~|5GCbP99dvznZi|p!f}-w{HVsK~k>#-{%W-@OWLYnwa~%>= z1bULhQAkdk|#-=lg?$?d)UI$O4eQY@IxYA4PZKNH<*r2abd6uwY58iN=?1~of zU+#3o!%FZyp`R3 zJC3F!M{S3@v%5J<5Q1bz9uag(o8HlLY*x@>i z_`VEq#rA!grM~xus?4eN)7tI}=ipK`e_}-rSbWSQ{jtHH?d$)#Q_%j&@bbCRmp1C3 ZuTq<4)|OMt-?YN6bMisg;rK2~;V)fbA8P;r literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin b/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..423f3111aa0077f6c6d6a53717318aeaca2a52cf GIT binary patch literal 577 zcmb_YZE}Jz5T)%YdJDw*#Y}$$C|I;Ap#tU)0|^#%5h_rXTl7f1SreGvpgZ&SZFZC0 z&6Dn=hkHqqY>tT5S#b*MrY_D|1XY-w>g2qSXi}+aUsP4bs!&zUEG|wFrCDetHBPDq z>JTTNO;XiiDDz&A9Mg09aY;s7T{hmIU<;-5@bm%oG7K_Nhm$f_5w*ibM%iG7F20wgO#!tNl-8S7G z=tU&8bT`Chtc><-?#c1cE_eR54HRgY<=seb9!T)UH82m%g0J{cjERNYpe@EYhm5~V zcgm^^WCqN%feyWjnKPFJ=70n%Ik=#v8z#Q4@A|pIJI1ZC3~d6=(phaX&-KAbUqz*J PM46?rIV*|CaFc!ky)3dA literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin b/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..62adda76b594f80efa4318abe2d93f4575438fac GIT binary patch literal 649 zcmb`EU2=jj5XaN@6g@*fg@pud=^b3cbF~&>N!m9~^NZM2Z zKiRpeRfOGs%x1O{s%GJCFOAdXH8bq1my*5bd=9?AGlTzx`+VRTR^v4Jz)E=nbvw7a zD4dSTscM&u4BNNoq94|UghHh0_>AIOyw;*Wo(r*s zNYn8YD2bTDVqrh9Q)y;}QRbi_tJ5M6>ZUHvX~?S}&FlEQ3t3$0dgs*jD5?TopQg0PL&nm; zj`PSYLLQL#)WlUC1U*Ql`~-bzrg2dX2U+c}PI1=SHntFYeHH#cpcH|u7X(?@5LYQi z1qLVEJ}Id-+(k2|NBfI%>t0(=<4t5bUw$?{_}=f)3T$NZ3q2Gg-z2Tq79*1J6#gY! z?Y;DR(FOkPAR&{vp*j*R+{Hp~2yMmVg=K`Zy>N8>J&=bg=9N6o$^J7QZYDkBW574O zv)qe(f-Sr3Oo0#E2JE6XFnvogRrj@5IIP)CN`hpeqWIeG16R{IF zv5c?AH1IRGme%_^b!?X#$y_+);cMfBPRFHx3!h8Ik|{>(W#XNdt9WsCKTdgB^^W_E Oj1wo$MGxIK*tvf|-xo^& literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin b/ddsenabler/examples/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..63bb3f25a2b372c7a6ed1d84602f26c66c618ccb GIT binary patch literal 625 zcmb`E$!>!%5Qb^{6n%zXSdu70%E7cOL8_CGmhFPDAq~_liXjVc(?{!@)HbPlXpbFf zW-Jdg|L|G5k?w9KNphK|xGS1E>H4lY6e*!eQFr-am*Sl2`dHNUETf68TLo(B6yqY< z=5=N_DM`GXwoOg*B$3&yd*<_QYrULT{rsXmEdAXuEte30#e$Wj59as{0I+sFumK%A zjrRD;vQcCKp_xtkP$hk4`cx3g{*n}#pM;av2Y5a=s=`jB%E>|WS6%P4&GI^3At!kyUg)rq`7SroQL0htdem%qVk84SCNAC?IRVop#ll2 zJO`;34HcJQ%{ZbOlJH~*a6m|5AuGa$<9i?VRYl@M-jAW>;A^ zkx26!zcmqCuPoRgZ%7$Vyj}W~hVWk*CWyXI Hw?2hG43FA9v8c!$yt5@Z$;@tMGJ`s(+d&A8 zHAQvI@0p0NvJ{W=F%b%5^>|^-xr#9c&VzTckfn+}q3(rLB1S#kv*ZfY_2L9hN}u)F z&#N>Cux%Zoujb(b0K26J6fFIsy?8!;^VYz!_(c0X~&4=F#lM%0u v>cXUZFAeAXvKo+ literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___Log_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___Log_.bin new file mode 100644 index 0000000000000000000000000000000000000000..6e56d56ad6b88f745f211f24b249834ebe089637 GIT binary patch literal 653 zcmah{TTg>f3`YGGz8PPAaALL)l0Eb|!7YOgw{bZy%K(|fgEIqm;otaAZHq?VY|=|k z`!)UAqn&9N=bENnqwW&5+`LyWyKI%bl%`pfYtu~Aa%r05?RvTFV9h0}QO&IRaZ($n z`H2_RU&)`9YQ7aD%^kS0+s!VNFhq|g$+ds*|%4O*ECdFMN zn{7|p&rOKlw^b#5gRw64gCUt2nN}V_06bEh=zjkF7_j%qV*b#A;=-!qdsjt=wu2eY&Ttphv*o&NyQ6)eNSq@5n5}|tM~0&!3S5;S zuQ+tyC;7*ld~!4NPOPUHjG5;Xp+;m{5ilJuUKhrEw|A=BjTIU<(P_ZkBCHTiYFkx8 zwSpgU9Vi~)EjVAwP^y^TghQ660uQ$We2Y2??i3|J@NNejbDsK%D$%+751x1Z2Vbm$ m<2Rn`tY7>a;fplr=6LIU%=d#iFGwCA`q~#W4!c1B literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin new file mode 100644 index 0000000000000000000000000000000000000000..98649ae7fda80fa8104ddd2e1b057efb1527a399 GIT binary patch literal 1709 zcmb_c{f?SI5a-&yM4!PlRjgMuxjz;ZkgKSi^0EII0XXYtreV8+LbA$JT4}y@6dyI_?i;Y>y&O=FICl{W0 zT+W?Vox4WjIc6M`Kd*h)+z!{f4cE;jtYgnLBHyu5#_^nEgWD2gdQS#`TZHR9;7kL~ z>P#NPUbk9-Hl;%i{~7oI260tTUNa6p*bWml4V_93P6HHT_c-+sXNWuU&k5roZi{3e z@nrO$b#a2Yz>hj?azbW0D3O0=JxJo5H(p>ewnjMeAMD?c2Ka0C zP+l`yA>aZRh3Cev@cV@Cp{&gM-HKxiN;d;zhhsur;EE{mMsXP$)#wlRYIuU!UW@2Hvsh^joz(N7x0)4TI@iMkd6^l_fh zmZlyinTlIKQ8P|lunk?Ec)46pz%DwdKffWy^-eBC)FCdiJ9Tm#=2FqD_3dTZTKCN} z7mpwlpsk9FjC{jM!Ss+HPt-Mc2iL=-QF5qXu34oEtF6Tu)hcM2 zL@sf0hfvjk8aowcAlj7saPH9Ei3`XMQUb1WziGx^l`Rb8sKNL4eszj_{cEL6i(DDy ziQ1Lfq2@v%SH0@-3i{Rm>s4x)*mX=dDRr1U%FSiS+$0cWmIa zi~MP=IBc{ZUi8(czHAcj)OWD93&fNz)=ibuo)|??uQ6Bug-4)o!sD8qa@YDRp6~}T C4gHz` literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..d33a48d98096fbc64147c4f83e935f29597cfdaf GIT binary patch literal 261 zcmX9&TW*6e5ZtJz$SGRo)yNVbODIi|LJ3lU_y-X`1Sw7%n^cs$^sceVNHaUy$7o>! zPZI!mwbZOFn@cCOte7x_82w8K=cXhi5QgdIB$7&3O4t=srs8@NrYixa_I9l|hrSjy zUFeW!OS!t`38LrO5&T;+v`C^9_xSAWh`@FIzvHZzRlaCO+wKqEYis8aw|FdXBTVejAIlqZT0sS|t? z{7_D@?(o@7ejm}VjoNViw$F=6REKG-CbM|a=|{QM@c%+gcG0iq`=M?~`Myg(Gb-#1 z^*Ua3!>Jl07L_`k@)r&Dn81+M(}QEwX{T|nm9a~?^CtA>_z@^$FljW_T6+*X$SyQ`jGEBjc!%{F?!O!wyN8{m-ZKrb%~x3zWZ|{Nio$}`0iG$j6Kiz zUAm2Z&zwiDL*5((p7qM|?0~r*y#pN36T%$ACxU*gVCLK>mG8EN-$WdBz%~Y~E04Dl zPdUd|6gm5h=975J^0HpGk7fh`FuCsBmkJnILW1hrGSIVD=*qZeo%$WQVqN>_yIB<* z97|Ju>cl2c6MjAbSnkXNP2NX&-J`g{`FX7oIs%pR+r22)cA;yfv5_6{{1t?yW>LJM zeo&A2qg=lWz#(Li*L&Zy*HIp)OqbW_%arl6%-005TkcB*8osM%1D=VG-y3e6u}sE% zdqu$aFY4b%kNoGoCeGx%8y;7$aPW7EW$d(5_#M|2+&__fMm6Ey5~|XEK&8R!-eO&| z^Us~u_-PS1${aP=1)iO;!b&H(b3$z@M)#X~Dcj@O1GK2}a4}$~{BNY@G_JyqLlD0ytEN#_)@n1V@PjW8FnVAgh zv3`#+HY2vGF5f>p-Bwa*!?|gHI6oXr$$6l=wQOahsoh>r+LWn2e{0i~v^O9=H+arG zZ*`P`znGilGTYt&9EU1)Cn_MUqZAT&vhe}0Aak$9_)^JyIusZ+MIP7c_BB(JX#Dzd zI*Kr^$U}i?QegD9&v$k%)9BV}^s*7?j|9d;{H0U##GZAngjW9H!os6p03JU81UBy* KzZ1B!(P4kJGfW=< literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..55815c1fadef8ef09e4d88f94610111b00de5ef1 GIT binary patch literal 257 zcmXX=+YW*-44v^S{0bF=mnA+7Nl+dTP-N_dz!(uhC7bcWpZK?S#FL!%w5M%~252}y z2rYn;H)(Zy2w7%aD2$bSVq6p|#n=%KKa<&2fP4J3LZzWl?fs@iiqHslm$IPm+V`qj zc2zX4qfIa)WW5FpeStXv_-;r7GS;$(%^_Kz#CVrkY)%+;uSx7Ryt~i&%r*9xwq{$e zguG=m3=-;|^Z2CaB0;T&Pge&z&s^5+E#?{O3?>TNa=lrOsX{-ELh@=~UNAVT($m>vEyb7wzgCcRGks6 zL(g#f^y#jnd{VxARurWVdoRo7rhd)$>y^w~!)W&h!^pCBX&83?I$!NqRStjKrJuLW zu5RHK8?J3wryS#$6Ld95l5m(!vHa19KQ9EV8EC&=0NZR>BhhDqy=v( z;|qu#zc1}4dbIJ*Km!!SuZehD98##ARg*RgPdIp$2x8B8jFD%C5$OxFQkFxF>LVXV z{mjAx`T`v)1pFn{gH37&SG+dqBN3cAkVN`CRaWJ%q<6u|*cRzXKh%GoyLk1+h_^*Q z174WLF^`#QfBoOm34jL6nUsI-k5gsFDZk4c(WF&&vrkARPwC*R z|M%;=SBszX;ZD=+2N-0-#GPyH&R+ckyg6z+dG!Ic(y~a~O|ME_Xct~}lE}aGYZvuI zDRq8GYp;x;Q}?}h;H6od3g9fJ5L(Cee(Tv~cl@TiYUX-(vmwYMTk@0lBJu>Ljg-GL CZyv?~ literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b9387d7860fc1dfcb36ae4a1c7496aea715ef33 GIT binary patch literal 289 zcmXAi+fsut5Qfw7DSQSmEbVy83>T@=C|X21g^(L269SD8tpr7UH{Y!r`px`%`jcHW zLuWID&=SM9|X#n^T~7?-6jFn-atk3}bp0^1ge`ubM3FAzG1f47H=OS-o~ zGUm0)Ory1UCdBu_LjNF5fH+LZ8@X}i#KQ*CYRnhEmB_B0xJGvh8%xg=Uj?%l^a<=w3%-KL-t>ejs%7qgFspIJeyl^z2)gVo31lzar XG~G?sv>+h&gizOWnhqtcUFoAE2nSVj literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..a1212fb47b828ab89c6d5540b97d2673521949be GIT binary patch literal 569 zcmbV}OK!q25QfwC6g>kQ2oI%^SWI}O5x5Bzd2J%&gqGAm8q?C`Mm{ z@p#7mt@*6oXm_`orVXT*j3?XuF)KHeWx_N?`DvPIDiYJ2Z^hB2CEaDREs|v>io;%H zNz#`0?xh=rYrJxA-E9rtThyklmx*=1G+Im4her$ygR%*{ zxC@zDO&1`-`~x)@R;=c()tvQ4U|`K|b};fVx2iaZi)`lCs;cJc$$9?4>dYy~^@7yV z$R$&K)hqMW;lk-#>ZbUv;-m({hsRjF&WUv${clbW&v8gjYrS8`z5#QT0^|-HgR%)+ P|GzUi`^@@s9RKwfsUxVn literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c19eeb6a6d5e895949e8906d2dd53d536afdfd3e GIT binary patch literal 1277 zcmbtT(Q=wl5T(sm^c(tuS`y5!s$wbBYFSy&Q%Wt*67VX`2?b@U6Y_XdH+}z-ma{F0PO0NenbbRoj zhT}3ywDkSB`7)b^ni@w=F%DfR>c`6@a#w@JdKug944>XOa`Ge$$R`|!FO4{81K2$s z0e%u(@0m_s_)P`fL)-Q>Vcqjbi{1e_U_yEtf(JT!gfk$E z`Gu(z^18|S2~Q{f(4_5c6|YQOIrFIKc#15FGQz z{13xhdUbo`Z#i0uxY&#RIFj%1`;0#(Umg10Lyvu`SDz=%>oRJZdr_EL)Qa=O4kS5( z!T!hwmuEnmG48n$C-vrH<>XoLjw3i+3ODIrJ|ictZ}p$!i4JQ@XK?(nKAkgz&hd3> zJL{xK&(?{dJX0T?+s1Kjm-$K#TF#49#XhO4pIRIo=k_=HaD|7t-4btJ+_(Rp+Zo0B z4A7@@#3mm-8ak8Aq%f<%YqVy!0k&O+?-h>|a1?CU{xwbw=jocLEq`BD~Hh>)HBWj9lXFQ_R*OK5!bm_<}*3>isSX21@?@!hoIc T6HKoE<%Ln!3wVA$AQ=4s0m8Eq literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin b/ddsenabler/examples/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..da5208da88ddae75cefac8d0b9ae581cba260418 GIT binary patch literal 1233 zcmbVMQFEd|4Cb!C;(o)uAeNpw(}x8Gq*D~CfV?=efT)XS1+DV0`VTLOwbdD4dOJf1 zyUCX?AzA5%bay97(mgy|E~blhm2R^cPs>iH-0nM_Bq^tz&P!SiXWLnk!f846($`&D zR@130{Q|$%`r*FzHoUcO*N!#nX3PDIvByU^lAeD`Qt9>>8`>UoS#4kt$7j1>&Bc6u* zSr-N51w3R>v{l^n7qRJI;hMycNNCIgC*tSGyb!ynae>L$65)tH#GenJ@zd#{y=kin z;6g2qlTcjY_X&T3wi@eqPc`;1Uu_X9?J`u1BQFd!Y({x(`2r1@PWHeCmaDTCVT`E| z7y0IVZRe?f#gW;R3Ki)yo}MGuul#TE1cMER)5-swpGJ|HM*ekT*_*gXZsrND)KmZ0 ztBq5yuJW}QH0^_s`7y4mCpGfVz4{LQN?DzHb%$JOQLVn+s~P%w1kgu0B9%lB8_hs9 zE{rOodaxB8ebnamOhJW_p!M}1amEyQzCF9(L$muj*G1^N$Mm%p70axuH3DD*Dpw+l*L|A;<)q`#p2a8D1r^gZ0Vc4+->uc`+f`C zq+8U-_ob#fpF@{?HrT9>9#yZHm*an zsNVKMM)S#PxAt_Jpr3inG+ai~(6L2bJ>S@M>>OL{08b6rLO`vXurUUx0HyfEI=b>0 zt-ah9AB|{YA9xW)1s%-+Bb{U}qx(=`HFDlx#{K`#&4riBPPCmm(?RxP=gxhNDE;Q; z197>Sb>`*aG8AAi#_)GuBAIml;)S(I7Rl;9%xQ+)z__`kx%2G@AMajFhxiHq)$ literal 0 HcmV?d00001 diff --git a/ddsenabler/examples/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin b/ddsenabler/examples/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c3236d9624c069dfe9de6002e525a51609b867f5 GIT binary patch literal 1025 zcmbVL+isgc5GBf2^c(t6gJTDf@~~VCrZ%=WGT@ae3)nio0Hy}xn74j*-#W9n?Mo^} z8EI#SVRqOv=OEol_xF+{4Pl+~%bN3QogVZ2Sm=6Qz34h7bbTJ5>Rq}k&THAx}^6O8RyuNnaL(khw?6g2)hcX7*q= zu1Ul<%%N?h_)QYZO|m}@lgKY-`|`kCe*^n0QD{cPK`)MI$s*rNa@Ir_Y-0}48zQvP zceXHIA;9z;6G^TeSfHI(p`4|CW4lt8m_|#5$NLeRq`1Q}Uto6z4ReA`l8;WeIrb-!_Nvkkw-*j;oV#>TZJ@BGp&e2x=ED)?<8z0zBk3#AYe{^#YbU2imRDATRpS1<@0HvMu93n^Hqu%a{lzL~{89eoKm5JIg1(iQw9uz|LkA>c@?H2AtH|rcpDd9UZz_5pgOy-sVl8*HxTXy=b$9iw@(iyfG>|gVC*DX$_nIesDc?K(@4oRe@vL6CWp?xQ)%bSe3%0z)RQr{izF^O@%Ea$c2D05v$I{j0i*{Dn@?hCZ&K71;wBy_)g~m_L252w!0yl zlhoO&t(0BGFgRmR&(~jnGmUSJKmKeq8U{RvGLIg^s0f~)^25_^`}njyM9-^55Eb2S z@qFrb!?1Ylc8%!p08_PJX4+Aa@3uws_$W0R-@#Ys?a-mhR@%C&mM!Q@abTeOv50*hL2;WFT$}-p*L6yr^9@5IKsB- z(l_mYh~1Fpt4H6JQ~cInuqEg?Ga2h)D28+N6?L<4+gluEyRS^8eM5?NXZ zM_n(Kwj|uP6p+7)4;RB$sj)pyhP>RLTa$Tyh;psC83HG&wLW3nqKGMWg!yaO+F6<| z4I9?rz;Q6#8z*e(lOYxixy1j)ll5pEat=1t%G04WeI58^9-p$A2E5pjD;({WIx$Vuu6S***WU1Tjz;OD)v(`bDzJx}4TBeY1$nQ3gEKnmxqI zr2nm!nSLN_dW3C_eUEi;&g6bw#=*W&&+>5T?Wecnr!8a+Gsg^A-+kRwoJHps#`e0# z_W3rHMl*M`_wU=A_-Ym}25)P9|JG=f7)zxIw-^PP_H}G)-p)yH!FP=QL6E^*Y%1$B zkR1}zS`%_nk9^PsAZ4WqRuUNcdg0lXzVd6FT`2?lA=LRfGza-I3s=6Pzxb||hh|ke zjFa4Hv;@>m^A$CRA0g+U8}{n6F1_J%F%4GS;4nMe8Hx9FN`zW0630rZb z-{wOeq(O_HmRl?JC^y;;m*QA5we;gRU<;fm@W*rLT5w;n&SLA}4`e2l*!x+kp)W%u z3(#)Bc?C}rDC)7E&hBX~DnZUB!-Y`!{J|6(Zy=iC+#g3ck)yxgbC3K~+^Os8P4n)C z59xF~i+v|ikEf1uw?bafHKW!{hy!A>(pvjSXe+|Mb4L|hRgDvAG~RF#wI1drIH}J5 XG&1edcT}i#aSAdyA Path to the configuration file" << std::endl; std::cout << " (Default: '')" << std::endl; diff --git a/ddsenabler/examples/publish/CMakeLists.txt b/ddsenabler/examples/publish/CMakeLists.txt new file mode 100644 index 00000000..0cf3dc87 --- /dev/null +++ b/ddsenabler/examples/publish/CMakeLists.txt @@ -0,0 +1,49 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.20) +project(ddsenabler_example_publish LANGUAGES CXX) + +add_executable(ddsenabler_example_publish main.cpp) + +target_link_libraries(ddsenabler_example_publish PRIVATE ddsenabler) + +# Install rule +install(TARGETS ddsenabler_example_publish + RUNTIME DESTINATION bin +) + +# Copy the json files over to the build directory +file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) +foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) + get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${JSON_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json + COPYONLY) + install(FILES ${JSON_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() + +# Copy the yaml files over to the build directory +file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) +foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) + get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${YAML_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml + COPYONLY) + install(FILES ${YAML_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() diff --git a/ddsenabler/examples/publish/config.yml b/ddsenabler/examples/publish/config.yml new file mode 100644 index 00000000..5cc4050d --- /dev/null +++ b/ddsenabler/examples/publish/config.yml @@ -0,0 +1,26 @@ +dds: + domain: 0 + + allowlist: + - name: "topic_name" + - name: "HelloWorldTopic" + type: "HelloWorld" + + blocklist: + - name: "topic_to_block" + type: "type_to_block" + + topics: + - name: "temperature/*" + type: "temperature/types/*" + qos: + max-rx-rate: 15 + downsampling: 2 + + ignore-participant-flags: filter_same_process + transport: shm + whitelist-interfaces: + - "127.0.0.1" + +ddsenabler: + initial-publish-wait: 500 diff --git a/ddsenabler/examples/main.cpp b/ddsenabler/examples/publish/main.cpp similarity index 93% rename from ddsenabler/examples/main.cpp rename to ddsenabler/examples/publish/main.cpp index 9976c3f6..64337f9d 100644 --- a/ddsenabler/examples/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -28,11 +28,12 @@ #include #include +#include "ddsenabler_participants/Utils.hpp" + #include "ddsenabler/dds_enabler_runner.hpp" #include "ddsenabler/DDSEnabler.hpp" #include "CLIParser.hpp" -#include "utils.hpp" CLIParser::example_config config; uint32_t received_types_ = 0; @@ -87,7 +88,7 @@ static void test_type_notification_callback( std::cout << "Type callback received: " << type_name << ", Total types: " << received_types_ << std::endl << serialized_type << std::endl << std::endl; if (!config.persistence_path.empty() && - !save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -112,7 +113,7 @@ static bool test_type_query_callback( } // Load the type from file - if (!load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to load type: " << type_name << std::endl; @@ -134,7 +135,7 @@ static void test_topic_notification_callback( std::cout << "Topic callback received: " << topic_name << " of type " << type_name << ", Total topics: " << received_topics_ << std::endl << serialized_qos << std::endl << std::endl; if (!config.persistence_path.empty() && - !save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), + !eprosima::ddsenabler::participants::utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, type_name, serialized_qos)) { @@ -160,7 +161,7 @@ static bool test_topic_query_callback( } // Load the topic from file - if (!load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, + if (!eprosima::ddsenabler::participants::utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, type_name, serialized_qos)) { @@ -183,7 +184,7 @@ static void test_data_notification_callback( std::cout << "Data callback received: " << topic_name << ", Total data: " << received_data_ << std::endl << json << std::endl << std::endl; if (!config.persistence_path.empty() && - !save_data_to_file((std::filesystem::path(config.persistence_path) / SAMPLES_SUBDIR).string(), + !eprosima::ddsenabler::participants::utils::save_data_to_file((std::filesystem::path(config.persistence_path) / SAMPLES_SUBDIR).string(), topic_name, json, publish_time)) { diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp new file mode 100644 index 00000000..7d913d3e --- /dev/null +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -0,0 +1,259 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include +#include +#include +#include + +#include + +#pragma once + +class CLIParser +{ +public: + + CLIParser() = delete; + + struct example_config + { + std::string config_file_path = ""; + std::string service_name = "add_two_ints"; + bool announce_server = true; + uint32_t timeout = 30; + std::string persistence_path = ""; + uint32_t expected_requests = 0; + uint32_t request_initial_wait = 0; + }; + + /** + * @brief Print usage help message and exit with the given return code + * + * @param return_code return code to exit with + * + * @warning This method finishes the execution of the program with the input return code + */ + static void print_help( + uint8_t return_code) + { + std::cout << "Usage: ddsenabler_example_service [options]" << std::endl; + std::cout << "" << std::endl; + std::cout << "--config Path to the configuration file" << std::endl; + std::cout << " (Default: '')" << std::endl; + std::cout << "--service-name Name of the service to be registered" << std::endl; + std::cout << " (Default: 'add_two_ints')" << std::endl; + std::cout << "--announce-server Whether to be server or client" << std::endl; + std::cout << " (Default: true)" << std::endl; + std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; + std::cout << " program if expectations are not met" << std::endl; + std::cout << " (Default: 30)" << std::endl; + std::cout << "--persistence-path Path to the persistence directory" << std::endl; + std::cout << " (Default: '')" << std::endl; + std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; + std::cout << "--expected-requests Number of requests expected to be received" << std::endl; + std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; + std::cout << "--request-initial-wait Time (seconds) to wait before starting" << std::endl; + std::cout << " requests publication since server matching" << std::endl; + std::cout << " (Default: 0)" << std::endl; + std::exit(return_code); + } + + /** + * @brief Parse the command line options and return the configuration_config object + * + * @param argc number of arguments + * @param argv array of arguments + * @return configuration_config object with the parsed options + * + * @warning This method finishes the execution of the program if the input arguments are invalid + */ + static example_config parse_cli_options( + int argc, + char* argv[]) + { + example_config config; + + if (argc < 2) + { + std::cerr << "Configuration file path is required" << std::endl; + print_help(EXIT_FAILURE); + } + + for (int i = 1; i < argc; ++i) + { + std::string arg = argv[i]; + + if (arg == "-h" || arg == "--help") + { + print_help(EXIT_SUCCESS); + } + else if (arg == "--config") + { + if (++i < argc) + { + config.config_file_path = argv[i]; + if (!std::filesystem::exists(config.config_file_path)) + { + std::cerr << "Invalid configuration file path: " << config.config_file_path << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --config argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--service-name") + { + if (++i < argc) + { + config.service_name = argv[i]; + } + else + { + std::cerr << "Failed to parse --service-name argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--announce-server") + { + if (++i < argc) + { + config.announce_server = (std::string(argv[i]) == "true") || + (std::string(argv[i]) == "True") || + (std::string(argv[i]) == "1"); + } + else + { + std::cerr << "Failed to parse --announce-server argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--timeout") + { + if (++i < argc) + { + try + { + config.timeout = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --timeout argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --timeout argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--persistence-path") + { + if (++i < argc) + { + config.persistence_path = argv[i]; + } + else + { + std::cerr << "Failed to parse --persistence-path argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--expected-requests") + { + if (++i < argc) + { + try + { + config.expected_requests = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --expected-requests argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else if (arg == "--request-initial-wait") + { + if (++i < argc) + { + try + { + config.request_initial_wait = static_cast(std::stoi(argv[i])); + } + catch (const std::exception& e) + { + std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --request-initial-wait argument" << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse unknown argument: " << arg << std::endl; + print_help(EXIT_FAILURE); + } + } + + if (config.config_file_path.empty()) + { + std::cerr << "Configuration file path is required" << std::endl; + print_help(EXIT_FAILURE); + } + + return config; + } + + /** + * @brief Parse the signal number into the signal name + * + * @param signum signal number + * @return std::string signal name + */ + static std::string parse_signal( + const int& signum) + { + switch (signum) + { + case SIGINT: + return "SIGINT"; + case SIGTERM: + return "SIGTERM"; +#ifndef _WIN32 + case SIGQUIT: + return "SIGQUIT"; + case SIGHUP: + return "SIGHUP"; +#endif // _WIN32 + default: + return "UNKNOWN SIGNAL"; + } + } + +}; diff --git a/ddsenabler/examples/service/CMakeLists.txt b/ddsenabler/examples/service/CMakeLists.txt new file mode 100644 index 00000000..05e9837f --- /dev/null +++ b/ddsenabler/examples/service/CMakeLists.txt @@ -0,0 +1,49 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.20) +project(ddsenabler_example_service LANGUAGES CXX) + +add_executable(ddsenabler_example_service main.cpp) + +target_link_libraries(ddsenabler_example_service PRIVATE ddsenabler) + +# Install rule +install(TARGETS ddsenabler_example_service + RUNTIME DESTINATION bin +) + +# Copy the json files over to the build directory +file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) +foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) + get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${JSON_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json + COPYONLY) + install(FILES ${JSON_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() + +# Copy the yaml files over to the build directory +file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) +foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) + get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) + configure_file( + ${YAML_FILE_COMPLETE_PATH} + ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml + COPYONLY) + install(FILES ${YAML_FILE_COMPLETE_PATH} + DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) +endforeach() diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md new file mode 100644 index 00000000..7176ee59 --- /dev/null +++ b/ddsenabler/examples/service/Readme.md @@ -0,0 +1,19 @@ +# Service Example Readme + +This example demonstrates the usage of the FIWARE DDS Enabler for implementing a service. The example includes a client and a server setup for the desired service. + +By default, the example is prepared for the `add_two_ints` service, providing a standard reply with a constant result of 3 for any request. + +Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The Persistence/requests directory must be modified to suit the specific service type and its expected requests. + +## Example Commands + +### CLIENT +```bash +./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +``` + +### SERVER +```bash +./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +``` \ No newline at end of file diff --git a/ddsenabler/examples/service/config.yml b/ddsenabler/examples/service/config.yml new file mode 100644 index 00000000..5cc4050d --- /dev/null +++ b/ddsenabler/examples/service/config.yml @@ -0,0 +1,26 @@ +dds: + domain: 0 + + allowlist: + - name: "topic_name" + - name: "HelloWorldTopic" + type: "HelloWorld" + + blocklist: + - name: "topic_to_block" + type: "type_to_block" + + topics: + - name: "temperature/*" + type: "temperature/types/*" + qos: + max-rx-rate: 15 + downsampling: 2 + + ignore-participant-flags: filter_same_process + transport: shm + whitelist-interfaces: + - "127.0.0.1" + +ddsenabler: + initial-publish-wait: 500 diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp new file mode 100644 index 00000000..98621d5e --- /dev/null +++ b/ddsenabler/examples/service/main.cpp @@ -0,0 +1,534 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file main.cpp + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ddsenabler_participants/Utils.hpp" + +#include "ddsenabler/dds_enabler_runner.hpp" +#include "ddsenabler/DDSEnabler.hpp" + +#include "CLIParser.hpp" + +CLIParser::example_config config; +bool service_discovered_ = false; +uint32_t received_replies_ = 0; +std::vector> received_requests_; +std::mutex app_mutex_; +std::condition_variable app_cv_; +bool stop_app_ = false; + +const std::string REQUESTS_SUBDIR = "requests"; +const std::string TYPES_SUBDIR = "types"; +const std::string SERVICES_SUBDIR = "services"; + +// Static log callback +void test_log_callback( + const char* file_name, + int line_no, + const char* func_name, + int category, + const char* msg) +{ + // NOTE: Default stdout logs can be disabled via configuration ("logging": {"stdout": false}) to avoid duplicated traces + + std::stringstream ss; + ss << file_name << ":" << line_no << " (" << func_name << "): " << msg << std::endl; + if (category == eprosima::utils::Log::Kind::Warning) + { + std::cerr << "[WARNING] " << ss.str(); + } + else if (category == eprosima::utils::Log::Kind::Error) + { + std::cerr << "[ERROR] " << ss.str(); + } +} + +// Static type notification callback +static void test_type_notification_callback( + const char* type_name, + const char* serialized_type, + const unsigned char* serialized_type_internal, + uint32_t serialized_type_internal_size, + const char* data_placeholder) +{ + std::lock_guard lock(app_mutex_); + std::cout << "Type callback received: " << type_name << std::endl; + if (!config.persistence_path.empty() && + !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + serialized_type_internal, serialized_type_internal_size)) + { + std::cerr << "Failed to save type: " << type_name << std::endl; + } +} + +// Static type query callback +static bool test_type_query_callback( + const char* type_name, + std::unique_ptr& serialized_type_internal, + uint32_t& serialized_type_internal_size) +{ + if (config.persistence_path.empty()) + { + std::cerr << "Persistence path is not set, cannot query type: " << type_name << std::endl; + return false; + } + + // Load the type from file + if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + serialized_type_internal, serialized_type_internal_size)) + { + std::cerr << "Failed to load type: " << type_name << std::endl; + return false; + } + return true; +} + +// Static data notification callback +static void test_data_notification_callback( + const char* topic_name, + const char* json, + int64_t publish_time) +{ +} + +// Static topic notification callback +static void test_topic_notification_callback( + const char* topic_name, + const char* type_name, + const char* serialized_qos) +{ +} + +// Static type query callback +static bool test_topic_query_callback( + const char* topic_name, + std::string& type_name, + std::string& serialized_qos) +{ + return false; +} + +// Static service notification callback +static void test_service_notification_callback( + const char* service_name, + const char* request_type_name, + const char* reply_type_name, + const char* request_serialized_qos, + const char* reply_serialized_qos) +{ + std::lock_guard lock(app_mutex_); + if (config.service_name == std::string(service_name)) + { + std::cout << "Service callback received: " << service_name << std::endl; + + std::string service_file = (std::filesystem::path( + config.persistence_path) / SERVICES_SUBDIR + ).string(); + if (!config.persistence_path.empty()) + { + eprosima::ddsenabler::participants::utils::save_service_to_file( + service_file, + service_name, + request_type_name, + reply_type_name, + request_serialized_qos, + reply_serialized_qos); + + service_discovered_ = true; + app_cv_.notify_all(); + } + } +} + +// Static service query callback +static bool test_service_query_callback( + const char* service_name, + std::string& request_type_name, + std::string& request_serialized_qos, + std::string& reply_type_name, + std::string& reply_serialized_qos) +{ + app_cv_.notify_all(); + + std::cout << "Service type request callback received: " << service_name << std::endl; + + std::string service_file = (std::filesystem::path( + config.persistence_path) / + SERVICES_SUBDIR + ).string(); + if (eprosima::ddsenabler::participants::utils::load_service_from_file( + service_file, + service_name, + request_type_name, + reply_type_name, + request_serialized_qos, + reply_serialized_qos)) + { + return true; + } + std::cout << "ERROR Tester: fail to load service from file: " << service_file << std::endl; + return false; +} + +// Static service reply notification callback +static void test_service_reply_notification_callback( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + received_replies_++; + std::cout << "Reply callback received with id: " << request_id << " for service: " << service_name << std::endl; + std::cout << "Reply: " << json << std::endl; + + app_cv_.notify_all(); +} + +// Static service request notification callback +static void test_service_request_notification_callback( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time) +{ + std::lock_guard lock(app_mutex_); + + std::cout << "Request callback received with id: " << request_id << " for service: " << service_name << std::endl; + received_requests_.emplace_back(request_id, json); + app_cv_.notify_all(); +} + +void init_persistence( + const std::string& persistence_path) +{ + auto ensure_directory_exists = [](const std::filesystem::path& path) + { + if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) + { + std::cerr << "Failed to create directory: " << path << std::endl; + } + }; + + if (!persistence_path.empty()) + { + ensure_directory_exists(persistence_path); + std::vector subdirs = {TYPES_SUBDIR, SERVICES_SUBDIR}; + if (config.announce_server) + { + subdirs.push_back(REQUESTS_SUBDIR); + } + for (const auto& sub : subdirs) + { + ensure_directory_exists(std::filesystem::path(persistence_path) / sub); + } + } +} + +void get_sorted_files( + const std::string& directory, + std::vector>& files) +{ + for (const auto& entry : std::filesystem::directory_iterator(directory)) + { + if (entry.is_regular_file()) + { + std::string filename = entry.path().filename().string(); + try + { + // assumes name is just a number + files.emplace_back(entry.path(), static_cast(std::stoll(filename))); + } + catch (const std::invalid_argument& e) + { + std::cerr << "Skipping non-numeric file: " << filename << std::endl; + } + } + } + + // Sort files by numeric value + std::sort(files.begin(), files.end(), + [](const auto& a, const auto& b) + { + return a.second < b.second; + }); +} + +bool wait_for_service_discovery( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + []() + { + return service_discovered_; + })) + { + std::cerr << "Timeout waiting for service discovery." << std::endl; + return false; + } + return true; +} + +bool wait_for_service_request( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + []() + { + return !received_requests_.empty(); + })) + { + std::cerr << "Timeout waiting for service request." << std::endl; + return false; + } + return true; +} + +bool wait_for_service_reply( + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv, + uint32_t sent_requests) +{ + std::unique_lock lock(app_mutex); + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + [&sent_requests]() + { + return received_replies_ >= sent_requests; + })) + { + std::cerr << "Timeout waiting for service reply." << std::endl; + return false; + } + return true; +} + + +bool client_routine( + std::shared_ptr enabler, + const std::string& service_name, + const std::string& request_path, + uint32_t timeout, + uint32_t request_initial_wait, + std::mutex& app_mutex, + std::condition_variable& app_cv, + bool& stop_app) +{ + // Wait for service to be discovered + if (!wait_for_service_discovery(timeout, app_mutex, app_cv)) + { + std::cerr << "Failed to discover service: " << service_name << std::endl; + return false; + } + + // Wait a bit before starting to publish so types and topics can be discovered + std::this_thread::sleep_for(std::chrono::seconds(request_initial_wait)); + + // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) + std::vector> sample_files; + get_sorted_files(request_path, sample_files); + uint32_t sent_requests = 0; + for (const auto& [path, number] : sample_files) + { + std::ifstream file(path, std::ios::binary); + if (file) + { + std::string file_content((std::istreambuf_iterator(file)), std::istreambuf_iterator()); + uint64_t request_id = 0; + if (enabler->send_service_request(service_name, file_content, request_id)) + { + std::cout << "Published content from file: " << path.filename() << " in service: " + << service_name << " with request ID: " << request_id << std::endl; + sent_requests++; + } + else + { + std::cerr << "Failed to publish content from file: " << path.filename() << " in service: " + << service_name << std::endl; + } + } + else + { + std::cerr << "Failed to open file: " << path << std::endl; + return false; + } + + // Wait publish period or until stop signal is received + if (!wait_for_service_reply(timeout, app_mutex, app_cv, sent_requests)) + { + std::cerr << "Failed to receive service reply." << std::endl; + return false; + } + } + return true; +} + +bool server_specific_logic( + std::shared_ptr enabler, + const std::string& service_name, + const std::string& request, + uint64_t request_id) +{ + std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time + std::string json = "{\"sum\": 3}"; // Example response, replace with actual logic + if (!enabler->send_service_reply(service_name, json, request_id)) + { + std::cerr << "Failed to send service reply for request ID: " << request_id << std::endl; + return false; + } + return true; +} + +bool server_routine( + std::shared_ptr enabler, + const std::string& service_name, + uint32_t expected_requests, + uint32_t timeout, + std::mutex& app_mutex, + std::condition_variable& app_cv, + bool& stop_app) +{ + // Announce service + if (!enabler->announce_service(service_name)) + { + std::cerr << "Failed to announce service: " << service_name << std::endl; + return false; + } + + std::cout << "Service announced: " << service_name << std::endl; + + while (true) + { + if (!wait_for_service_request(timeout, app_mutex, app_cv)) + { + std::cerr << "Timeout waiting for service request." << std::endl; + return false; + } + + // Pop the last request from the received requests vector + uint64_t request_id = received_requests_.back().first; + std::string request = received_requests_.back().second; + received_requests_.pop_back(); + std::cout << "Received request for service: " << service_name << " with request ID: " << request_id << std::endl; + + // Example response + server_specific_logic( + enabler, + service_name, + request, + request_id); + + // Check if we have received the expected number of requests + { + std::lock_guard lock(app_mutex); + if (++received_replies_ >= expected_requests) + { + return true; + } + } + } + + // Revoke service + if (!enabler->revoke_service(service_name)) + { + std::cerr << "Failed to revoke service: " << service_name << std::endl; + return false; + } +} + +void signal_handler( + int signum) +{ + std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; + { + std::lock_guard lock(app_mutex_); + stop_app_ = true; + } + app_cv_.notify_all(); +} + +int main( + int argc, + char** argv) +{ + using namespace eprosima::ddsenabler; + + eprosima::utils::Log::ReportFilenames(true); + + // Parse CLI options + config = CLIParser::parse_cli_options(argc, argv); + + // Initialize persistence if required + init_persistence(config.persistence_path); + + // Set up callbacks + CallbackSet callbacks{ + test_log_callback, + { + test_type_notification_callback, + test_topic_notification_callback, + test_data_notification_callback, + test_type_query_callback, + test_topic_query_callback + }, + { + test_service_notification_callback, + test_service_request_notification_callback, + test_service_reply_notification_callback, + test_service_query_callback + } + }; + + std::shared_ptr enabler; + if (!create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler)) + { + std::cerr << "Failed to create DDSEnabler instance." << std::endl; + return EXIT_FAILURE; + } + + bool ret = false; + // Service logic based on announce_server flag + if (config.announce_server) + { + ret = server_routine(enabler, config.service_name, config.expected_requests, config.timeout, app_mutex_, app_cv_, stop_app_); + } + else + { + auto request_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); + ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait, app_mutex_, app_cv_, stop_app_); + } + + return ret ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/ddsenabler/include/ddsenabler/CallbackSet.hpp b/ddsenabler/include/ddsenabler/CallbackSet.hpp index ef1e3e12..a214e83e 100644 --- a/ddsenabler/include/ddsenabler/CallbackSet.hpp +++ b/ddsenabler/include/ddsenabler/CallbackSet.hpp @@ -44,6 +44,45 @@ struct DdsCallbacks participants::DdsTopicQuery topic_query{nullptr}; }; +struct ServiceCallbacks +{ + //! Callback for notifying the discovery of DDS services + participants::ServiceNotification service_notification{nullptr}; + + //! Callback for notifying the reception of service requests + participants::ServiceRequestNotification service_request_notification{nullptr}; + + //! Callback for notifying the reception of service replies + participants::ServiceReplyNotification service_reply_notification{nullptr}; + + //! Callback for requesting information of a DDS service + participants::ServiceQuery service_query{nullptr}; +}; + +struct ActionCallbacks +{ + //! Callback for notifying the discovery of DDS actions + participants::ActionNotification action_notification{nullptr}; + + //! Callback for notifying the reception of action goal requests + participants::ActionGoalRequestNotification action_goal_request_notification{nullptr}; + + //! Callback for notifying the reception of action goal responses + participants::ActionFeedbackNotification action_feedback_notification{nullptr}; + + //! Callback for notifying the reception of action goal results + participants::ActionCancelRequestNotification action_cancel_request_notification{nullptr}; + + //! Callback for notifying the reception of action goal results + participants::ActionResultNotification action_result_notification{nullptr}; + + //! Callback for notifying the reception of action status notifications + participants::ActionStatusNotification action_status_notification{nullptr}; + + //! Callback for requesting information of a DDS action + participants::ActionQuery action_query{nullptr}; +}; + /** * @brief Struct that encapsulates all the callbacks used by the DDS Enabler. */ @@ -54,6 +93,8 @@ struct CallbackSet //! DDS related callbacks DdsCallbacks dds; + ServiceCallbacks service; + ActionCallbacks action; }; } /* namespace ddsenabler */ diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index d53b12dd..68dda846 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -103,8 +103,266 @@ class DDSEnabler const std::string& topic_name, const std::string& json); + /*****************************************/ + /* SERVICE */ + /*****************************************/ + + /** + * @brief Creates a server for the given service. + * + * This function announces a service by setting up a server for it. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if there is an issue requesting the data types to user's app + * for the corresponding request and reply topics. + * + * @param service_name The name of the service to be announced. + * @return true if the service was successfully announced, false otherwise. + */ + bool announce_service( + const std::string& service_name); + + /** + * @brief Stops the server for the given service. + * + * This function revokes the server associated with the specified service. + * It returns a boolean indicating whether the operation was successful. + * The operation will fail if the service was not previously announced. + * + * @param service_name The name of the service to be stopped. + * @return true if the service was successfully stopped, false otherwise. + */ + bool revoke_service( + const std::string& service_name); + + /** + * @brief Sends a request to a specified service. + * + * Sends a request containing the given JSON data to the specified service. + * If successful, the request identifier is stored in the provided reference + * and will match the one received in the reply callback. + * + * The function fails if there is no server for the service or if the request is malformed. + * The request identifier is incremented sequentially across all services. + * + * @param service_name The target service name. + * @param json The JSON-formatted request data. + * @param request_id Reference to store the unique request identifier. + * @return true if the request was successfully sent, false otherwise. + */ + bool send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id); + + /** + * @brief Sends a reply to the given service. + * + * This function sends a reply to the specified service with the provided JSON data. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if the service was not previously created or if the request ID does not match any request. + * + * @param service_name The name of the service to send the reply to. + * @param json The JSON data to be sent with the reply. + * @param request_id The unique identifier of the request to which this reply corresponds. + * @return true if the reply was successfully sent, false otherwise. + * + * @note The request_id must coincide with the one received in the request. + */ + bool send_service_reply( + const std::string& service_name, + const std::string& json, + const uint64_t request_id); + + /*****************************************/ + /* ACTION SERVER */ + /*****************************************/ + + /** + * @brief Creates server for the given action. + * + * This function announces an action by setting up a server for it. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if there is an issue requesting the data types to user's app. + * + * @param action_name The name of the action to be announced. + * + * @return true if the action was successfully announced, false otherwise. + */ + bool announce_action( + const std::string& action_name); + + /** + * @brief Stops the server for the given action. + * + * This function revokes the server associated with the specified action. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if the action was not previously announced. + * + * @param action_name The name of the action to be stopped. + * + * @return true if the action was successfully stopped, false otherwise. + */ + bool revoke_action( + const std::string& action_name); + + /** + * @brief Send feedback for the specified goal_id action. + * + * This function sends feedback for the specified action goal identified by the given goal ID. + * It returns a boolean indicating whether the operation was successful. + * + * @param action_name The name of the action for which the feedback is being sent. + * @param json The JSON data to be sent as feedback. + * @param goal_id The unique identifier of the action goal for which the feedback is being sent. + * + * @return true if the feedback was successfully sent, false otherwise. + */ + bool send_action_feedback( + const char* action_name, + const char* json, + const participants::UUID& goal_id); + + /** + * @brief Send result for the specified goal_id action. + * + * This function sends the result for the specified action goal identified by the given goal ID. + * It returns a boolean indicating whether the operation was successful. + * + * @param action_name The name of the action for which the result is being sent. + * @param goal_id The unique identifier of the action goal for which the result is being sent. + * @param status_code The status code representing the result of the action. + * @param json The JSON data to be sent as the result. + * + * @return true if the result was successfully sent, false otherwise. + */ + bool send_action_result( + const char* action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code, + const char* json); + + bool send_action_cancel_goal_reply( + const char* action_name, + const std::vector& goal_ids, + const participants::CANCEL_CODE& cancel_code, + const uint64_t request_id); + + /** + * @brief Publishes an update for the status of an action. + * + * This function publishes a msg update for the status of an action. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if the action was not previously announced or if the goal ID is not currently active. + * + * @param action_name The name of the action for which the status is being updated. + * @param goal_id The unique identifier of the action goal for which the status is being updated. + * @param status_code The status code representing the current state of the action. + * + * @return true if the status update was successfully sent, false otherwise. + * + */ + bool update_action_status( + const std::string& action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code); + + /*****************************************/ + /* ACTION CLIENT */ + /*****************************************/ + + /** + * @brief Sends an action goal to the specified action. + * + * This function sends an action goal to the specified action with the provided JSON data. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if the action server was not previously created, if the action types are unknown + * or if the action goal is malformed. + * + * The goal_id is a unique identifier for the action goal and is generated by the function. + * + * @param action_name The name of the action to send the goal to. + * @param json The JSON data to be sent with the action goal. + * @param goal_id Reference to store the unique identifier of the action goal. + * @return true if the action goal was successfully sent, false otherwise. + */ + bool send_action_goal( + const std::string& action_name, + const std::string& json, + participants::UUID& goal_id); + + /** + * @brief Cancels an action goal for the specified action. + * + * This function sends a request to an action server to cancel: + * If the goal ID is empty and timestamp is zero, cancel all goals + * If the goal ID is empty and timestamp is not zero, cancel all goals accepted at or before the timestamp + * If the goal ID is not empty and timestamp is zero, cancel the goal with the given ID regardless of the time it was accepted + * If the goal ID is not empty and timestamp is not zero, cancel the goal with the given ID and all goals accepted at or before the timestamp + * The success of the operation only indicates that the cancel request was sent, not that it was processed. + * The actual cancellation of the goals would be notified via a status update of each individual action. + * + * @param action_name The name of the action for which the goal is to be canceled. + * @param goal_id The unique identifier of the action goal to be canceled or empty to cancel all goals. + * @param timestamp The acceptance timestamp of the goal to be canceled. + * + * @return true if the cancel action request was successfully sent, false otherwise. + */ + bool cancel_action_goal( + const std::string& action_name, + const participants::UUID& goal_id, + const int64_t timestamp = 0); + protected: + /** + * @brief Sends a request to get the result of an action. + * + * This function sends a request to get the result of an action identified by the given action name and goal ID. + * It returns a boolean indicating whether the operation was successful. + * + * It is invoked via lambda from the writer_ when the send_goal_reply is received and positive. + * + * @param action_name The name of the action for which the result is being requested. + * @param goal_id The unique identifier of the action goal for which the result is being requested. + * + * @return true if the request to get the result was successfully sent, false otherwise. + */ + bool send_action_get_result_request( + const std::string& action_name, + const participants::UUID& goal_id); + + /** + * @brief Sends a reply to an action goal request. + * + * This function sends a reply to an action goal request, indicating whether the goal was accepted or not. + * + * It is invoked via lambda from the writer_ when request is notified. + * + * @param action_name The name of the action for which the goal reply is being sent. + * @param goal_id The unique identifier of the action goal for which the reply is being sent. + * @param accepted A boolean indicating whether the goal was accepted (true) or rejected (false). + */ + void send_action_send_goal_reply( + const std::string& action_name, + const uint64_t goal_id, + bool accepted); + + /** + * @brief Actually sends the result reply for an action. + * + * This function is only called when all the conditions are met to send the result reply. + * + * @param action_name The name of the action for which the result reply is being sent. + * @param goal_id The unique identifier of the action goal for which the result reply is being sent. + * @param reply_json The JSON data to be sent as the result reply. + * @param request_id The unique identifier of the request to which this reply corresponds. + */ + bool send_action_get_result_reply( + const std::string& action_name, + const participants::UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id); + /** * Load the Enabler's internal topics into a configuration object. * @@ -131,15 +389,15 @@ class DDSEnabler //! Payload Pool std::shared_ptr payload_pool_; - //! Thread Pool - std::shared_ptr thread_pool_; - //! Discovery Database std::shared_ptr discovery_database_; //! Participants Database std::shared_ptr participants_database_; + //! Thread Pool + std::shared_ptr thread_pool_; + //! Handler std::shared_ptr handler_; @@ -157,6 +415,9 @@ class DDSEnabler //! Mutex to protect class attributes mutable std::mutex mutex_; + + //! Request identifyer for sent requests (incremented by one after each request) + uint64_t sent_request_id_ = 0; }; } /* namespace ddsenabler */ diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index b97edfa3..c21d221c 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -18,6 +18,9 @@ #include #include "ddsenabler/DDSEnabler.hpp" +#include "ddsenabler_participants/RpcUtils.hpp" + +#include namespace eprosima { namespace ddsenabler { @@ -61,6 +64,27 @@ DDSEnabler::DDSEnabler( handler_config, payload_pool_); + handler_->set_send_action_get_result_request_callback( + [this](const std::string& action_name, const UUID& action_id) + { + if (this->send_action_get_result_request(action_name, action_id)) + return true; + this->cancel_action_goal(action_name, action_id, 0); + return false; + }); + + handler_->set_send_action_send_goal_reply_callback( + [this](const std::string& action_name, const uint64_t goal_id, bool accepted) + { + return this->send_action_send_goal_reply(action_name, goal_id, accepted); + }); + + handler_->set_send_action_get_result_reply_callback( + [this](const std::string& action_name, const UUID& goal_id, const std::string& reply_json, const uint64_t request_id) + { + return this->send_action_get_result_reply(action_name, goal_id, reply_json, request_id); + }); + // Create Enabler Participant enabler_participant_ = std::make_shared( configuration_.enabler_configuration, @@ -209,6 +233,55 @@ void DDSEnabler::set_internal_callbacks_( { enabler_participant_->set_topic_query_callback(callbacks.dds.topic_query); } + if (callbacks.service.service_notification) + { + handler_->set_service_notification_callback(callbacks.service.service_notification); + } + if (callbacks.service.service_request_notification) + { + handler_->set_service_request_notification_callback(callbacks.service.service_request_notification); + } + if (callbacks.service.service_reply_notification) + { + handler_->set_service_reply_notification_callback(callbacks.service.service_reply_notification); + } + if (callbacks.service.service_query) + { + enabler_participant_->set_service_query_callback(callbacks.service.service_query); + } + if (callbacks.action.action_notification) + { + handler_->set_action_notification_callback(callbacks.action.action_notification); + } + if (callbacks.action.action_goal_request_notification) + { + handler_->set_action_goal_request_notification_callback( + callbacks.action.action_goal_request_notification); + } + if (callbacks.action.action_feedback_notification) + { + handler_->set_action_feedback_notification_callback( + callbacks.action.action_feedback_notification); + } + if (callbacks.action.action_cancel_request_notification) + { + handler_->set_action_cancel_request_notification_callback( + callbacks.action.action_cancel_request_notification); + } + if (callbacks.action.action_result_notification) + { + handler_->set_action_result_notification_callback( + callbacks.action.action_result_notification); + } + if (callbacks.action.action_status_notification) + { + handler_->set_action_status_notification_callback( + callbacks.action.action_status_notification); + } + if (callbacks.action.action_query) + { + enabler_participant_->set_action_query_callback(callbacks.action.action_query); + } } bool DDSEnabler::publish( @@ -218,5 +291,339 @@ bool DDSEnabler::publish( return enabler_participant_->publish(topic_name, json); } +bool DDSEnabler::send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id) +{ + sent_request_id_++; + if (!enabler_participant_->publish_rpc( + std::string(participants::REQUEST_PREFIX) + service_name + participants::REQUEST_SUFFIX, + json, + sent_request_id_)) + return false; + + request_id = sent_request_id_; + return true; +} + +bool DDSEnabler::announce_service( + const std::string& service_name) +{ + return enabler_participant_->announce_service(service_name); +} + +bool DDSEnabler::revoke_service( + const std::string& service_name) +{ + return enabler_participant_->revoke_service(service_name); +} + +bool DDSEnabler::send_service_reply( + const std::string& service_name, + const std::string& json, + const uint64_t request_id) +{ + return enabler_participant_->publish_rpc(std::string(participants::REPLY_PREFIX) + service_name + participants::REPLY_SUFFIX, json, request_id); +} + +bool DDSEnabler::send_action_goal( + const std::string& action_name, + const std::string& json, + UUID& action_id) +{ + std::string goal_json = RpcUtils::make_send_goal_request_json(json, action_id); + uint64_t goal_request_id = 0; + std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; + + if (handler_->store_action_request( + action_name, + action_id, + sent_request_id_+1, + RpcUtils::ActionType::GOAL) + && + send_service_request( + goal_request_topic, + goal_json, + goal_request_id)) + { + return true; + } + + handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); + + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal to action " << action_name); + return false; +} + +bool DDSEnabler::send_action_get_result_request( + const std::string& action_name, + const UUID& action_id) +{ + std::string json = "{\"goal_id\": {\"uuid\": ["; + for (size_t i = 0; i < sizeof(action_id); ++i) + { + json += std::to_string(action_id[i]); + if (i != sizeof(action_id) - 1) + { + json += ", "; + } + } + json += "]}}"; + + std::string get_result_request_topic = action_name + participants::ACTION_RESULT_SUFFIX; + uint64_t get_result_request_id = 0; + + if (handler_->store_action_request( + action_name, + action_id, + sent_request_id_+1, + RpcUtils::ActionType::RESULT) + && + send_service_request( + get_result_request_topic, + json, + get_result_request_id)) + { + return true; + } + + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result request to action " << action_name + << ": cancelling."); + cancel_action_goal(action_name, action_id, 0); + return false; +} + +bool DDSEnabler::cancel_action_goal( + const std::string& action_name, + const participants::UUID& goal_id, + const int64_t timestamp) +{ + if (goal_id != participants::UUID() && + !handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to cancel action goal for action " << action_name + << ": goal id not found."); + return false; + } + + // Create JSON object + nlohmann::json j; + int64_t sec = timestamp / 1'000'000'000; + uint32_t nanosec = timestamp % 1'000'000'000; + j["goal_info"]["stamp"]["sec"] = static_cast(sec); + j["goal_info"]["stamp"]["nanosec"] = static_cast(nanosec); + j["goal_info"]["goal_id"]["uuid"] = goal_id; + std::string cancel_json = j.dump(4); + + uint64_t cancel_request_id = 0; + std::string cancel_request_topic = action_name + participants::ACTION_CANCEL_SUFFIX; + + if (send_service_request( + cancel_request_topic, + cancel_json, + cancel_request_id)) + { + return true; + } + + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel goal to action " << action_name); + return false; +} + +bool DDSEnabler::announce_action( + const std::string& action_name) +{ + return enabler_participant_->announce_action(action_name); +} + +bool DDSEnabler::revoke_action( + const std::string& action_name) +{ + return enabler_participant_->revoke_action(action_name); +} + +void DDSEnabler::send_action_send_goal_reply( + const std::string& action_name, + const uint64_t goal_id, + bool accepted) +{ + // Get current time in seconds and nanoseconds + auto now = std::chrono::system_clock::now(); + auto duration_since_epoch = now.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + + // Create JSON object + nlohmann::json j; + j["accepted"] = accepted; + j["stamp"]["sec"] = static_cast(sec); + j["stamp"]["nanosec"] = static_cast(nanosec); + std::string reply_json = j.dump(4); + + if (!send_service_reply( + action_name + participants::ACTION_GOAL_SUFFIX, + reply_json, + goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal reply to action " << action_name + << ": goal id not found."); + } + return; +} + +bool DDSEnabler::send_action_cancel_goal_reply( + const char* action_name, + const std::vector& goal_ids, + const participants::CANCEL_CODE& cancel_code, + const uint64_t request_id) +{ + // Create JSON object + nlohmann::json j; + j["return_code"] = cancel_code; + j["goals_canceling"] = nlohmann::json::array(); + for (const auto& goal_id : goal_ids) + { + std::chrono::system_clock::time_point timestamp; + if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) + { + // EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + // "Not including goal " << goal_id << " in cancel reply for action " + // << action_name << ": goal id not found."); + continue; + } + + nlohmann::json goal_json; + goal_json["goal_id"]["uuid"] = goal_id; + auto duration_since_epoch = timestamp.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + goal_json["stamp"]["sec"] = static_cast(sec); + goal_json["stamp"]["nanosec"] = static_cast(nanosec); + j["goals_canceling"].push_back(goal_json); + } + std::string reply_json = j.dump(4); + + if (!send_service_reply( + std::string(action_name) + participants::ACTION_CANCEL_SUFFIX, + reply_json, + request_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel reply to action " << action_name + << ": request id not found."); + return false; + } + return true; +} + +bool DDSEnabler::send_action_result( + const char* action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code, + const char* json) +{ + if (!handler_->is_UUID_active(action_name,goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action feedback to action " << action_name + << ": goal id not found."); + return false; + } + + // Create JSON object + nlohmann::json j; + j["status"] = status_code; + j["result"] = nlohmann::json::parse(json); + std::string reply_json = j.dump(4); + + return handler_->handle_action_result(action_name, goal_id, reply_json); +} + +bool DDSEnabler::send_action_get_result_reply( + const std::string& action_name, + const participants::UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id) +{ + std::string result_topic = action_name + participants::ACTION_RESULT_SUFFIX; + + if (send_service_reply( + result_topic, + reply_json, + request_id)) + { + handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); + return true; + } + + return false; +} + +bool DDSEnabler::send_action_feedback( + const char* action_name, + const char* json, + const participants::UUID& goal_id) +{ + if (!handler_->is_UUID_active(action_name,goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action feedback to action " << action_name + << ": goal id not found."); + return false; + } + + // Create JSON object + nlohmann::json j; + j["goal_id"]["uuid"] = goal_id; + j["feedback"] = nlohmann::json::parse(json); + std::string feedback_json = j.dump(4); + std::string feedback_topic = "rt/" + std::string(action_name) + "feedback"; + + return enabler_participant_->publish(feedback_topic, feedback_json); +} + +bool DDSEnabler::update_action_status( + const std::string& action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code) +{ + std::chrono::system_clock::time_point goal_accepted_stamp; + if (!handler_->is_UUID_active(action_name,goal_id, &goal_accepted_stamp)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to update action status to action " << action_name + << ": goal id not found."); + return false; + } + + auto duration_since_epoch = goal_accepted_stamp.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + + nlohmann::json goal_info; + goal_info["goal_id"]["uuid"] = goal_id; + goal_info["stamp"]["sec"] = static_cast(sec); + goal_info["stamp"]["nanosec"] = static_cast(nanosec); + + + nlohmann::json goal_status; + goal_status["goal_info"] = goal_info; + goal_status["status"] = status_code; + + nlohmann::json j; + j["status_list"] = nlohmann::json::array({goal_status}); + + std::string status_json = j.dump(4); + std::string status_topic = "rt/" + action_name + "status"; + return enabler_participant_->publish(status_topic, status_json); +} + + } /* namespace ddsenabler */ } /* namespace eprosima */ diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index a3c65e43..443a1632 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "ddsenabler/dds_enabler_runner.hpp" @@ -31,6 +32,13 @@ using namespace eprosima::ddsenabler; using namespace eprosima::ddsenabler::participants; using namespace eprosima::fastdds::dds; +#define TEST_SERVICE_NAME "add_two_ints" +#define TEST_ACTION_NAME "fibonacci/_action/" + +#define TEST_FILE_DIRECTORY "/home/eugenio/Documents/enabler_suite/fast_suite/src/FIWARE-DDS-Enabler/ddsenabler/test/test_files/" +#define TEST_SERVICE_FILE "test_service.json" +#define TEST_ACTION_FILE "test_action.json" + namespace ddsenablertester { struct KnownType @@ -340,6 +348,49 @@ class DDSEnablerTester : public ::testing::Test { } + // eprosima::ddsenabler::participants::ServiceTypeQuery type_req_callback; + static bool test_service_type_request_callback( + const char* service_name, + char*& request_type_name, + char*& request_serialized_qos, + char*& reply_type_name, + char*& reply_serialized_qos) + { + if (current_test_instance_) + { + std::lock_guard lock(current_test_instance_->rpc_mutex_); + + std::string service_file = TEST_FILE_DIRECTORY; + std::string request_type_name_str; + std::string reply_type_name_str; + std::string request_serialized_qos_str; + std::string reply_serialized_qos_str; + if (eprosima::ddsenabler::participants::utils::load_service_from_file( + service_file, + service_name, + request_type_name_str, + reply_type_name_str, + request_serialized_qos_str, + reply_serialized_qos_str)) + { + request_type_name = new char[request_type_name_str.size() + 1]; + std::strcpy(request_type_name, request_type_name_str.c_str()); + + reply_type_name = new char[reply_type_name_str.size() + 1]; + std::strcpy(reply_type_name, reply_type_name_str.c_str()); + + request_serialized_qos = new char[request_serialized_qos_str.size() + 1]; + std::strcpy(request_serialized_qos, request_serialized_qos_str.c_str()); + + reply_serialized_qos = new char[reply_serialized_qos_str.size() + 1]; + std::strcpy(reply_serialized_qos, reply_serialized_qos_str.c_str()); + return true; + } + std::cout << "ERROR DDSEnablerTester: fail to load service from file: " << service_file << std::endl; + } + return false; + } + int get_received_types() { if (current_test_instance_) @@ -394,6 +445,7 @@ class DDSEnablerTester : public ::testing::Test std::mutex type_received_mutex_; std::mutex topic_received_mutex_; std::mutex data_received_mutex_; + std::mutex rpc_mutex_; }; diff --git a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt index 5a0d230c..cf1acc8e 100644 --- a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt +++ b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt @@ -40,6 +40,14 @@ set(TEST_LIST send_history_bigger_than_writer send_history_smaller_than_writer send_history_multiple_types + manual_service_discovery + manual_request + manual_reply + manual_action_discovery + manual_action_client + manual_action_client_cancel + manual_action_server + manual_action_server_cancel ) set(TEST_NEEDED_SOURCES diff --git a/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp b/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp index 85305197..3a475262 100644 --- a/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp +++ b/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp @@ -385,6 +385,72 @@ TEST_F(DDSEnablerTest, send_history_multiple_types) ASSERT_EQ(get_received_data(), types * history_depth); } +// SERVICES + +TEST_F(DDSEnablerTest, service_client) +{ + auto enabler = create_ddsenabler(); + ASSERT_TRUE(enabler != nullptr); + + std::this_thread::sleep_for(std::chrono::seconds(2)); + + std::string json = "{\"a\": 1, \"b\": 2}"; + std::string service_name = "add_two_ints"; + uint64_t request_id = 0; + ASSERT_FALSE(enabler->send_service_request(service_name, json, request_id)); +} + + +TEST_F(DDSEnablerTest, service_server) +{ + auto enabler = create_ddsenabler(); + ASSERT_TRUE(enabler != nullptr); + + std::string service_name = "add_two_ints"; + + ASSERT_FALSE(enabler->revoke_service(service_name)); + ASSERT_TRUE(enabler->announce_service(service_name)); + ASSERT_FALSE(enabler->announce_service(service_name)); + + std::this_thread::sleep_for(std::chrono::seconds(2)); + + ASSERT_TRUE(enabler->revoke_service(service_name)); + ASSERT_FALSE(enabler->revoke_service(service_name)); +} + +// ACTIONS + +TEST_F(DDSEnablerTest, action_client) +{ + auto enabler = create_ddsenabler(); + ASSERT_TRUE(enabler != nullptr); + + std::this_thread::sleep_for(std::chrono::seconds(2)); + + std::string json = "{\"order\": 20}"; + std::string action_name = "fibonacci/_action/"; + UUID action_id; + + ASSERT_FALSE(enabler->send_action_goal(action_name, json, action_id)); +} + +TEST_F(DDSEnablerTest, action_server) +{ + auto enabler = create_ddsenabler(); + ASSERT_TRUE(enabler != nullptr); + + std::string action_name = "fibonacci/_action/"; + + ASSERT_FALSE(enabler->revoke_action(action_name)); + ASSERT_TRUE(enabler->announce_action(action_name)); + ASSERT_FALSE(enabler->announce_action(action_name)); + + std::this_thread::sleep_for(std::chrono::seconds(2)); + + ASSERT_TRUE(enabler->revoke_action(action_name)); + ASSERT_FALSE(enabler->revoke_action(action_name)); +} + int main( int argc, char** argv) diff --git a/ddsenabler/test/test_files/action_msgs__msg__dds___GoalStatusArray_.bin b/ddsenabler/test/test_files/action_msgs__msg__dds___GoalStatusArray_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b2666b485208d5c75e4eaddcea453f1b4ca49c5 GIT binary patch literal 1301 zcmb7EOOo0!5Ope*L*xi47K6=a3{|s`Z2TdE85{h;8_J)60U12l4A{4rBV?H)o88F580emB!1}Oq*Y(C%NvlOmEfnwx)&9!vkFse$qEtBZQvD4zf{2NBmJ->hUJ^ zNtx>86iDQh>Ruh@+BOU({b?>XVRPt*y3+*IdpfB?PiA{9$cIcYGcf!aA&k%n#);%@ zuOEHpZLoCx%s0ikc8WU|S)6$k)cGOY;uUw+#|kdQvAJGNHNVL3UHyjp56!uQ^c?py zKZ#le>c-ik;}o&fTg8F3Pbfa{(`~T}4QoZc5ldP*^Lu$L0%p8m`vJGYhiq=E^+{Lp zJ+U8c>uKZ7e4=KI7iL0fkj2`d2w5;fW9At}7(G3@nJdqaFO%wSqXlwnQLBt6$d8*; z*Q$iY^FDrvAL+`^FJzFFXP1a_e@Z-W<~l2uLt#}@DIjEA`wI!tSZ&xkmxv8m zG2k^kG4dI3^kE%zt~j4Z6GO|?u34?`_Jv~B3B|*4{-#OSke=f#c@5Mm@bP^*a63+x z8eS8eF>fK$0lNe|9o2zx7@7Ls-EFYk^`bnkY^Ia%5OC8$oQE$k*BIQZ4$v9y1?9nN zF9JtQ{&B|Z|3>S7@BaY!WB&tEEAw-2o3?gA;ca8lxwLM4{Gu@_l>T<#-*qo;eAvOb nUIc{qU1fM#-yi=|gORD$fLVUCM`!|T$&Fv>QY0O&1y=80o(g{o literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin b/ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..3312fb7d0c1bdff5828d78c9b30010552eda61aa GIT binary patch literal 1029 zcmbVLU2@tm5O$}%M9+{;8=F9YnLJ2#Y@i9mHvT~`j4fjfk-@}v0N&G;xScDj2m*_rTIk z5{NRfL>+3PPAvb-a&ybV$KEVg8`kW5%yOC#tZ#{m`F(kIit)%8!9{4>J)wl$7+-7|v5GmS3wajvthYlsw~cdc z8T3}z5BBtFwQwz;hM;2t|J8?g zCfZ;67>l60Wx+}66si-!LtpR?)C1gr0T8|;v<>)q$25txuaL+CHX^f*04?^2Ip z)k^Klb|lY??eW;(Hy-JO^zoAi!OVVe4Myr?R>asX%*FkUUXN`K8+6dj>^DXH+A9RZldYZY&K{fYU(LHYQ zJ`GrvTI?Ju?3`NumE`7ug!ADdmmAWYhQxB4kXzqkHSslZ)`om&3Tg?el?Q|odH|m) z{-Ik8gmpmk{nz$TlAGsbV6*78je>W+8@t?Lf8K3hH>#)ijnyslSn1sIH?`Qm@w^1? zXt7_~+ql+`TwyuM*(DA9EDl_j6mCg!#wZ)rR7sn~q2!iw9^509wc&#K{?c?=J&p?8HA1iYTL9Vvb58f)SbtE4~CqPmkWt(^k(f^ZI6QhFUMW0zU{r ze%z#%SqoOX+I``8-qQ=ftLOz*;~XEW6TM6|ucDKl(|hCSCyyz9_kt{*2TJe58~);m z4ra<992rrd9!PKzT!r$C(E)x*3Y&%E58xP5A;^zU!WGIvbA%uOUrFf7G*`1o868Rc o9nc)&+qS`IYFuHa{j<)zd$|aXdCellJV%OO#erJDI+uIt7hl3crvLx| literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin b/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin new file mode 100644 index 0000000000000000000000000000000000000000..fac6aee92c1c40e6410c8788f2e2c699efde0400 GIT binary patch literal 925 zcmb_aS#p~|5GCbP99dvznZi|p!f}-w{HVsK~k>#-{%W-@OWLYnwa~%>= z1bULhQAkdk|#-=lg?$?d)UI$O4eQY@IxYA4PZKNH<*r2abd6uwY58iN=?1~of zU+#3o!%FZyp`R3 zJC3F!M{S3@v%5J<5Q1bz9uag(o8HlLY*x@>i z_`VEq#rA!grM~xus?4eN)7tI}=ipK`e_}-rSbWSQ{jtHH?d$)#Q_%j&@bbCRmp1C3 ZuTq<4)|OMt-?YN6bMisg;rK2~;V)fbA8P;r literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin b/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..423f3111aa0077f6c6d6a53717318aeaca2a52cf GIT binary patch literal 577 zcmb_YZE}Jz5T)%YdJDw*#Y}$$C|I;Ap#tU)0|^#%5h_rXTl7f1SreGvpgZ&SZFZC0 z&6Dn=hkHqqY>tT5S#b*MrY_D|1XY-w>g2qSXi}+aUsP4bs!&zUEG|wFrCDetHBPDq z>JTTNO;XiiDDz&A9Mg09aY;s7T{hmIU<;-5@bm%oG7K_Nhm$f_5w*ibM%iG7F20wgO#!tNl-8S7G z=tU&8bT`Chtc><-?#c1cE_eR54HRgY<=seb9!T)UH82m%g0J{cjERNYpe@EYhm5~V zcgm^^WCqN%feyWjnKPFJ=70n%Ik=#v8z#Q4@A|pIJI1ZC3~d6=(phaX&-KAbUqz*J PM46?rIV*|CaFc!ky)3dA literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin b/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..62adda76b594f80efa4318abe2d93f4575438fac GIT binary patch literal 649 zcmb`EU2=jj5XaN@6g@*fg@pud=^b3cbF~&>N!m9~^NZM2Z zKiRpeRfOGs%x1O{s%GJCFOAdXH8bq1my*5bd=9?AGlTzx`+VRTR^v4Jz)E=nbvw7a zD4dSTscM&u4BNNoq94|UghHh0_>AIOyw;*Wo(r*s zNYn8YD2bTDVqrh9Q)y;}QRbi_tJ5M6>ZUHvX~?S}&FlEQ3t3$0dgs*jD5?TopQg0PL&nm; zj`PSYLLQL#)WlUC1U*Ql`~-bzrg2dX2U+c}PI1=SHntFYeHH#cpcH|u7X(?@5LYQi z1qLVEJ}Id-+(k2|NBfI%>t0(=<4t5bUw$?{_}=f)3T$NZ3q2Gg-z2Tq79*1J6#gY! z?Y;DR(FOkPAR&{vp*j*R+{Hp~2yMmVg=K`Zy>N8>J&=bg=9N6o$^J7QZYDkBW574O zv)qe(f-Sr3Oo0#E2JE6XFnvogRrj@5IIP)CN`hpeqWIeG16R{IF zv5c?AH1IRGme%_^b!?X#$y_+);cMfBPRFHx3!h8Ik|{>(W#XNdt9WsCKTdgB^^W_E Oj1wo$MGxIK*tvf|-xo^& literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin b/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..63bb3f25a2b372c7a6ed1d84602f26c66c618ccb GIT binary patch literal 625 zcmb`E$!>!%5Qb^{6n%zXSdu70%E7cOL8_CGmhFPDAq~_liXjVc(?{!@)HbPlXpbFf zW-Jdg|L|G5k?w9KNphK|xGS1E>H4lY6e*!eQFr-am*Sl2`dHNUETf68TLo(B6yqY< z=5=N_DM`GXwoOg*B$3&yd*<_QYrULT{rsXmEdAXuEte30#e$Wj59as{0I+sFumK%A zjrRD;vQcCKp_xtkP$hk4`cx3g{*n}#pM;av2Y5a=s=`jB%E>|WS6%P4&GI^3At!kyUg)rq`7SroQL0htdem%qVk84SCNAC?IRVop#ll2 zJO`;34HcJQ%{ZbOlJH~*a6m|5AuGa$<9i?VRYl@M-jAW>;A^ zkx26!zcmqCuPoRgZ%7$Vyj}W~hVWk*CWyXI Hw?2hG43FA9v8c!$yt5@Z$;@tMGJ`s(+d&A8 zHAQvI@0p0NvJ{W=F%b%5^>|^-xr#9c&VzTckfn+}q3(rLB1S#kv*ZfY_2L9hN}u)F z&#N>Cux%Zoujb(b0K26J6fFIsy?8!;^VYz!_(c0X~&4=F#lM%0u v>cXUZFAeAXvKo+ literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__msg__dds___Log_.bin b/ddsenabler/test/test_files/rcl_interfaces__msg__dds___Log_.bin new file mode 100644 index 0000000000000000000000000000000000000000..6e56d56ad6b88f745f211f24b249834ebe089637 GIT binary patch literal 653 zcmah{TTg>f3`YGGz8PPAaALL)l0Eb|!7YOgw{bZy%K(|fgEIqm;otaAZHq?VY|=|k z`!)UAqn&9N=bENnqwW&5+`LyWyKI%bl%`pfYtu~Aa%r05?RvTFV9h0}QO&IRaZ($n z`H2_RU&)`9YQ7aD%^kS0+s!VNFhq|g$+ds*|%4O*ECdFMN zn{7|p&rOKlw^b#5gRw64gCUt2nN}V_06bEh=zjkF7_j%qV*b#A;=-!qdsjt=wu2eY&Ttphv*o&NyQ6)eNSq@5n5}|tM~0&!3S5;S zuQ+tyC;7*ld~!4NPOPUHjG5;Xp+;m{5ilJuUKhrEw|A=BjTIU<(P_ZkBCHTiYFkx8 zwSpgU9Vi~)EjVAwP^y^TghQ660uQ$We2Y2??i3|J@NNejbDsK%D$%+751x1Z2Vbm$ m<2Rn`tY7>a;fplr=6LIU%=d#iFGwCA`q~#W4!c1B literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin b/ddsenabler/test/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin new file mode 100644 index 0000000000000000000000000000000000000000..98649ae7fda80fa8104ddd2e1b057efb1527a399 GIT binary patch literal 1709 zcmb_c{f?SI5a-&yM4!PlRjgMuxjz;ZkgKSi^0EII0XXYtreV8+LbA$JT4}y@6dyI_?i;Y>y&O=FICl{W0 zT+W?Vox4WjIc6M`Kd*h)+z!{f4cE;jtYgnLBHyu5#_^nEgWD2gdQS#`TZHR9;7kL~ z>P#NPUbk9-Hl;%i{~7oI260tTUNa6p*bWml4V_93P6HHT_c-+sXNWuU&k5roZi{3e z@nrO$b#a2Yz>hj?azbW0D3O0=JxJo5H(p>ewnjMeAMD?c2Ka0C zP+l`yA>aZRh3Cev@cV@Cp{&gM-HKxiN;d;zhhsur;EE{mMsXP$)#wlRYIuU!UW@2Hvsh^joz(N7x0)4TI@iMkd6^l_fh zmZlyinTlIKQ8P|lunk?Ec)46pz%DwdKffWy^-eBC)FCdiJ9Tm#=2FqD_3dTZTKCN} z7mpwlpsk9FjC{jM!Ss+HPt-Mc2iL=-QF5qXu34oEtF6Tu)hcM2 zL@sf0hfvjk8aowcAlj7saPH9Ei3`XMQUb1WziGx^l`Rb8sKNL4eszj_{cEL6i(DDy ziQ1Lfq2@v%SH0@-3i{Rm>s4x)*mX=dDRr1U%FSiS+$0cWmIa zi~MP=IBc{ZUi8(czHAcj)OWD93&fNz)=ibuo)|??uQ6Bug-4)o!sD8qa@YDRp6~}T C4gHz` literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..d33a48d98096fbc64147c4f83e935f29597cfdaf GIT binary patch literal 261 zcmX9&TW*6e5ZtJz$SGRo)yNVbODIi|LJ3lU_y-X`1Sw7%n^cs$^sceVNHaUy$7o>! zPZI!mwbZOFn@cCOte7x_82w8K=cXhi5QgdIB$7&3O4t=srs8@NrYixa_I9l|hrSjy zUFeW!OS!t`38LrO5&T;+v`C^9_xSAWh`@FIzvHZzRlaCO+wKqEYis8aw|FdXBTVejAIlqZT0sS|t? z{7_D@?(o@7ejm}VjoNViw$F=6REKG-CbM|a=|{QM@c%+gcG0iq`=M?~`Myg(Gb-#1 z^*Ua3!>Jl07L_`k@)r&Dn81+M(}QEwX{T|nm9a~?^CtA>_z@^$FljW_T6+*X$SyQ`jGEBjc!%{F?!O!wyN8{m-ZKrb%~x3zWZ|{Nio$}`0iG$j6Kiz zUAm2Z&zwiDL*5((p7qM|?0~r*y#pN36T%$ACxU*gVCLK>mG8EN-$WdBz%~Y~E04Dl zPdUd|6gm5h=975J^0HpGk7fh`FuCsBmkJnILW1hrGSIVD=*qZeo%$WQVqN>_yIB<* z97|Ju>cl2c6MjAbSnkXNP2NX&-J`g{`FX7oIs%pR+r22)cA;yfv5_6{{1t?yW>LJM zeo&A2qg=lWz#(Li*L&Zy*HIp)OqbW_%arl6%-005TkcB*8osM%1D=VG-y3e6u}sE% zdqu$aFY4b%kNoGoCeGx%8y;7$aPW7EW$d(5_#M|2+&__fMm6Ey5~|XEK&8R!-eO&| z^Us~u_-PS1${aP=1)iO;!b&H(b3$z@M)#X~Dcj@O1GK2}a4}$~{BNY@G_JyqLlD0ytEN#_)@n1V@PjW8FnVAgh zv3`#+HY2vGF5f>p-Bwa*!?|gHI6oXr$$6l=wQOahsoh>r+LWn2e{0i~v^O9=H+arG zZ*`P`znGilGTYt&9EU1)Cn_MUqZAT&vhe}0Aak$9_)^JyIusZ+MIP7c_BB(JX#Dzd zI*Kr^$U}i?QegD9&v$k%)9BV}^s*7?j|9d;{H0U##GZAngjW9H!os6p03JU81UBy* KzZ1B!(P4kJGfW=< literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..55815c1fadef8ef09e4d88f94610111b00de5ef1 GIT binary patch literal 257 zcmXX=+YW*-44v^S{0bF=mnA+7Nl+dTP-N_dz!(uhC7bcWpZK?S#FL!%w5M%~252}y z2rYn;H)(Zy2w7%aD2$bSVq6p|#n=%KKa<&2fP4J3LZzWl?fs@iiqHslm$IPm+V`qj zc2zX4qfIa)WW5FpeStXv_-;r7GS;$(%^_Kz#CVrkY)%+;uSx7Ryt~i&%r*9xwq{$e zguG=m3=-;|^Z2CaB0;T&Pge&z&s^5+E#?{O3?>TNa=lrOsX{-ELh@=~UNAVT($m>vEyb7wzgCcRGks6 zL(g#f^y#jnd{VxARurWVdoRo7rhd)$>y^w~!)W&h!^pCBX&83?I$!NqRStjKrJuLW zu5RHK8?J3wryS#$6Ld95l5m(!vHa19KQ9EV8EC&=0NZR>BhhDqy=v( z;|qu#zc1}4dbIJ*Km!!SuZehD98##ARg*RgPdIp$2x8B8jFD%C5$OxFQkFxF>LVXV z{mjAx`T`v)1pFn{gH37&SG+dqBN3cAkVN`CRaWJ%q<6u|*cRzXKh%GoyLk1+h_^*Q z174WLF^`#QfBoOm34jL6nUsI-k5gsFDZk4c(WF&&vrkARPwC*R z|M%;=SBszX;ZD=+2N-0-#GPyH&R+ckyg6z+dG!Ic(y~a~O|ME_Xct~}lE}aGYZvuI zDRq8GYp;x;Q}?}h;H6od3g9fJ5L(Cee(Tv~cl@TiYUX-(vmwYMTk@0lBJu>Ljg-GL CZyv?~ literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b9387d7860fc1dfcb36ae4a1c7496aea715ef33 GIT binary patch literal 289 zcmXAi+fsut5Qfw7DSQSmEbVy83>T@=C|X21g^(L269SD8tpr7UH{Y!r`px`%`jcHW zLuWID&=SM9|X#n^T~7?-6jFn-atk3}bp0^1ge`ubM3FAzG1f47H=OS-o~ zGUm0)Ory1UCdBu_LjNF5fH+LZ8@X}i#KQ*CYRnhEmB_B0xJGvh8%xg=Uj?%l^a<=w3%-KL-t>ejs%7qgFspIJeyl^z2)gVo31lzar XG~G?sv>+h&gizOWnhqtcUFoAE2nSVj literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..a1212fb47b828ab89c6d5540b97d2673521949be GIT binary patch literal 569 zcmbV}OK!q25QfwC6g>kQ2oI%^SWI}O5x5Bzd2J%&gqGAm8q?C`Mm{ z@p#7mt@*6oXm_`orVXT*j3?XuF)KHeWx_N?`DvPIDiYJ2Z^hB2CEaDREs|v>io;%H zNz#`0?xh=rYrJxA-E9rtThyklmx*=1G+Im4her$ygR%*{ zxC@zDO&1`-`~x)@R;=c()tvQ4U|`K|b};fVx2iaZi)`lCs;cJc$$9?4>dYy~^@7yV z$R$&K)hqMW;lk-#>ZbUv;-m({hsRjF&WUv${clbW&v8gjYrS8`z5#QT0^|-HgR%)+ P|GzUi`^@@s9RKwfsUxVn literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c19eeb6a6d5e895949e8906d2dd53d536afdfd3e GIT binary patch literal 1277 zcmbtT(Q=wl5T(sm^c(tuS`y5!s$wbBYFSy&Q%Wt*67VX`2?b@U6Y_XdH+}z-ma{F0PO0NenbbRoj zhT}3ywDkSB`7)b^ni@w=F%DfR>c`6@a#w@JdKug944>XOa`Ge$$R`|!FO4{81K2$s z0e%u(@0m_s_)P`fL)-Q>Vcqjbi{1e_U_yEtf(JT!gfk$E z`Gu(z^18|S2~Q{f(4_5c6|YQOIrFIKc#15FGQz z{13xhdUbo`Z#i0uxY&#RIFj%1`;0#(Umg10Lyvu`SDz=%>oRJZdr_EL)Qa=O4kS5( z!T!hwmuEnmG48n$C-vrH<>XoLjw3i+3ODIrJ|ictZ}p$!i4JQ@XK?(nKAkgz&hd3> zJL{xK&(?{dJX0T?+s1Kjm-$K#TF#49#XhO4pIRIo=k_=HaD|7t-4btJ+_(Rp+Zo0B z4A7@@#3mm-8ak8Aq%f<%YqVy!0k&O+?-h>|a1?CU{xwbw=jocLEq`BD~Hh>)HBWj9lXFQ_R*OK5!bm_<}*3>isSX21@?@!hoIc T6HKoE<%Ln!3wVA$AQ=4s0m8Eq literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin b/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..da5208da88ddae75cefac8d0b9ae581cba260418 GIT binary patch literal 1233 zcmbVMQFEd|4Cb!C;(o)uAeNpw(}x8Gq*D~CfV?=efT)XS1+DV0`VTLOwbdD4dOJf1 zyUCX?AzA5%bay97(mgy|E~blhm2R^cPs>iH-0nM_Bq^tz&P!SiXWLnk!f846($`&D zR@130{Q|$%`r*FzHoUcO*N!#nX3PDIvByU^lAeD`Qt9>>8`>UoS#4kt$7j1>&Bc6u* zSr-N51w3R>v{l^n7qRJI;hMycNNCIgC*tSGyb!ynae>L$65)tH#GenJ@zd#{y=kin z;6g2qlTcjY_X&T3wi@eqPc`;1Uu_X9?J`u1BQFd!Y({x(`2r1@PWHeCmaDTCVT`E| z7y0IVZRe?f#gW;R3Ki)yo}MGuul#TE1cMER)5-swpGJ|HM*ekT*_*gXZsrND)KmZ0 ztBq5yuJW}QH0^_s`7y4mCpGfVz4{LQN?DzHb%$JOQLVn+s~P%w1kgu0B9%lB8_hs9 zE{rOodaxB8ebnamOhJW_p!M}1amEyQzCF9(L$muj*G1^N$Mm%p70axuH3DD*Dpw+l*L|A;<)q`#p2a8D1r^gZ0Vc4+->uc`+f`C zq+8U-_ob#fpF@{?HrT9>9#yZHm*an zsNVKMM)S#PxAt_Jpr3inG+ai~(6L2bJ>S@M>>OL{08b6rLO`vXurUUx0HyfEI=b>0 zt-ah9AB|{YA9xW)1s%-+Bb{U}qx(=`HFDlx#{K`#&4riBPPCmm(?RxP=gxhNDE;Q; z197>Sb>`*aG8AAi#_)GuBAIml;)S(I7Rl;9%xQ+)z__`kx%2G@AMajFhxiHq)$ literal 0 HcmV?d00001 diff --git a/ddsenabler/test/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin b/ddsenabler/test/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c3236d9624c069dfe9de6002e525a51609b867f5 GIT binary patch literal 1025 zcmbVL+isgc5GBf2^c(t6gJTDf@~~VCrZ%=WGT@ae3)nio0Hy}xn74j*-#W9n?Mo^} z8EI#SVRqOv=OEol_xF+{4Pl+~%bN3QogVZ2Sm=6Qz34h7bbTJ5>Rq}k&THAx}^6O8RyuNnaL(khw?6g2)hcX7*q= zu1Ul<%%N?h_)QYZO|m}@lgKY-`|`kCe*^n0QD{cPK`)MI$s*rNa@Ir_Y-0}48zQvP zceXHIA;9z;6G^TeSfHI(p`4|CW4lt8m_|#5$NLeRq`1Q}Uto6z4ReA`l8;WeIrb-!_Nvkkw-*j;oV#>TZJ@BGp&e2x=ED)?<8z0zBk3#AYe{^#YbU2imRDATRpS1<@0HvMu93n^Hqu%a{lzL~{89eoKm5JIg1(iQw9uz|LkA>c@?H2AtH|rcpDd9UZz_5pgOy-sVl8*HxTXy=b$9iw@(iyfG>|gVC*DX$_nIesDc?K(@4oRe@vL6CWp?xQ)%bSe3%0z)RQr{izF^O@%Ea$c2D05v$I{j0i*{Dn@?hCZ&K71;wBy_)g~m_L252w!0yl zlhoO&t(0BGFgRmR&(~jnGmUSJKmKeq8U{RvGLIg^s0f~)^25_^`}njyM9-^55Eb2S z@qFrb!?1Ylc8%!p08_PJX4+Aa@3uws_$W0R-@#Ys?a-mhR@%C&mM!Q@abTeOv50*hL2;WFT$}-p*L6yr^9@5IKsB- z(l_mYh~1Fpt4H6JQ~cInuqEg?Ga2h)D28+N6?L<4+gluEyRS^8eM5?NXZ zM_n(Kwj|uP6p+7)4;RB$sj)pyhP>RLTa$Tyh;psC83HG&wLW3nqKGMWg!yaO+F6<| z4I9?rz;Q6#8z*e(lOYxixy1j)ll5pEat=1t%G04WeI58^9-p$A2E5pjD;({WIx$Vuu6S***WU1Tjz;OD)v(`bDzJx}4TBeY1$nQ3gEKnmxqI zr2nm!nSLN_dW3C_eUEi;&g6bw#=*W&&+>5T?Wecnr!8a+Gsg^A-+kRwoJHps#`e0# z_W3rHMl*M`_wU=A_-Ym}25)P9|JG=f7)zxIw-^PP_H}G)-p)yH!FP=QL6E^*Y%1$B zkR1}zS`%_nk9^PsAZ4WqRuUNcdg0lXzVd6FT`2?lA=LRfGza-I3s=6Pzxb||hh|ke zjFa4Hv;@>m^A$CRA0g+U8}{n6F1_J%F%4GS;4nMe8Hx9FN`zW0630rZb z-{wOeq(O_HmRl?JC^y;;m*QA5we;gRU<;fm@W*rLT5w;n&SLA}4`e2l*!x+kp)W%u z3(#)Bc?C}rDC)7E&hBX~DnZUB!-Y`!{J|6(Zy=iC+#g3ck)yxgbC3K~+^Os8P4n)C z59xF~i+v|ikEf1uw?bafHKW!{hy!A>(pvjSXe+|Mb4L|hRgDvAG~RF#wI1drIH}J5 XG&1edcT}i#aSAdyA; + +enum STATUS_CODE { + STATUS_UNKNOWN = 0, + STATUS_ACCEPTED, + STATUS_EXECUTING, + STATUS_CANCELING, + STATUS_SUCCEEDED, + STATUS_CANCELED, + STATUS_ABORTED, + STATUS_REJECTED, + STATUS_TIMEOUT, + STATUS_FAILED, + STATUS_CANCEL_REQUEST_FAILED + }; + +enum CANCEL_CODE { + ERROR_NONE = 0, + ERROR_REJECTED, + ERROR_UNKNOWN_GOAL_ID, + ERROR_GOAL_TERMINATED +}; + /** * DdsLogFunc - callback executed when consuming log messages * @@ -108,6 +131,256 @@ typedef bool (* DdsTopicQuery)( std::string& type_name, std::string& serialized_qos); +/**********************/ +/* SERVICES */ +/**********************/ + + +/** + * @brief Callback for notification of service discovery and its request and reply types. + * + * This callback is used to notify the discovery of a service and its associated request and reply types. + * + * @param service_name The name of the service that was discovered. + * @param request_type_name The name of the request type associated with the service. + * @param request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. + * @param reply_type_name The name of the reply type associated with the service. + * @param reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + */ +typedef void (* ServiceNotification)( + const char* service_name, + const char* request_type_name, + const char* reply_type_name, + const char* request_serialized_qos, + const char* reply_serialized_qos); + +/** + * @brief Callback for reception of RPC reply data. + * + * This callback is used to notify the reception of a reply for a specific service. + * + * @param service_name The name of the service for which the reply was received. + * @param json The JSON data received in the reply. + * @param request_id The unique identifier of the request for which this is a reply. + * @param publish_time The time at which the reply was published. + */ +typedef void (* ServiceReplyNotification)( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time); + +/** + * @brief Callback for reception of service request data. + * + * This callback is used to notify the reception of a request for a specific service. + * + * @param service_name The name of the service for which the request was received. + * @param json The JSON data received in the request. + * @param request_id The unique identifier of the request. + * @param publish_time The time at which the request was published. + * + * @note The request_id is unique for each request and must be later used to identify the reply. + */ +typedef void (* ServiceRequestNotification)( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time); + +/** + * @brief Callback requesting the type information of a given service's request and reply. + * + * This callback is used to request the type information for a service's request and reply. + * + * @param service_name The name of the service for which the type information is requested. + * @param request_type_name The name of the request type associated with the service. + * @param request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. + * @param reply_type_name The name of the reply type associated with the service. + * @param reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + */ + typedef bool (* ServiceQuery)( + const char* service_name, + std::string& request_type_name, + std::string& request_serialized_qos, + std::string& reply_type_name, + std::string& reply_serialized_qos); + + +/**********************/ +/* ACTIONS */ +/**********************/ + + +/** + * @brief Callback for notification of action discovery and its associated types. + * + * This callback is used to notify the discovery of an action and its associated types. + * + * @param action_name The name of the action that was discovered. + * @param goal_request_action_type The type of the goal request action. + * @param goal_reply_action_type The type of the goal reply action. + * @param cancel_request_action_type The type of the cancel request action. + * @param cancel_reply_action_type The type of the cancel reply action. + * @param result_request_action_type The type of the get result request action. + * @param result_reply_action_type The type of the get result reply action. + * @param feedback_action_type The type of the feedback action. + * @param goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. + * @param goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. + * @param cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. + * @param cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. + * @param result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. + * @param result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. + * @param feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + */ +typedef void (* ActionNotification)( + const char* action_name, + const char* goal_request_action_type, + const char* goal_reply_action_type, + const char* cancel_request_action_type, + const char* cancel_reply_action_type, + const char* result_request_action_type, + const char* result_reply_action_type, + const char* feedback_action_type, + const char* status_action_type, + const char* goal_request_action_serialized_qos, + const char* goal_reply_action_serialized_qos, + const char* cancel_request_action_serialized_qos, + const char* cancel_reply_action_serialized_qos, + const char* result_request_action_serialized_qos, + const char* result_reply_action_serialized_qos, + const char* feedback_action_serialized_qos, + const char* status_action_serialized_qos); + +/** + * @brief Callback for notification of an action goal request. + * + * This callback is used to notify the request of an action goal. + * + * @param action_name The name of the action for which the goal is being requested. + * @param json The JSON data representing the goal request. + * @param goal_id The unique identifier of the goal associated with the action. + * @param publish_time The time at which the goal request was published. + * @param status_code The status code as a place holder for the current state of the action. + */ +typedef bool (* ActionGoalRequestNotification)( + const char* action_name, + const char* json, + const UUID& goal_id, + int64_t publish_time); + +/** + * @brief Callback for notification of an action cancel request. + * + * This callback is used to notify the request to cancel an action goal: + * + * If the goal ID is empty and timestamp is zero, cancel all goals + * If the goal ID is empty and timestamp is not zero, cancel all goals accepted at or before the timestamp + * If the goal ID is not empty and timestamp is zero, cancel the goal with the given ID regardless of the time it was accepted + * If the goal ID is not empty and timestamp is not zero, cancel the goal with the given ID and all goals accepted at or before the timestamp + * + * @param action_name The name of the action for which the cancel request is being made. + * @param goal_id The unique identifier of the goal associated with the action. + * @param publish_time The time at which the cancel request was published. + * @param status_code The status code as a place holder for the current state of the action. + */ +typedef void (* ActionCancelRequestNotification)( + const char* action_name, + const UUID& goal_id, + int64_t timestamp, + uint64_t request_id, + int64_t publish_time); + +/** + * @brief Callback for notification of action feedback. + * + * This callback is used to notify the feedback of an action. + * + * @param action_name The name of the action for which the feedback is being notified. + * @param json The JSON data representing the feedback of the action. + * @param goal_id The unique identifier of the goal associated with the action. + * @param publish_time The time at which the feedback was published. + */ +typedef void (* ActionFeedbackNotification)( + const char* action_name, + const char* json, + const UUID& goal_id, + int64_t publish_time); + +/** + * @brief Callback for notification of an update for an action status. + * + * This callback is used to notify the update of the status of an action. + * + * @param action_name The name of the action for which the status is being notified. + * @param goal_id The unique identifier of the goal associated with the action. + * @param status_code The status code representing the current state of the action. + * @param status_message A message providing additional information about the status. + * @param publish_time The time at which the status was published. + */ +typedef void (* ActionStatusNotification)( + const char* action_name, + const UUID& goal_id, + STATUS_CODE status_code, + const char* status_message, + int64_t publish_time); + +/** + * @brief Callback for notification of action result. + * + * This callback is used to notify the result of an action in case of success. + * + * @param action_name The name of the action for which the result is being notified. + * @param json The JSON data representing the result of the action. + * @param goal_id The unique identifier of the goal associated with the action. + * @param publish_time The time at which the result was published. + */ +typedef void (* ActionResultNotification)( + const char* action_name, + const char* json, + const UUID& goal_id, + int64_t publish_time); + +/** + * @brief Callback for requesting the action types. + * + * This callback is used to request the action types for a specific action. + * + * @param action_name The name of the action for which the types are being requested. + * @param goal_request_action_type The type of the goal request action. + * @param goal_reply_action_type The type of the goal reply action. + * @param cancel_request_action_type The type of the cancel request action. + * @param cancel_reply_action_type The type of the cancel reply action. + * @param result_request_action_type The type of the get result request action. + * @param result_reply_action_type The type of the get result reply action. + * @param feedback_action_type The type of the feedback action. + * @param goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. + * @param goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. + * @param cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. + * @param cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. + * @param result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. + * @param result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. + * @param feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + */ +typedef bool (* ActionQuery)( + const char* action_name, + std::string& goal_request_action_type, + std::string& goal_reply_action_type, + std::string& cancel_request_action_type, + std::string& cancel_reply_action_type, + std::string& result_request_action_type, + std::string& result_reply_action_type, + std::string& feedback_action_type, + std::string& status_action_type, + std::string& goal_request_action_serialized_qos, + std::string& goal_reply_action_serialized_qos, + std::string& cancel_request_action_serialized_qos, + std::string& cancel_reply_action_serialized_qos, + std::string& result_request_action_serialized_qos, + std::string& result_reply_action_serialized_qos, + std::string& feedback_action_serialized_qos, + std::string& status_action_serialized_qos); + } /* namespace participants */ } /* namespace ddsenabler */ } /* namespace eprosima */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp index acbf84ac..34ba2c43 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp @@ -28,6 +28,19 @@ constexpr const char* QOS_SERIALIZATION_DURABILITY("durability"); constexpr const char* QOS_SERIALIZATION_OWNERSHIP("ownership"); constexpr const char* QOS_SERIALIZATION_KEYED("keyed"); +// Service mangling +constexpr const char* REQUEST_PREFIX("rq/"); +constexpr const char* REQUEST_SUFFIX("Request"); +constexpr const char* REPLY_PREFIX("rr/"); +constexpr const char* REPLY_SUFFIX("Reply"); + +// Action mangling +constexpr const char* ACTION_GOAL_SUFFIX("send_goal"); +constexpr const char* ACTION_RESULT_SUFFIX("get_result"); +constexpr const char* ACTION_CANCEL_SUFFIX("cancel_goal"); +constexpr const char* ACTION_FEEDBACK_SUFFIX("/feedback"); +constexpr const char* ACTION_STATUS_SUFFIX("/status"); + } /* namespace participants */ } /* namespace ddsenabler */ } /* namespace eprosima */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 2e67b8a7..a089b8d0 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -23,11 +23,14 @@ #include #include -#include #include #include #include +#include +#include +#include + namespace eprosima { namespace ddsenabler { @@ -44,6 +47,12 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant std::shared_ptr discovery_database, std::shared_ptr schema_handler); + DDSENABLER_PARTICIPANTS_DllAPI + bool is_rtps_kind() const noexcept override + { + return true; // Temporal workaround until Pipe refactor + } + DDSENABLER_PARTICIPANTS_DllAPI std::shared_ptr create_reader( const ddspipe::core::ITopic& topic) override; @@ -53,6 +62,12 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& topic_name, const std::string& json); + DDSENABLER_PARTICIPANTS_DllAPI + bool publish_rpc( + const std::string& topic_name, + const std::string& json, + const uint64_t request_id); + DDSENABLER_PARTICIPANTS_DllAPI void set_topic_query_callback( participants::DdsTopicQuery callback) @@ -60,22 +75,107 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant topic_query_callback_ = callback; } + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_query_callback( + participants::ServiceQuery callback) + { + service_query_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_query_callback( + participants::ActionQuery callback) + { + action_query_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + bool announce_service( + const std::string& service_name); + + DDSENABLER_PARTICIPANTS_DllAPI + bool revoke_service( + const std::string& service_name); + + DDSENABLER_PARTICIPANTS_DllAPI + bool announce_action( + const std::string& action_name); + + DDSENABLER_PARTICIPANTS_DllAPI + bool revoke_action( + const std::string& action_name); + protected: - std::shared_ptr lookup_reader_nts_( + bool query_topic_nts_( + const std::string& topic_name, + ddspipe::core::types::DdsTopic& topic); + + bool query_service_nts_( + std::shared_ptr service); + + bool query_action_nts_( + ActionDiscovered& action, + std::unique_lock& lck); + + bool create_topic_writer_nts_( + const ddspipe::core::types::DdsTopic& topic, + std::shared_ptr& reader, + ddspipe::core::types::Endpoint& request_edp, + std::unique_lock& lck); + + bool create_service_request_writer_nts_( + std::shared_ptr service, + std::unique_lock& lck); + + bool fullfill_topic_type_nts_( + const std::string& topic_name, + const std::string _type_name, + const std::string serialized_qos_content, + ddspipe::core::types::DdsTopic& topic); + + bool fullfill_service_type_nts_( + const std::string _request_type_name, + const std::string serialized_request_qos_content, + const std::string _reply_type_name, + const std::string serialized_reply_qos_content, + std::shared_ptr service); + + std::shared_ptr lookup_reader_nts_( const std::string& topic_name, std::string& type_name) const; - std::shared_ptr lookup_reader_nts_( + std::shared_ptr lookup_reader_nts_( const std::string& topic_name) const; - std::map> readers_; + bool service_discovered_nts_( + const std::string& service_name, + const ddspipe::core::types::DdsTopic& topic, + RpcUtils::RpcType rpc_type); + + bool action_discovered_nts_( + const std::string& action_name, + const ddspipe::core::types::DdsTopic& topic, + RpcUtils::RpcType rpc_type); + + bool revoke_service_nts_( + const std::string& service_name); + + std::map> readers_; + + std::map> services_; + + std::map actions_; std::mutex mtx_; std::condition_variable cv_; DdsTopicQuery topic_query_callback_; + + ServiceQuery service_query_callback_; + + ActionQuery action_query_callback_; }; } /* namespace participants */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 99a4e6f4..5c7510a8 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -21,11 +21,13 @@ #include #include #include -#include +#include +#include #include #include #include +#include #include #include @@ -35,6 +37,8 @@ #include #include #include +#include +#include #include namespace std { @@ -52,12 +56,25 @@ struct hash }; +template<> +struct hash { + std::size_t operator()(const eprosima::ddsenabler::participants::UUID& uuid) const noexcept { + std::size_t hash = 0; + for (uint8_t byte : uuid) { + hash ^= std::hash{}(byte) + 0x9e3779b9 + (hash << 6) + (hash >> 2); + } + return hash; + } +}; + } // std namespace eprosima { namespace ddsenabler { namespace participants { +class Writer; + /** * Class that manages the interaction between \c EnablerParticipant and the user's app. * Payloads are efficiently passed from DDS Pipe to the user's app without copying data (only references). @@ -108,6 +125,24 @@ class Handler : public ddspipe::participants::ISchemaHandler void add_topic( const ddspipe::core::types::DdsTopic& topic); + /** + * @brief Add a service, associated to the given \c service. + * + * @param [in] service RPC topic associated to this service. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void add_service( + const ddspipe::core::types::RpcTopic& service); + + /** + * @brief Add an action, associated to the given \c action. + * + * @param [in] action RPC action associated to this action. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void add_action( + const RpcUtils::RpcAction& action); + /** * @brief Add a data sample, associated to the given \c topic. * @@ -145,6 +180,72 @@ class Handler : public ddspipe::participants::ISchemaHandler const std::string& json, ddspipe::core::types::Payload& payload); + /** + * @brief Store an action request (goal, cancel or result) with its associated UUID and request ID. + * This info will later be used to associate the reply id with the UUID of the action. + * + * @note: An ActionRequestInfo can only be created if ActionType is GOAL, otherwise it will return false. + * @note: When creating the ActionRequestInfo the current time will be stored as the goal accepted stamp. + * + * @param [in] action_name Name of the action. + * @param [in] action_id UUID of the action. + * @param [in] request_id Request ID of the action request. + * @param [in] action_type Type of the action (GOAL, RESULT, CANCEL). + * @return \c true if the action request was successfully stored, \c false otherwise. + */ + DDSENABLER_PARTICIPANTS_DllAPI + bool store_action_request( + const std::string& action_name, + const UUID& action_id, + const uint64_t request_id, + const RpcUtils::ActionType action_type); + + /** + * @brief Send the reply containing the result of an action or store it for a later reply. + * If the result request was previously received the reply will be sent, otherwise the result will be stored. + * + * @param [in] action_name Name of the action. + * @param [in] action_id UUID of the action. + * @param [in] result Result of the action. + * @return \c true if the result was successfully stored, \c false otherwise. + */ + DDSENABLER_PARTICIPANTS_DllAPI + bool handle_action_result( + const std::string& action_name, + const UUID& action_id, + const std::string& result); + + /** + * @brief Erase an action UUID from the internal map that tracks which actions are active. + * + * An action is considered active if it has a goal request and has not received its result and a final status (aborted, rejected, succeeded). + * The action will be forced to be erased if \c force_erase is set to \c true , allowing to erase actions without complying with the previous condition. + * + * @note: The status updates are not a strict requirement in the ROS2 actions specification, so there could be servers not sending them. + * + * @param [in] action_id UUID of the action to be erased. + * @param [in] force_erase If \c true, the action will be erased regardless of its status. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void erase_action_UUID( + const UUID& action_id, + ActionEraseReason erase_reason); + + /** + * @brief Check if an action represented by its UUID is active. + * An action is considered active if it has a goal request and has not received its result and a final status (aborted, rejected, succeeded). + * + * @param [in] action_name Name of the action. + * @param [in] action_id UUID of the action to be checked. + * @param [out] goal_accepted_stamp Optional pointer to get the timestamp when the goal was accepted. + * @return \c true if the action is active, \c false otherwise. + */ + DDSENABLER_PARTICIPANTS_DllAPI + bool is_UUID_active( + const std::string& action_name, + const UUID& action_id, + std::chrono::system_clock::time_point* goal_accepted_stamp = nullptr); + /** * @brief Set the data notification callback. * @@ -152,10 +253,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ DDSENABLER_PARTICIPANTS_DllAPI void set_data_notification_callback( - participants::DdsDataNotification callback) - { - writer_->set_data_notification_callback(callback); - } + participants::DdsDataNotification callback); /** * @brief Set the topic notification callback. @@ -164,10 +262,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ DDSENABLER_PARTICIPANTS_DllAPI void set_topic_notification_callback( - participants::DdsTopicNotification callback) - { - writer_->set_topic_notification_callback(callback); - } + participants::DdsTopicNotification callback); /** * @brief Set the type notification callback. @@ -176,10 +271,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ DDSENABLER_PARTICIPANTS_DllAPI void set_type_notification_callback( - participants::DdsTypeNotification callback) - { - writer_->set_type_notification_callback(callback); - } + participants::DdsTypeNotification callback); /** * @brief Set the type query callback. @@ -188,13 +280,141 @@ class Handler : public ddspipe::participants::ISchemaHandler */ DDSENABLER_PARTICIPANTS_DllAPI void set_type_query_callback( - participants::DdsTypeQuery callback) - { - type_query_callback_ = callback; - } + participants::DdsTypeQuery callback); + /** + * @brief Set the service notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_notification_callback( + participants::ServiceNotification callback); + + /** + * @brief Set the service reply notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_reply_notification_callback( + participants::ServiceReplyNotification callback); + + /** + * @brief Set the service request notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_request_notification_callback( + participants::ServiceRequestNotification callback); + + /** + * @brief Set the action notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_notification_callback( + participants::ActionNotification callback); + + /** + * @brief Set the action result notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_result_notification_callback( + participants::ActionResultNotification callback); + + /** + * @brief Set the action feedback notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_feedback_notification_callback( + participants::ActionFeedbackNotification callback); + + /** + * @brief Set the action status notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_status_notification_callback( + participants::ActionStatusNotification callback); + + /** + * @brief Set the action get result request callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_send_action_get_result_request_callback( + std::function callback); + + /** + * @brief Set the action goal request notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_goal_request_notification_callback( + participants::ActionGoalRequestNotification callback); + + /** + * @brief Set the action cancel request notification callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_cancel_request_notification_callback( + participants::ActionCancelRequestNotification callback); + + /** + * @brief Set the action send goal reply callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_send_action_send_goal_reply_callback( + std::function callback); + + /** + * @brief Set the action get result reply callback. + * + * @param [in] callback Callback to be set. + */ + DDSENABLER_PARTICIPANTS_DllAPI + void set_send_action_get_result_reply_callback( + std::function callback); protected: + /** + * @brief Pop an action request UUID from the internal map that tracks which actions are active. + * + * @param [in] request_id Request ID of the action request. + * @param [in] action_type Type of the action (GOAL, RESULT, CANCEL). + * @param [out] action_id UUID of the action associated to the request. + * @return \c true if the action request was successfully popped, \c false otherwise. + */ + bool get_action_request_UUID( + const uint64_t request_id, + const RpcUtils::ActionType action_type, + UUID& action_id); + + /** + * @brief Get the result (if it has been previouly stored) of an action associated to the given \c action_id. + * + * @param [in] action_id UUID of the action. + * @param [out] result Result of the action. + * @return \c true if the result was found, \c false otherwise. + */ + bool get_action_result( + const UUID& action_id, + std::string& result); + /** * @brief Add a schema, associated to the given \c dyn_type and \c type_id. * @@ -238,6 +458,21 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_topic_nts_( const ddspipe::core::types::DdsTopic& topic); + /** + * @brief Write the service to user's app. + * + * @param [in] service RPC topic associated to this service. + */ + void write_service_nts_( + const ddspipe::core::types::RpcTopic& service); + + /** + * @brief Write the action to user's app. + * + * @param [in] action RPC action associated to this action. + */ + void write_action_nts_( + const RpcUtils::RpcAction& action); /** * @brief Write to user's app. * @@ -248,6 +483,98 @@ class Handler : public ddspipe::participants::ISchemaHandler const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type); + /** + * @brief Write the service reply to user's app. + * + * @param [in] msg Message containing the service reply. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] request_id Request ID of the service reply. + */ + void write_service_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + /** + * @brief Write the service request to user's app. + * + * @param [in] msg Message containing the service request. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] request_id Request ID of the service request. + */ + void write_service_request_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + /** + * @brief Write the action result to user's app. + * + * @param [in] msg Message containing the action goal request. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] request_id Request ID of the action goal request. + */ + void write_action_result_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id); + + /** + * @brief Write the action feedback to user's app. + * + * @param [in] msg Message containing the action feedback. + * @param [in] dyn_type DynamicType containing the type information required. + */ + void write_action_feedback_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type); + + /** + * @brief Write the action goal reply to user's app. + * + * @param [in] msg Message containing the action goal reply. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] action_id UUID of the action. + */ + void write_action_goal_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id); + + /** + * @brief Write the action cancel reply to user's app. + * + * @param [in] msg Message containing the action cancel reply. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] request_id Request ID of the action cancel reply. + */ + void write_action_cancel_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + /** + * @brief Write the action status to user's app. + * + * @param [in] msg Message containing the action status. + * @param [in] dyn_type DynamicType containing the type information required. + */ + void write_action_status_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type); + + /** + * @brief Write the action (goal or cancel) request to user's app. + * + * @param [in] msg Message containing the action request. + * @param [in] dyn_type DynamicType containing the type information required. + * @param [in] request_id Request ID of the action request. + */ + void write_action_request_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + /** * @brief Register a type using the given serialized type data. * @@ -282,10 +609,19 @@ class Handler : public ddspipe::participants::ISchemaHandler unsigned int unique_sequence_number_{0}; //! Mutex synchronizing access to object's data structures - std::mutex mtx_; + std::recursive_mutex mtx_; //! Callback to request types from the user DdsTypeQuery type_query_callback_; + + //! Counter of received requests + uint64_t received_requests_id_{0}; + + //! Map of all ActionRequestInfos to their UUIDs + std::unordered_map action_request_id_to_uuid_; + + //! Lambda to send action get result reply + std::function send_action_get_result_reply_callback_; }; } /* namespace participants */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp b/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp new file mode 100644 index 00000000..38a32634 --- /dev/null +++ b/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp @@ -0,0 +1,103 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file InternalRpcReader.hpp + */ + +#pragma once + +#include +#include + +#include + +#include +#include + +#include +#include + +namespace eprosima { +namespace ddsenabler { +namespace participants { + +/** + * Reader implementation that allows to introduce custom data to DDS Pipe. + */ +class InternalRpcReader : public ddspipe::participants::InternalReader +{ +public: + + DDSENABLER_PARTICIPANTS_DllAPI + InternalRpcReader( + const ddspipe::core::types::ParticipantId& participant_id, + const ddspipe::core::types::DdsTopic& topic) + : topic_(topic), + ddspipe::participants::InternalReader(participant_id) + { + + guid_ = ddspipe::core::types::Guid::new_unique_guid(); + } + + ~InternalRpcReader() = default; + + DDSENABLER_PARTICIPANTS_DllAPI + ddspipe::core::types::Guid guid() const override + { + return guid_; + } + + DDSENABLER_PARTICIPANTS_DllAPI + fastdds::RecursiveTimedMutex& get_rtps_mutex() const override + { + return rtps_mutex_; + } + + DDSENABLER_PARTICIPANTS_DllAPI + uint64_t get_unread_count() const override + { + if(unread_count_ == 0) + { + return 0; + } + + return unread_count_--; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void simulate_data_reception( + std::unique_ptr&& data) noexcept + { + std::lock_guard lock(rtps_mutex_); + unread_count_++; + ddspipe::participants::InternalReader::simulate_data_reception(std::move(data)); + } + + DDSENABLER_PARTICIPANTS_DllAPI + ddspipe::core::types::DdsTopic topic() const override + { + return topic_; + } + +private: + ddspipe::core::types::Guid guid_; + mutable fastdds::RecursiveTimedMutex rtps_mutex_; + mutable uint64_t unread_count_ = 0; + ddspipe::core::types::DdsTopic topic_; +}; + +} /* namespace participants */ +} /* namespace ddsenabler */ +} /* namespace eprosima */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp new file mode 100644 index 00000000..8a5d0ceb --- /dev/null +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -0,0 +1,328 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file RpcStructs.hpp + */ + +#pragma once + +#include + +#include +#include + +namespace eprosima { +namespace ddsenabler { +namespace participants { + +enum class ActionEraseReason +{ + FINAL_STATUS, // Erase triggered by receiving final status (e.g., succeeded, aborted, canceled) + RESULT, // Erase triggered by receiving result + FORCED // Force erase regardless of status/result +}; + +struct ActionRequestInfo +{ + ActionRequestInfo() = default; + + ActionRequestInfo( + const std::string& _action_name, + RpcUtils::ActionType action_type, + uint64_t request_id) + : action_name(_action_name) + , goal_accepted_stamp(std::chrono::system_clock::now()) + { + set_request(request_id, action_type); + } + + void set_request( + uint64_t request_id, + RpcUtils::ActionType action_type) + { + switch (action_type) + { + case RpcUtils::ActionType::GOAL: + goal_request_id = request_id; + break; + case RpcUtils::ActionType::RESULT: + result_request_id = request_id; + break; + default: + break; + } + return; + } + + uint64_t get_request( + RpcUtils::ActionType action_type) const + { + switch (action_type) + { + case RpcUtils::ActionType::GOAL: + return goal_request_id; + case RpcUtils::ActionType::RESULT: + return result_request_id; + default: + return 0; + } + } + + bool set_result(const std::string&& str) + { + if (str.empty() || !result.empty()) + { + return false; // Cannot set string if already set or empty + } + result = std::move(str); + return true; + } + + bool erase(ActionEraseReason erase_reason) + { + switch (erase_reason) + { + case ActionEraseReason::FINAL_STATUS: + final_status_received = true; + break; + case ActionEraseReason::RESULT: + result_received = true; + break; + case ActionEraseReason::FORCED: + final_status_received = true; + result_received = true; + break; + } + return final_status_received && result_received; + } + + std::string action_name; + uint64_t goal_request_id = 0; + uint64_t result_request_id = 0; + std::chrono::system_clock::time_point goal_accepted_stamp; + std::string result; + bool result_received = false; // Indicates if the result has been received + bool final_status_received = false; // Indicates if the final status has been received +}; + +struct ServiceDiscovered +{ + + ServiceDiscovered(const std::string& service_name) + : service_name(service_name) + { + } + + std::string service_name; + + ddspipe::core::types::DdsTopic topic_request; + bool request_discovered{false}; + + ddspipe::core::types::DdsTopic topic_reply; + bool reply_discovered{false}; + + std::optional rpc_topic; + bool fully_discovered{false}; + + std::optional endpoint_request; + bool enabler_as_server{false}; + + bool add_topic( + const ddspipe::core::types::DdsTopic& topic, + RpcUtils::RpcType rpc_type) + { + if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + { + if(request_discovered) + return false; + topic_request = topic; + request_discovered = true; + } + else + { + if(reply_discovered) + return false; + topic_reply = topic; + reply_discovered = true; + } + + if(request_discovered && reply_discovered) + { + if (service_name.empty()) + { + return false; + } + fully_discovered = true; + rpc_topic = std::make_optional( + service_name, + topic_request, + topic_reply); + return true; + } + + return false; + } + + bool remove_topic(RpcUtils::RpcType rpc_type) + { + if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + { + request_discovered = false; + topic_request = ddspipe::core::types::DdsTopic(); + } + else + { + reply_discovered = false; + topic_reply = ddspipe::core::types::DdsTopic(); + } + + fully_discovered = false; + rpc_topic = std::nullopt; + + return true; + } + + ddspipe::core::types::RpcTopic get_service() + { + if(!fully_discovered || rpc_topic == std::nullopt) + throw std::runtime_error("Service not fully discovered"); + return rpc_topic.value(); + } + + bool get_topic( + const RpcUtils::RpcType& rpc_type, + ddspipe::core::types::DdsTopic& topic) + { + if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + { + if(!request_discovered) + return false; + topic = topic_request; + return true; + } + if (rpc_type == RpcUtils::RpcType::RPC_REPLY) + { + if(!reply_discovered) + return false; + topic = topic_reply; + return true; + } + return false; + } +}; + +struct ActionDiscovered +{ + ActionDiscovered(const std::string& action_name) + : action_name(action_name) + { + } + + std::string action_name; + std::weak_ptr goal; + std::weak_ptr result; + std::weak_ptr cancel; + ddspipe::core::types::DdsTopic feedback; + bool feedback_discovered{false}; + ddspipe::core::types::DdsTopic status; + bool status_discovered{false}; + bool fully_discovered{false}; + bool enabler_as_server{false}; + + bool check_fully_discovered() + { + auto g = goal.lock(); + auto r = result.lock(); + auto c = cancel.lock(); + + if (g && r && c && + g->fully_discovered && r->fully_discovered && c->fully_discovered && + feedback_discovered && status_discovered) + { + fully_discovered = true; + return true; + } + fully_discovered = false; + return false; + } + + bool add_service( + std::shared_ptr service, + RpcUtils::RpcType rpc_type) + { + switch (rpc_type) + { + case RpcUtils::RpcType::ACTION_GOAL_REQUEST: + case RpcUtils::RpcType::ACTION_GOAL_REPLY: + goal = service; + break; + case RpcUtils::RpcType::ACTION_RESULT_REQUEST: + case RpcUtils::RpcType::ACTION_RESULT_REPLY: + result = service; + break; + case RpcUtils::RpcType::ACTION_CANCEL_REQUEST: + case RpcUtils::RpcType::ACTION_CANCEL_REPLY: + cancel = service; + break; + default: + return false; + } + return true; + } + + + bool add_topic( + const ddspipe::core::types::DdsTopic& topic, + RpcUtils::RpcType rpc_type) + { + switch (rpc_type) + { + case RpcUtils::RpcType::ACTION_FEEDBACK: + feedback = topic; + feedback_discovered = true; + break; + case RpcUtils::RpcType::ACTION_STATUS: + status = topic; + status_discovered = true; + break; + default: + return false; + } + + return true; + } + + RpcUtils::RpcAction get_action(const std::string& action_name) + { + auto g = goal.lock(); + auto r = result.lock(); + auto c = cancel.lock(); + + if (!fully_discovered || !g || !r || !c) + throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); + + return RpcUtils::RpcAction( + action_name, + g->get_service(), + r->get_service(), + c->get_service(), + feedback, + status); + } +}; + +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima \ No newline at end of file diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp new file mode 100644 index 00000000..d64c7df3 --- /dev/null +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -0,0 +1,127 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file RpcUtils.hpp + */ + +#pragma once + +#include + +#include +#include +#include +#include + + + namespace eprosima { + namespace ddsenabler { + namespace participants { + namespace RpcUtils { + +struct RpcAction +{ + RpcAction() = default; + RpcAction( + const std::string& action_name, + const ddspipe::core::types::RpcTopic& goal, + const ddspipe::core::types::RpcTopic& result, + const ddspipe::core::types::RpcTopic& cancel, + const ddspipe::core::types::DdsTopic& feedback, + const ddspipe::core::types::DdsTopic& status) + : action_name(action_name) + , goal(goal) + , result(result) + , cancel(cancel) + , feedback(feedback) + , status(status) + { + } + + std::string action_name; + ddspipe::core::types::RpcTopic goal; + ddspipe::core::types::RpcTopic result; + ddspipe::core::types::RpcTopic cancel; + ddspipe::core::types::DdsTopic feedback; + ddspipe::core::types::DdsTopic status; +}; + +enum RpcType +{ + RPC_NONE = 0, + RPC_REQUEST, + RPC_REPLY, + ACTION_GOAL_REQUEST, + ACTION_GOAL_REPLY, + ACTION_RESULT_REQUEST, + ACTION_RESULT_REPLY, + ACTION_CANCEL_REQUEST, + ACTION_CANCEL_REPLY, + ACTION_FEEDBACK, + ACTION_STATUS +}; + +enum ActionType +{ + NONE = 0, + GOAL, + RESULT, + CANCEL, + FEEDBACK, + STATUS +}; + +/** + * @brief Extracts the service/action name from a given topic name. + * + * @param [in] topic_name Topic name to extract the service/action name from + * @return Extracted service name + */ +RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name); + +RpcType get_service_name(const std::string& topic_name, std::string& service_name); + +/** + * @brief Returns the service direction (request or reply) based on the RPC type. + * + * @param rpc_type The RPC type to check. + * @return The service direction (request or reply) or NONE if it is not a service. + */ +RpcType get_service_direction(RpcType rpc_type); + +/** + * @brief Returns the action type based on the RPC type. + * + * @param rpc_type The RPC type to check. + * @return The action type (goal, result, cancel, feedback, status). + */ +ActionType get_action_type(RpcType rpc_type); + +UUID generate_UUID(); + +/** + * @brief Creates a JSON string for sending a goal request. + * + * @param goal_json The JSON string representing the goal (without the UUID part). + * @return The JSON string for sending the goal request. + */ +std::string make_send_goal_request_json(const std::string& goal_json, UUID& goal_id); + +} // namespace RpcUtils +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima + +std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid); \ No newline at end of file diff --git a/ddsenabler_participants/include/ddsenabler_participants/Utils.hpp b/ddsenabler_participants/include/ddsenabler_participants/Utils.hpp new file mode 100644 index 00000000..efa640b2 --- /dev/null +++ b/ddsenabler_participants/include/ddsenabler_participants/Utils.hpp @@ -0,0 +1,120 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include +#include +#include + +#include + +#pragma once + +namespace eprosima { +namespace ddsenabler { +namespace participants { +namespace utils { + +std::string safe_file_name( + const std::string& name); + +bool save_type_to_file( + const std::string& directory, + const char* type_name, + const unsigned char*& serialized_type_internal, + uint32_t serialized_type_internal_size); + +bool load_type_from_file( + const std::string& directory, + const char* type_name, + std::unique_ptr& serialized_type_internal, + uint32_t& serialized_type_internal_size); + +bool save_topic_to_file( + const std::string& directory, + const char* topic_name, + const char* type_name, + const char* serialized_qos); + +bool load_topic_from_file( + const std::string& directory, + const char* topic_name, + std::string& type_name, + std::string& serialized_qos); + +bool save_data_to_file( + const std::string& directory, + const std::string& topic_name, + const std::string& json, + int64_t publish_time); + +void save_service_to_file( + const std::string& directory, + const char* service_name, + const char* request_type_name, + const char* reply_type_name, + const char* request_serialized_qos, + const char* reply_serialized_qos); + +bool load_service_from_file( + const std::string& directory, + const char* service_name, + std::string& request_type_name, + std::string& reply_type_name, + std::string& request_serialized_qos, + std::string& reply_serialized_qos); + +void save_action_to_file( + const std::string& directory, + const char* action_name, + const char* goal_request_action_type, + const char* goal_reply_action_type, + const char* cancel_request_action_type, + const char* cancel_reply_action_type, + const char* result_request_action_type, + const char* result_reply_action_type, + const char* feedback_action_type, + const char* status_action_type, + const char* goal_request_action_serialized_qos, + const char* goal_reply_action_serialized_qos, + const char* cancel_request_action_serialized_qos, + const char* cancel_reply_action_serialized_qos, + const char* result_request_action_serialized_qos, + const char* result_reply_action_serialized_qos, + const char* feedback_action_serialized_qos, + const char* status_action_serialized_qos); + +bool load_action_from_file( + const std::string& directory, + const char* action_name, + std::string& goal_request_action_type, + std::string& goal_reply_action_type, + std::string& cancel_request_action_type, + std::string& cancel_reply_action_type, + std::string& result_request_action_type, + std::string& result_reply_action_type, + std::string& feedback_action_type, + std::string& status_action_type, + std::string& goal_request_action_serialized_qos, + std::string& goal_reply_action_serialized_qos, + std::string& cancel_request_action_serialized_qos, + std::string& cancel_reply_action_serialized_qos, + std::string& result_request_action_serialized_qos, + std::string& result_reply_action_serialized_qos, + std::string& feedback_action_serialized_qos, + std::string& status_action_serialized_qos); + +} // namespace utils +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima \ No newline at end of file diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index 81d097a5..1d2b6dd1 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -20,14 +20,19 @@ #include +#include + #include #include #include #include +#include #include #include +#include +#include namespace eprosima { namespace ddsenabler { @@ -70,6 +75,69 @@ class Writer topic_notification_callback_ = callback; } + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_notification_callback( + ServiceNotification callback) + { + service_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_reply_notification_callback( + ServiceReplyNotification callback) + { + service_reply_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_service_request_notification_callback( + ServiceRequestNotification callback) + { + service_request_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_notification_callback( + ActionNotification callback) + { + action_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_result_notification_callback( + ActionResultNotification callback) + { + action_result_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_feedback_notification_callback( + ActionFeedbackNotification callback) + { + action_feedback_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_status_notification_callback( + ActionStatusNotification callback) + { + action_status_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_goal_request_notification_callback( + ActionGoalRequestNotification callback) + { + action_goal_request_notification_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_action_cancel_request_notification_callback( + ActionCancelRequestNotification callback) + { + action_cancel_request_notification_callback_ = callback; + } + /** * @brief Writes the schema of a DynamicType to user's app. * @@ -101,6 +169,93 @@ class Writer const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type); + DDSENABLER_PARTICIPANTS_DllAPI + void write_service_notification( + const ddspipe::core::types::RpcTopic& service); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_service_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_service_request_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_notification( + const RpcUtils::RpcAction& action); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_result_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_feedback_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_goal_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_cancel_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_status_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type); + + DDSENABLER_PARTICIPANTS_DllAPI + void write_action_request_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void set_is_UUID_active_callback( + std::function callback) + { + is_UUID_active_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_erase_action_UUID_callback( + std::function callback) + { + erase_action_UUID_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_send_action_get_result_request_callback( + std::function callback) + { + send_action_get_result_request_callback_ = callback; + } + + DDSENABLER_PARTICIPANTS_DllAPI + void set_send_action_send_goal_reply_callback( + std::function callback) + { + send_action_send_goal_reply_callback_ = callback; + } + + bool uuid_from_request_json( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + UUID& uuid); + protected: /** @@ -123,13 +278,35 @@ class Writer fastdds::dds::DynamicPubSubType get_pubsub_type_( const fastdds::dds::DynamicType::_ref_type& dyn_type) noexcept; + bool prepare_json_data_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + nlohmann::json& json_output); + // Callbacks to notify the user's app DdsDataNotification data_notification_callback_; DdsTypeNotification type_notification_callback_; DdsTopicNotification topic_notification_callback_; + ServiceNotification service_notification_callback_; + ServiceReplyNotification service_reply_notification_callback_; + ServiceRequestNotification service_request_notification_callback_; + ActionNotification action_notification_callback_; + ActionResultNotification action_result_notification_callback_; + ActionFeedbackNotification action_feedback_notification_callback_; + ActionStatusNotification action_status_notification_callback_; + ActionGoalRequestNotification action_goal_request_notification_callback_; + ActionCancelRequestNotification action_cancel_request_notification_callback_; + + // Map to store the pubsub types associated to dynamic types so they can be reused std::map dynamic_pubsub_types_; + + std::function is_UUID_active_callback_; + std::function erase_action_UUID_callback_; + std::function send_action_get_result_request_callback_; + std::function send_action_send_goal_reply_callback_; + }; } /* namespace participants */ diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index a649a6b1..d91ac73d 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -45,6 +46,44 @@ EnablerParticipant::EnablerParticipant( { } +bool EnablerParticipant::service_discovered_nts_( + const std::string& service_name, + const DdsTopic& topic, + RpcUtils::RpcType rpc_type) +{ + auto [it, inserted] = services_.try_emplace(service_name, std::make_shared(service_name)); + return it->second->add_topic(topic, rpc_type); +} + +bool EnablerParticipant::action_discovered_nts_( + const std::string& action_name, + const DdsTopic& topic, + RpcUtils::RpcType rpc_type) +{ + auto [it, inserted] = actions_.try_emplace(action_name, ActionDiscovered(action_name)); + std::string service_name; + RpcUtils::RpcType service_direction = RpcUtils::get_service_name(topic.m_topic_name, service_name); + if (RpcUtils::RpcType::RPC_NONE != service_direction) + { + service_discovered_nts_(service_name, topic, service_direction); + auto service_it = services_.find(service_name); + if (services_.end() == service_it) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Service " << service_name << " not found in action " << action_name); + return false; + } + + it->second.add_service(service_it->second, rpc_type); + } + else + { + it->second.add_topic(topic, rpc_type); + } + + return it->second.check_fully_discovered(); +} + std::shared_ptr EnablerParticipant::create_reader( const ITopic& topic) { @@ -53,22 +92,82 @@ std::shared_ptr EnablerParticipant::create_reader( return std::make_shared(); } - std::shared_ptr reader; + std::shared_ptr reader; { std::lock_guard lck(mtx_); - reader = std::make_shared(id()); auto dds_topic = dynamic_cast(topic); - readers_[dds_topic] = reader; - // Only notify the discovery of topics that do not originate from a topic query callback - if (dds_topic.topic_discoverer() != this->id()) + std::string rpc_name; + RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(dds_topic.m_topic_name, rpc_name); + if (RpcUtils::RpcType::RPC_NONE != rpc_type) + { + RpcUtils::RpcType rpc_direction = RpcUtils::get_service_direction(rpc_type); + if (RpcUtils::RpcType::RPC_NONE != rpc_direction) + reader = std::make_shared(id(), dds_topic); + else + reader = std::make_shared(id()); + + // Only notify the discovery of topics that do not originate from a topic query callback + if (dds_topic.topic_discoverer() != this->id()) + { + if (RpcUtils::ActionType::NONE == RpcUtils::get_action_type(rpc_type)) + { + if (service_discovered_nts_(rpc_name, dds_topic, rpc_type)) + { + RpcTopic service = services_.find(rpc_name)->second->get_service(); + std::static_pointer_cast(schema_handler_)->add_service(service); + } + } + else + { + if (action_discovered_nts_(rpc_name, dds_topic, rpc_type)) + { + auto action = actions_.find(rpc_name)->second.get_action(rpc_name); + std::static_pointer_cast(schema_handler_)->add_action(action); + } + } + } + } + else { - std::static_pointer_cast(schema_handler_)->add_topic(dds_topic); + reader = std::make_shared(id()); + // Only notify the discovery of topics that do not originate from a topic query callback + if (dds_topic.topic_discoverer() != this->id()) + { + std::static_pointer_cast(schema_handler_)->add_topic(dds_topic); + } } + readers_[dds_topic] = reader; } cv_.notify_all(); return reader; } +bool EnablerParticipant::create_topic_writer_nts_( + const DdsTopic& topic, + std::shared_ptr& reader, + ddspipe::core::types::Endpoint& request_edp, + std::unique_lock& lck) +{ + request_edp = rtps::CommonParticipant::simulate_endpoint(topic, this->id()); + this->discovery_database_->add_endpoint(request_edp); + + // Wait for reader to be created from discovery thread + // NOTE: Set a timeout to avoid a deadlock in case the reader is never created for some reason (e.g. the topic + // is blocked or the underlying DDS Pipe object is disabled/destroyed before the reader is created). + if (!cv_.wait_for(lck, std::chrono::seconds(5), [&] + { + return nullptr != (reader = lookup_reader_nts_(topic.m_topic_name)); + })) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create internal reader for topic " << topic.m_topic_name << + " , please verify that the topic is allowed."); + return false; + } + + return true; +} + bool EnablerParticipant::publish( const std::string& topic_name, const std::string& json) @@ -83,99 +182,615 @@ bool EnablerParticipant::publish( std::unique_lock lck(mtx_); std::string type_name; - auto reader = lookup_reader_nts_(topic_name, type_name); + auto i_reader = std::dynamic_pointer_cast(lookup_reader_nts_(topic_name, type_name)); - if (nullptr == reader) + if (nullptr == i_reader) { - if (!topic_query_callback_) + + DdsTopic topic; + if(!query_topic_nts_(topic_name, topic)) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << - " : topic is unknown and topic query callback not set."); return false; } - std::string serialized_qos; - if (!topic_query_callback_(topic_name.c_str(), type_name, serialized_qos)) + ddspipe::core::types::Endpoint _; + create_topic_writer_nts_(topic, i_reader, _, lck); + type_name = topic.type_name; + + // (Optionally) wait for writer created in DDS participant to match with external readers, to avoid losing this + // message when not using transient durability + std::this_thread::sleep_for(std::chrono::milliseconds(std::static_pointer_cast( + configuration_)->initial_publish_wait)); + } + + auto reader = std::dynamic_pointer_cast(i_reader); + + auto data = std::make_unique(); + + Payload payload; + if (!std::static_pointer_cast(schema_handler_)->get_serialized_data(type_name, json, payload)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << " : data serialization failed."); + return false; + } + + if (!payload_pool_->get_payload(payload, data->payload)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << " : get_payload failed."); + return false; + } + + reader->simulate_data_reception(std::move(data)); + return true; +} + +bool EnablerParticipant::publish_rpc( + const std::string& topic_name, + const std::string& json, + const uint64_t request_id) +{ + std::unique_lock lck(mtx_); + + std::string service_name; + RpcUtils::RpcType rpc_type = RpcUtils::get_service_name(topic_name, service_name); + + auto it = services_.find(service_name); + if (it == services_.end()) + { + // There is no case where none of the service topics are discovered and yet the publish should be done + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in service " << service_name << " : service does not exist."); + return false; + } + + std::string type_name; + auto reader = std::dynamic_pointer_cast(lookup_reader_nts_(topic_name, type_name)); + + if (nullptr == reader) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in service " << service_name << " : service does not exist."); + return false; + } + + DdsTopic topic; + if (!it->second->get_topic(rpc_type, topic)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in service " << service_name << " : topic not found."); + return false; + } + + if(type_name != topic.type_name) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic.m_topic_name << " : type name mismatch."); + return false; + } + + auto data = std::make_unique(); + + Payload payload; + if (!std::static_pointer_cast(schema_handler_)->get_serialized_data(type_name, json, payload)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic.m_topic_name << " : data serialization failed."); + return false; + } + + if (!payload_pool_->get_payload(payload, data->payload)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic.m_topic_name << " : get_payload failed."); + return false; + } + + data->origin_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(request_id); + data->sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(request_id); + data->participant_receiver = id(); + + fastdds::rtps::SampleIdentity sample_identity; + sample_identity.sequence_number(fastdds::rtps::SequenceNumber_t(request_id)); + sample_identity.writer_guid(reader->guid()); + data->write_params.get_reference().sample_identity(sample_identity); + data->write_params.get_reference().related_sample_identity(sample_identity); + + reader->simulate_data_reception(std::move(data)); + return true; +} + +bool EnablerParticipant::create_service_request_writer_nts_( + std::shared_ptr service, + std::unique_lock& lck) +{ + std::string _; + auto reader = std::dynamic_pointer_cast(lookup_reader_nts_(service->topic_request.m_topic_name, _)); + + if (nullptr == reader) + { + ddspipe::core::types::Endpoint request_edp; + if (create_topic_writer_nts_( + service->topic_request, + reader, + request_edp, + lck)) + { + service->endpoint_request = request_edp; + return true; + } + return false; + } + + // TODO What if there is a server already running in ROS2, currently the announce will fail + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create server as it is already running in ROS2."); + return false; +} + +bool EnablerParticipant::announce_service( + const std::string& service_name) +{ + std::unique_lock lck(mtx_); + + auto it = services_.find(service_name); + if (it != services_.end()) + { + if (it->second->enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << " : topic query callback failed."); + "Failed to announce service " << service_name << " : service already announced."); return false; } + services_.erase(it); + } + + std::shared_ptr service = std::make_shared(service_name); + if(!query_service_nts_(service)) + { + return false; + } + + if (create_service_request_writer_nts_(service, lck)) + { + services_.insert_or_assign(service_name, service); + return true; + } + + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service_name << " : service writer creation failed."); + return false; +} + +// TODO after revoking the service the client is still matched +bool EnablerParticipant::revoke_service( + const std::string& service_name) +{ + std::unique_lock lck(mtx_); + + return revoke_service_nts_(service_name); +} + +bool EnablerParticipant::revoke_service_nts_( + const std::string& service_name) +{ + auto it = services_.find(service_name); + if (it == services_.end()) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop service " << service_name << " : service not found."); + return false; + } + if (!it->second->enabler_as_server || !it->second->endpoint_request.has_value()) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop service " << service_name << " : service not announced as server."); + return false; + } + + this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); + it->second->endpoint_request.reset(); + it->second->remove_topic(RpcUtils::RpcType::RPC_REQUEST); - // Deserialize QoS if provided by the user (otherwise use default one) - TopicQoS qos; - if (!serialized_qos.empty()) + std::string request_name = std::string(REQUEST_PREFIX) + service_name + REQUEST_SUFFIX; + + auto reader = lookup_reader_nts_(request_name); + if (nullptr != reader) + { + readers_.erase(reader->topic()); + } + + return true; +} + +bool EnablerParticipant::announce_action( + const std::string& action_name) +{ + std::unique_lock lck(mtx_); + + { + auto it = actions_.find(action_name); + if (it != actions_.end()) { - try - { - qos = serialization::deserialize_qos(serialized_qos); - } - catch (const std::exception& e) + if (it->second.enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to deserialize QoS for topic " << topic_name << ": " << e.what()); + "Failed to announce action " << action_name << " : action already announced."); return false; } + // Erase the action, to allow re-announcing it + actions_.erase(it); } + } + + ActionDiscovered action(action_name); + if(!query_action_nts_(action, lck)) + { + return false; + } + + actions_.insert_or_assign(action_name, action); + return true; +} + +bool EnablerParticipant::revoke_action( + const std::string& action_name) +{ + std::unique_lock lck(mtx_); + + auto it = actions_.find(action_name); + if (it == actions_.end()) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop action " << action_name << " : action not found."); + return false; + } + if (!it->second.enabler_as_server) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop action " << action_name << " : action not announced as server."); + return false; + } + + auto& action = it->second; + + auto goal = action.goal.lock(); + auto result = action.result.lock(); + auto cancel = action.cancel.lock(); + if (!goal || !result || !cancel) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop action " << action_name << " : action services not fully discovered."); + return false; + } + if (this->revoke_service_nts_(goal->service_name) && + this->revoke_service_nts_(result->service_name) && + this->revoke_service_nts_(cancel->service_name)) + { + action.enabler_as_server = false; + action.fully_discovered = false; + return true; + } + + return false; +} + +bool EnablerParticipant::query_topic_nts_( + const std::string& topic_name, + DdsTopic& topic) +{ + + if (!topic_query_callback_) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << + " : topic is unknown and topic request callback not set."); + return false; + } + std::string type_name; + std::string serialized_qos; + if (!topic_query_callback_(topic_name.c_str(), type_name, serialized_qos)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << " : topic query callback failed."); + return false; + } - fastdds::dds::xtypes::TypeIdentifier type_identifier; - if (!std::static_pointer_cast(schema_handler_)->get_type_identifier(type_name, type_identifier)) + return fullfill_topic_type_nts_(topic_name, type_name, serialized_qos, topic); +} + +bool EnablerParticipant::fullfill_topic_type_nts_( + const std::string& topic_name, + const std::string type_name, + const std::string serialized_qos, + DdsTopic& topic) + +{ + // Deserialize QoS if provided by the user (otherwise use default one) + TopicQoS qos; + if (!serialized_qos.empty()) + { + try + { + qos = serialization::deserialize_qos(serialized_qos); + } + catch (const std::exception& e) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << " : type identifier not found."); + "Failed to deserialize QoS for topic " << topic_name << ": " << e.what()); return false; } + } - DdsTopic topic; - topic.m_topic_name = topic_name; - topic.type_name = type_name; - topic.topic_qos = qos; - topic.type_identifiers.type_identifier1(type_identifier); - this->discovery_database_->add_endpoint(rtps::CommonParticipant::simulate_endpoint(topic, this->id())); - - // Wait for reader to be created from discovery thread - // NOTE: Set a timeout to avoid a deadlock in case the reader is never created for some reason (e.g. the topic - // is blocked or the underlying DDS Pipe object is disabled/destroyed before the reader is created). - if (!cv_.wait_for(lck, std::chrono::seconds(5), [&] - { - return nullptr != (reader = lookup_reader_nts_(topic_name)); - })) + fastdds::dds::xtypes::TypeIdentifier type_identifier; + if (!std::static_pointer_cast(schema_handler_)->get_type_identifier(type_name, type_identifier)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create topic " << topic_name << " : type identifier not found."); + return false; + } + + topic.m_topic_name = topic_name; + topic.type_name = type_name; + topic.topic_qos = qos; + topic.type_identifiers.type_identifier1(type_identifier); + + return true; +} + +bool EnablerParticipant::fullfill_service_type_nts_( + const std::string _request_type_name, + const std::string serialized_request_qos_content, + const std::string _reply_type_name, + const std::string serialized_reply_qos_content, + std::shared_ptr service) +{ + + DdsTopic topic_request; + std::string topic_request_name = std::string(REQUEST_PREFIX) + service->service_name + REQUEST_SUFFIX; + if(!fullfill_topic_type_nts_(topic_request_name, _request_type_name, serialized_request_qos_content, topic_request)) + return false; + service->add_topic(topic_request, RpcUtils::RPC_REQUEST); + + DdsTopic topic_reply; + std::string topic_reply_name = std::string(REPLY_PREFIX) + service->service_name + REPLY_SUFFIX; + if(!fullfill_topic_type_nts_(topic_reply_name, _reply_type_name, serialized_reply_qos_content, topic_reply)) + return false; + service->add_topic(topic_reply, RpcUtils::RPC_REPLY); + + if (!service->fully_discovered) + return false; + + service->enabler_as_server = true; + return true; +} + +bool EnablerParticipant::query_service_nts_( + std::shared_ptr service) +{ + if(!service_query_callback_) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service->service_name << + " : service is unknown and service request callback not set."); + return false; + } + + std::string request_type_name; + std::string serialized_request_qos_content; + std::string reply_type_name; + std::string serialized_reply_qos_content; + + + if (!service_query_callback_(service->service_name.c_str(), request_type_name, serialized_request_qos_content, + reply_type_name, serialized_reply_qos_content)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service->service_name << " : service type request failed."); + return false; + } + + return fullfill_service_type_nts_(request_type_name, serialized_request_qos_content, + reply_type_name, serialized_reply_qos_content, service); +} + +bool EnablerParticipant::query_action_nts_( + ActionDiscovered& action, + std::unique_lock& lck) +{ + if(!action_query_callback_) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << + " : action is unknown and action request callback not set."); + return false; + } + + std::string goal_request_action_type; + std::string goal_reply_action_type; + std::string cancel_request_action_type; + std::string cancel_reply_action_type; + std::string result_request_action_type; + std::string result_reply_action_type; + std::string feedback_action_type; + std::string status_action_type; + std::string goal_request_action_serialized_qos; + std::string goal_reply_action_serialized_qos; + std::string cancel_request_action_serialized_qos; + std::string cancel_reply_action_serialized_qos; + std::string result_request_action_serialized_qos; + std::string result_reply_action_serialized_qos; + std::string feedback_action_serialized_qos; + std::string status_action_serialized_qos; + + if (!action_query_callback_(action.action_name.c_str(), + goal_request_action_type, + goal_reply_action_type, + cancel_request_action_type, + cancel_reply_action_type, + result_request_action_type, + result_reply_action_type, + feedback_action_type, + status_action_type, + goal_request_action_serialized_qos, + goal_reply_action_serialized_qos, + cancel_request_action_serialized_qos, + cancel_reply_action_serialized_qos, + result_request_action_serialized_qos, + result_reply_action_serialized_qos, + feedback_action_serialized_qos, + status_action_serialized_qos)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : action type request failed."); + return false; + } + + std::string goal_service_name = action.action_name + ACTION_GOAL_SUFFIX; + std::string cancel_service_name = action.action_name + ACTION_CANCEL_SUFFIX; + std::string result_service_name = action.action_name + ACTION_RESULT_SUFFIX; + std::vector topics_names = + { + goal_service_name, + cancel_service_name, + result_service_name + }; + for (const auto& topic_name : topics_names) + { + auto it = services_.find(topic_name); + if (it != services_.end()) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create internal reader for topic " << topic_name << - " , please verify that the topic is allowed."); - return false; + // Erase the service, to allow re-announcing it + services_.erase(it); } + } - // (Optionally) wait for writer created in DDS participant to match with external readers, to avoid losing this - // message when not using transient durability - std::this_thread::sleep_for(std::chrono::milliseconds(std::static_pointer_cast( - configuration_)->initial_publish_wait)); + std::shared_ptr goal_service = std::make_shared(goal_service_name); + if(!fullfill_service_type_nts_( + goal_request_action_type, + goal_request_action_serialized_qos, + goal_reply_action_type, + goal_reply_action_serialized_qos, + goal_service)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : goal service type not found."); + return false; + } + if (!create_service_request_writer_nts_(goal_service, lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : goal service writer creation failed."); + return false; } + services_.insert_or_assign(goal_service_name, goal_service); + action.goal = goal_service; - auto data = std::make_unique(); + std::shared_ptr cancel_service = std::make_shared(cancel_service_name); + if(!fullfill_service_type_nts_( + cancel_request_action_type, + cancel_request_action_serialized_qos, + cancel_reply_action_type, + cancel_reply_action_serialized_qos, + cancel_service)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : cancel service type not found."); + return false; + } + if (!create_service_request_writer_nts_(cancel_service, lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : cancel service writer creation failed."); + return false; + } + services_.insert_or_assign(cancel_service_name, cancel_service); + action.cancel = cancel_service; - Payload payload; - if (!std::static_pointer_cast(schema_handler_)->get_serialized_data(type_name, json, payload)) + std::shared_ptr result_service = std::make_shared(result_service_name); + if(!fullfill_service_type_nts_( + result_request_action_type, + result_request_action_serialized_qos, + result_reply_action_type, + result_reply_action_serialized_qos, + result_service)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << " : data serialization failed."); + "Failed to announce action " << action.action_name << " : result service type not found."); return false; } + if (!create_service_request_writer_nts_(result_service, lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : result service writer creation failed."); + return false; + } + services_.insert_or_assign(result_service_name, result_service); + action.result = result_service; - if (!payload_pool_->get_payload(payload, data->payload)) + std::string feedback_topic_name = "rt/" + action.action_name + "feedback"; + DdsTopic feedback_topic; + if(!fullfill_topic_type_nts_( + feedback_topic_name, + feedback_action_type, + feedback_action_serialized_qos, + feedback_topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << " : get_payload failed."); + "Failed to announce action " << action.action_name << " : feedback topic type not found."); + return false; + } + { + std::string _; + auto feedback_reader = std::dynamic_pointer_cast(lookup_reader_nts_(feedback_topic_name, _)); + if (!feedback_reader) + { + ddspipe::core::types::Endpoint _; + create_topic_writer_nts_( + action.feedback, + feedback_reader, + _, + lck); + } + } + action.feedback = feedback_topic; + action.feedback_discovered = true; + + std::string status_topic_name = "rt/" + action.action_name + "status"; + DdsTopic status_topic; + if(!fullfill_topic_type_nts_( + status_topic_name, + status_action_type, + status_action_serialized_qos, + status_topic)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : status topic type not found."); return false; } + { + std::string _; + auto status_reader = std::dynamic_pointer_cast(lookup_reader_nts_(action.status.m_topic_name, _)); + if (!status_reader) + { + ddspipe::core::types::Endpoint _; + create_topic_writer_nts_( + action.status, + status_reader, + _, + lck); + } + } + action.status = status_topic; + action.status_discovered = true; - reader->simulate_data_reception(std::move(data)); + action.fully_discovered = true; + action.enabler_as_server = true; return true; } -std::shared_ptr EnablerParticipant::lookup_reader_nts_( +std::shared_ptr EnablerParticipant::lookup_reader_nts_( const std::string& topic_name, std::string& type_name) const { @@ -190,7 +805,7 @@ std::shared_ptr EnablerParticipant::looku return nullptr; } -std::shared_ptr EnablerParticipant::lookup_reader_nts_( +std::shared_ptr EnablerParticipant::lookup_reader_nts_( const std::string& topic_name) const { std::string _; diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index cf9d144b..b606be5f 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -46,6 +46,18 @@ Handler::Handler( "Creating handler instance."); writer_ = std::make_unique(); + + writer_->set_is_UUID_active_callback( + [this](const std::string& action_name, const UUID& uuid) { + return this->is_UUID_active(action_name, uuid, nullptr); + } + ); + + writer_->set_erase_action_UUID_callback( + [this](const UUID& uuid, ActionEraseReason reason) { + return this->erase_action_UUID(uuid, reason); + } + ); } Handler::~Handler() @@ -58,7 +70,7 @@ void Handler::add_schema( const fastdds::dds::DynamicType::_ref_type& dyn_type, const fastdds::dds::xtypes::TypeIdentifier& type_id) { - std::lock_guard lock(mtx_); + std::lock_guard lock(mtx_); add_schema_nts_(dyn_type, type_id); } @@ -66,7 +78,7 @@ void Handler::add_schema( void Handler::add_topic( const DdsTopic& topic) { - std::lock_guard lock(mtx_); + std::lock_guard lock(mtx_); EPROSIMA_LOG_INFO(DDSENABLER_HANDLER, "Adding topic: " << topic << "."); @@ -74,11 +86,33 @@ void Handler::add_topic( write_topic_nts_(topic); } +void Handler::add_service( + const RpcTopic& service) +{ + std::lock_guard lock(mtx_); + + EPROSIMA_LOG_INFO(DDSENABLER_HANDLER, + "Adding service: " << service.service_name() << "."); + + write_service_nts_(service); +} + +void Handler::add_action( + const RpcUtils::RpcAction& action) +{ + std::lock_guard lock(mtx_); + + EPROSIMA_LOG_INFO(DDSENABLER_HANDLER, + "Adding action: " << action.action_name << "."); + + write_action_nts_(action); +} + void Handler::add_data( const DdsTopic& topic, RtpsPayloadData& data) { - std::lock_guard lock(mtx_); + std::lock_guard lock(mtx_); EPROSIMA_LOG_INFO(DDSENABLER_HANDLER, "Adding data in topic: " << topic << "."); @@ -120,14 +154,154 @@ void Handler::add_data( throw utils::InconsistencyException(STR_ENTRY << "Received sample with no payload."); } - write_sample_nts_(msg, dyn_type); + std::string rpc_name; + RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(topic.m_topic_name, rpc_name); + switch (rpc_type) + { + case RpcUtils::RpcType::RPC_NONE: + write_sample_nts_(msg, dyn_type); + break; + + // SERVICES + case RpcUtils::RpcType::RPC_REQUEST: + { + received_requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); + write_service_request_nts_(msg, dyn_type, received_requests_id_); + break; + } + + case RpcUtils::RpcType::RPC_REPLY: + { + auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + write_service_reply_nts_(msg, dyn_type, request_id); + break; + } + + // ACTIONS CLIENT + case RpcUtils::RpcType::ACTION_RESULT_REPLY: + { + auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + UUID action_id_uuid; + if (get_action_request_UUID(action_id, RpcUtils::ActionType::RESULT, action_id_uuid)) + write_action_result_nts_(msg, dyn_type, action_id_uuid); + erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); + break; + } + + case RpcUtils::RpcType::ACTION_GOAL_REPLY: + { + auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + UUID action_id_uuid; + if (get_action_request_UUID(action_id, RpcUtils::ActionType::GOAL, action_id_uuid)) + write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid); + break; + } + + case RpcUtils::RpcType::ACTION_CANCEL_REPLY: + { + auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + write_action_cancel_reply_nts_(msg, dyn_type, request_id); + break; + } + + case RpcUtils::RpcType::ACTION_FEEDBACK: + { + write_action_feedback_nts_(msg, dyn_type); + break; + } + + case RpcUtils::RpcType::ACTION_STATUS: + { + write_action_status_nts_(msg, dyn_type); + break; + } + + // ACTIONS SERVER + case RpcUtils::RpcType::ACTION_GOAL_REQUEST: + case RpcUtils::RpcType::ACTION_CANCEL_REQUEST: + { + received_requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); + UUID uuid; + if (!writer_->uuid_from_request_json( + msg, + dyn_type, + uuid)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to extract UUID from send_goal_request JSON."); + return; + } + + if (store_action_request( + rpc_name, + uuid, + received_requests_id_, + RpcUtils::get_action_type(rpc_type))) + { + write_action_request_nts_(msg, dyn_type, received_requests_id_); + } + + break; + } + + case RpcUtils::RpcType::ACTION_RESULT_REQUEST: + { + UUID uuid; + if (!writer_->uuid_from_request_json( + msg, + dyn_type, + uuid)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to extract UUID from get_result_request JSON."); + return; + } + + received_requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); + if (!store_action_request( + rpc_name, + uuid, + received_requests_id_, + RpcUtils::ActionType::RESULT)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to store action request for get_result_request."); + return; + } + + std::string result; + if (get_action_result(uuid, result)) + { + if (send_action_get_result_reply_callback_) + { + send_action_get_result_reply_callback_( + rpc_name, + uuid, + result, + received_requests_id_); + } + } + break; + } + + default: + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Unknown RPC type for topic " << topic.m_topic_name << "."); + break; + } } bool Handler::get_type_identifier( const std::string& type_name, fastdds::dds::xtypes::TypeIdentifier& type_identifier) { - std::lock_guard lock(mtx_); + std::lock_guard lock(mtx_); auto it = schemas_.find(type_name); if (it != schemas_.end()) @@ -198,7 +372,7 @@ bool Handler::get_serialized_data( const std::string& json, Payload& payload) { - std::lock_guard lock(mtx_); + std::lock_guard lock(mtx_); fastdds::dds::DynamicType::_ref_type dyn_type; auto it = schemas_.find(type_name); @@ -309,6 +483,80 @@ void Handler::write_sample_nts_( writer_->write_data(msg, dyn_type); } +void Handler::write_service_nts_( + const RpcTopic& service) +{ + writer_->write_service_notification(service); +} + +void Handler::write_service_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + writer_->write_service_reply_notification(msg, dyn_type, request_id); +} + +void Handler::write_service_request_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + writer_->write_service_request_notification(msg, dyn_type, request_id); +} + +void Handler::write_action_nts_( + const RpcUtils::RpcAction& action) +{ + writer_->write_action_notification(action); +} + +void Handler::write_action_result_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id) +{ + writer_->write_action_result_notification(msg, dyn_type, action_id); +} + +void Handler::write_action_feedback_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type) +{ + writer_->write_action_feedback_notification(msg, dyn_type); +} + +void Handler::write_action_goal_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id) +{ + writer_->write_action_goal_reply_notification(msg, dyn_type, action_id); +} + +void Handler::write_action_cancel_reply_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + writer_->write_action_cancel_reply_notification(msg, dyn_type, request_id); +} + +void Handler::write_action_status_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type) +{ + writer_->write_action_status_notification(msg, dyn_type); +} + +void Handler::write_action_request_nts_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + writer_->write_action_request_notification(msg, dyn_type, request_id); +} + bool Handler::register_type_nts_( const std::string& type_name, const unsigned char* serialized_type, @@ -368,6 +616,254 @@ bool Handler::register_type_nts_( return true; } +bool Handler::store_action_request( + const std::string& action_name, + const UUID& action_id, + const uint64_t request_id, + const RpcUtils::ActionType action_type) +{ + std::lock_guard lock(mtx_); + + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end()) + { + if (it->second.action_name != action_name) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Action name mismatch for action, expected " + << it->second.action_name << ", got " << action_name); + return false; + } + if (RpcUtils::ActionType::GOAL == action_type) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Cannot store action goal request as action id already exists."); + return false; + } + // If it exists, update the request_id for the given action_type + it->second.set_request(request_id, action_type); + } + else + { + // If it does not exist, create a new entry only if the action type is goal request + if (RpcUtils::ActionType::GOAL != action_type) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Cannot store action request, action does not exist and request type is not GOAL."); + return false; + } + action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id); + } + + return true; +} + +bool Handler::handle_action_result( + const std::string& action_name, + const UUID& action_id, + const std::string& result) +{ + std::lock_guard lock(mtx_); + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end()) + { + if (it->second.action_name != action_name) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Action name mismatch for action, expected " << it->second.action_name + << ", got " << action_name); + return false; + } + if (it->second.result_request_id != 0) + { + return send_action_get_result_reply_callback_( + action_name, + action_id, + result, + it->second.result_request_id); + } + if (it->second.set_result(std::move(result))) + { + return true; + } + else + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action result for action, result already set."); + return false; + } + } + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action result, goal id not found."); + return false; +} + +void Handler::erase_action_UUID( + const UUID& action_id, + ActionEraseReason erase_reason) +{ + std::lock_guard lock(mtx_); + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end()) + { + if (it->second.erase(erase_reason)) + { + action_request_id_to_uuid_.erase(it); + } + } +} + +bool Handler::is_UUID_active( + const std::string& action_name, + const UUID& action_id, + std::chrono::system_clock::time_point* goal_accepted_stamp) +{ + std::lock_guard lock(mtx_); + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end() && action_name == it->second.action_name) + { + if (goal_accepted_stamp) + { + *goal_accepted_stamp = it->second.goal_accepted_stamp; + } + return true; + } + + return false; +} + + +bool Handler::get_action_request_UUID( + const uint64_t request_id, + const RpcUtils::ActionType action_type, + UUID& action_id) +{ + std::lock_guard lock(mtx_); + for (auto it = action_request_id_to_uuid_.begin(); it != action_request_id_to_uuid_.end(); ++it) + { + uint64_t action_request_id = it->second.get_request(action_type); + if (request_id == action_request_id) + { + action_id = it->first; + return true; + } + } + return false; +} + +bool Handler::get_action_result( + const UUID& action_id, + std::string& result) +{ + std::lock_guard lock(mtx_); + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end()) + { + if (!it->second.result.empty()) + { + result = it->second.result; + return true; + } + } + return false; +} + +void Handler::set_data_notification_callback( + participants::DdsDataNotification callback) +{ + writer_->set_data_notification_callback(callback); +} + +void Handler::set_topic_notification_callback( + participants::DdsTopicNotification callback) +{ + writer_->set_topic_notification_callback(callback); +} + +void Handler::set_type_notification_callback( + participants::DdsTypeNotification callback) +{ + writer_->set_type_notification_callback(callback); +} + +void Handler::set_type_query_callback( + participants::DdsTypeQuery callback) +{ + type_query_callback_ = callback; +} + +void Handler::set_service_notification_callback( + participants::ServiceNotification callback) +{ + writer_->set_service_notification_callback(callback); +} + +void Handler::set_service_reply_notification_callback( + participants::ServiceReplyNotification callback) +{ + writer_->set_service_reply_notification_callback(callback); +} + +void Handler::set_service_request_notification_callback( + participants::ServiceRequestNotification callback) +{ + writer_->set_service_request_notification_callback(callback); +} + +void Handler::set_action_notification_callback( + participants::ActionNotification callback) +{ + writer_->set_action_notification_callback(callback); +} + +void Handler::set_action_result_notification_callback( + participants::ActionResultNotification callback) +{ + writer_->set_action_result_notification_callback(callback); +} + +void Handler::set_action_feedback_notification_callback( + participants::ActionFeedbackNotification callback) +{ + writer_->set_action_feedback_notification_callback(callback); +} + +void Handler::set_action_status_notification_callback( + participants::ActionStatusNotification callback) +{ + writer_->set_action_status_notification_callback(callback); +} + +void Handler::set_send_action_get_result_request_callback( + std::function callback) +{ + writer_->set_send_action_get_result_request_callback(callback); +} + +void Handler::set_action_goal_request_notification_callback( + participants::ActionGoalRequestNotification callback) +{ + writer_->set_action_goal_request_notification_callback(callback); +} + +void Handler::set_action_cancel_request_notification_callback( + participants::ActionCancelRequestNotification callback) +{ + writer_->set_action_cancel_request_notification_callback(callback); +} + +void Handler::set_send_action_send_goal_reply_callback( + std::function callback) +{ + writer_->set_send_action_send_goal_reply_callback(callback); +} + +void Handler::set_send_action_get_result_reply_callback( + std::function callback) +{ + send_action_get_result_reply_callback_ = callback; +} + } /* namespace participants */ } /* namespace ddsenabler */ } /* namespace eprosima */ diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp new file mode 100644 index 00000000..df1810bf --- /dev/null +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -0,0 +1,247 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file RpcUtils.cpp + */ + +#include + +#include +#include +#include + + +namespace eprosima { +namespace ddsenabler { +namespace participants { +namespace RpcUtils { + +/** + * @brief Extracts the service name from a given topic name. + * + * @param [in] topic_name Topic name to extract the service name from + * @return Extracted service name + */ +RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name) +{ + std::string original_topic_name = topic_name; + rpc_name = topic_name; + + bool is_request = false; + + // Detect and remove prefix + if (rpc_name.rfind(REQUEST_PREFIX, 0) == 0) + { + is_request = true; + rpc_name = rpc_name.substr(3); + } + else if (rpc_name.rfind(REPLY_PREFIX, 0) == 0) + { + rpc_name = rpc_name.substr(3); + } + else + { + // Check for action feedback/status topics + if (rpc_name.size() >= 9 && rpc_name.substr(rpc_name.size() - 9) == ACTION_FEEDBACK_SUFFIX) + { + rpc_name = rpc_name.substr(0, rpc_name.size() - 8); + rpc_name = rpc_name.substr(3); + return ACTION_FEEDBACK; + } + else if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == ACTION_STATUS_SUFFIX) + { + rpc_name = rpc_name.substr(0, rpc_name.size() - 6); + rpc_name = rpc_name.substr(3); + return ACTION_STATUS; + } + + return RPC_NONE; + } + + // Check for action-related services + if (is_request) + { + if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == REQUEST_SUFFIX) + { + std::string base = rpc_name.substr(0, rpc_name.size() - 7); + + if (base.size() >= 9 && base.substr(base.size() - 9) == ACTION_GOAL_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 9); + return ACTION_GOAL_REQUEST; + } + else if (base.size() >= 10 && base.substr(base.size() - 10) == ACTION_RESULT_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 10); + return ACTION_RESULT_REQUEST; + } + else if (base.size() >= 11 && base.substr(base.size() - 11) == ACTION_CANCEL_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 11); + return ACTION_CANCEL_REQUEST; + } + + rpc_name = base; + return RPC_REQUEST; + } + } + else if (rpc_name.size() >= 5 && rpc_name.substr(rpc_name.size() - 5) == REPLY_SUFFIX) + { + std::string base = rpc_name.substr(0, rpc_name.size() - 5); + + if (base.size() >= 9 && base.substr(base.size() - 9) == ACTION_GOAL_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 9); + return ACTION_GOAL_REPLY; + } + else if (base.size() >= 10 && base.substr(base.size() - 10) == ACTION_RESULT_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 10); + return ACTION_RESULT_REPLY; + } + else if (base.size() >= 11 && base.substr(base.size() - 11) == ACTION_CANCEL_SUFFIX) + { + rpc_name = base.substr(0, base.size() - 11); + return ACTION_CANCEL_REPLY; + } + + rpc_name = base; + return RPC_REPLY; + } + + rpc_name = original_topic_name; // Restore original topic name if no suffix matched + EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, + "Invalid topic name for service: " << original_topic_name << ". Expected suffix 'Request' or 'Reply'."); + return RPC_NONE; +} + +RpcType get_service_name(const std::string& topic_name, std::string& service_name) +{ + service_name = topic_name; + + // Detect and remove prefix + if (service_name.rfind(REQUEST_PREFIX, 0) == 0) + { + service_name = service_name.substr(3); + if (service_name.size() >= 7 && service_name.substr(service_name.size() - 7) == REQUEST_SUFFIX) + { + service_name = service_name.substr(0, service_name.size() - 7); + return RPC_REQUEST; + } + } + else if (service_name.rfind(REPLY_PREFIX, 0) == 0) + { + service_name = service_name.substr(3); + if (service_name.size() >= 5 && service_name.substr(service_name.size() - 5) == REPLY_SUFFIX) + { + service_name = service_name.substr(0, service_name.size() - 5); + return RPC_REPLY; + } + } + + return RPC_NONE; +} + +RpcType get_service_direction(RpcType rpc_type) +{ + switch (rpc_type) + { + case RPC_REQUEST: + case RPC_REPLY: + return rpc_type; + case ACTION_GOAL_REQUEST: + case ACTION_CANCEL_REQUEST: + case ACTION_RESULT_REQUEST: + return RPC_REQUEST; + case ACTION_GOAL_REPLY: + case ACTION_CANCEL_REPLY: + case ACTION_RESULT_REPLY: + return RPC_REPLY; + default: + break; + } + return RPC_NONE; +} + +ActionType get_action_type(RpcType rpc_type) +{ + switch (rpc_type) + { + case ACTION_GOAL_REQUEST: + case ACTION_GOAL_REPLY: + return GOAL; + case ACTION_RESULT_REQUEST: + case ACTION_RESULT_REPLY: + return RESULT; + case ACTION_CANCEL_REQUEST: + case ACTION_CANCEL_REPLY: + return CANCEL; + case ACTION_FEEDBACK: + return FEEDBACK; + case ACTION_STATUS: + return STATUS; + default: + break; + } + return NONE; +} + + +UUID generate_UUID() +{ + UUID uuid; + std::random_device rd; + std::mt19937 gen(rd()); + std::uniform_int_distribution dis(0, 255); + + for (size_t i = 0; i < sizeof(uuid); ++i) + { + uuid[i] = static_cast(dis(gen)); + } + return uuid; +} + +std::string make_send_goal_request_json(const std::string& goal_json, UUID& goal_id) +{ + goal_id = generate_UUID(); + + std::string json = "{\"goal_id\": {\"uuid\": ["; + for (size_t i = 0; i < sizeof(goal_id); ++i) + { + json += std::to_string(goal_id[i]); + if (i != sizeof(goal_id) - 1) + { + json += ", "; + } + } + json += "]}, \"goal\": " + goal_json + "}"; + return json; +} + +} // namespace RpcUtils +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima + +std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid) +{ + for (size_t i = 0; i < uuid.size(); ++i) + { + if (i != 0) + os << "-"; + os << std::to_string(uuid[i]); + } + return os; +} diff --git a/ddsenabler/examples/utils.hpp b/ddsenabler_participants/src/cpp/Utils.cpp similarity index 54% rename from ddsenabler/examples/utils.hpp rename to ddsenabler_participants/src/cpp/Utils.cpp index e49c73ed..18d34e45 100644 --- a/ddsenabler/examples/utils.hpp +++ b/ddsenabler_participants/src/cpp/Utils.cpp @@ -12,15 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include -#include +/** + * @file RpcUtils.cpp + */ + +#include #include +#include +#include +#include -#pragma once -// TODO: move these methods somewhere they can be reused +namespace eprosima { +namespace ddsenabler { +namespace participants { +namespace utils { std::string safe_file_name( const std::string& name) @@ -362,3 +369,239 @@ bool save_data_to_file( ofs.close(); return true; } + +void save_service_to_file( + const std::string& directory, + const char* service_name, + const char* request_type_name, + const char* reply_type_name, + const char* request_serialized_qos, + const char* reply_serialized_qos) +{ + // Check if directory exists + if (!std::filesystem::exists(directory)) + { + std::cerr << "Directory does not exist: " << directory << std::endl; + return; + } + + // Remove problematic characters + std::string safe_service_name = safe_file_name(service_name); + + // Construct full file path + auto file_path = std::filesystem::path(directory) / safe_service_name; + + // Check if already exists, do nothing if it does + if (std::filesystem::exists(file_path)) + { + std::cout << "File already exists: " << file_path << std::endl; + return; + } + + nlohmann::json j; + j["service_name"] = service_name; + j["request_type_name"] = request_type_name; + j["reply_type_name"] = reply_type_name; + j["request_serialized_qos"] = request_serialized_qos; + j["reply_serialized_qos"] = reply_serialized_qos; + + std::ofstream ofs(file_path); + if (ofs.is_open()) { + ofs << j.dump(4); + } +} + +bool load_service_from_file( + const std::string& directory, + const char* service_name, + std::string& request_type_name, + std::string& reply_type_name, + std::string& request_serialized_qos, + std::string& reply_serialized_qos) +{ + // Check if directory exists + if (!std::filesystem::exists(directory)) + { + std::cerr << "Directory does not exist: " << directory << std::endl; + return false; + } + + // Remove problematic characters + std::string safe_service_name = safe_file_name(service_name); + + // Construct full file path + auto file_path = std::filesystem::path(directory) / safe_service_name; + + // Check if already exists, do nothing if it does not + if (!std::filesystem::exists(file_path)) + { + std::cout << "File does not exist: " << file_path << std::endl; + return false; + } + + std::ifstream ifs(file_path); + if (!ifs.is_open()) { + return false; + } + + nlohmann::json j; + ifs >> j; + + std::string file_service_name = j["service_name"].get(); + if (file_service_name != std::string(service_name)) { + return false; // Service name does not match + } + + request_type_name = j["request_type_name"].get(); + reply_type_name = j["reply_type_name"].get(); + request_serialized_qos = j["request_serialized_qos"].get(); + reply_serialized_qos = j["reply_serialized_qos"].get(); + ifs.close(); + + return true; +} + +void save_action_to_file( + const std::string& directory, + const char* action_name, + const char* goal_request_action_type, + const char* goal_reply_action_type, + const char* cancel_request_action_type, + const char* cancel_reply_action_type, + const char* result_request_action_type, + const char* result_reply_action_type, + const char* feedback_action_type, + const char* status_action_type, + const char* goal_request_action_serialized_qos, + const char* goal_reply_action_serialized_qos, + const char* cancel_request_action_serialized_qos, + const char* cancel_reply_action_serialized_qos, + const char* result_request_action_serialized_qos, + const char* result_reply_action_serialized_qos, + const char* feedback_action_serialized_qos, + const char* status_action_serialized_qos) +{ + // Check if directory exists + if (!std::filesystem::exists(directory)) + { + std::cerr << "Directory does not exist: " << directory << std::endl; + return; + } + + // Remove problematic characters + std::string safe_action_name = safe_file_name(action_name); + + // Construct full file path + auto file_path = std::filesystem::path(directory) / safe_action_name; + + // Check if already exists, do nothing if it does + if (std::filesystem::exists(file_path)) + { + std::cout << "File already exists: " << file_path << std::endl; + return; + } + + nlohmann::json j; + j["action_name"] = action_name; + j["goal_request_action_type"] = goal_request_action_type; + j["goal_reply_action_type"] = goal_reply_action_type; + j["cancel_request_action_type"] = cancel_request_action_type; + j["cancel_reply_action_type"] = cancel_reply_action_type; + j["result_request_action_type"] = result_request_action_type; + j["result_reply_action_type"] = result_reply_action_type; + j["feedback_action_type"] = feedback_action_type; + j["status_action_type"] = status_action_type; + j["goal_request_action_serialized_qos"] = goal_request_action_serialized_qos; + j["goal_reply_action_serialized_qos"] = goal_reply_action_serialized_qos; + j["cancel_request_action_serialized_qos"] = cancel_request_action_serialized_qos; + j["cancel_reply_action_serialized_qos"] = cancel_reply_action_serialized_qos; + j["result_request_action_serialized_qos"] = result_request_action_serialized_qos; + j["result_reply_action_serialized_qos"] = result_reply_action_serialized_qos; + j["feedback_action_serialized_qos"] = feedback_action_serialized_qos; + j["status_action_serialized_qos"] = status_action_serialized_qos; + + std::ofstream ofs(file_path); + if (ofs.is_open()) { + ofs << j.dump(4); + ofs.close(); + } +} + +bool load_action_from_file( + const std::string& directory, + const char* action_name, + std::string& goal_request_action_type, + std::string& goal_reply_action_type, + std::string& cancel_request_action_type, + std::string& cancel_reply_action_type, + std::string& result_request_action_type, + std::string& result_reply_action_type, + std::string& feedback_action_type, + std::string& status_action_type, + std::string& goal_request_action_serialized_qos, + std::string& goal_reply_action_serialized_qos, + std::string& cancel_request_action_serialized_qos, + std::string& cancel_reply_action_serialized_qos, + std::string& result_request_action_serialized_qos, + std::string& result_reply_action_serialized_qos, + std::string& feedback_action_serialized_qos, + std::string& status_action_serialized_qos) +{ + // Check if directory exists + if (!std::filesystem::exists(directory)) + { + std::cerr << "Directory does not exist: " << directory << std::endl; + return false; + } + + // Remove problematic characters + std::string safe_action_name = safe_file_name(action_name); + + // Construct full file path + auto file_path = std::filesystem::path(directory) / safe_action_name; + + // Check if already exists, do nothing if it does not + if (!std::filesystem::exists(file_path)) + { + std::cout << "File does not exist: " << file_path << std::endl; + return false; + } + + std::ifstream ifs(file_path); + if (!ifs.is_open()) { + return false; + } + + nlohmann::json j; + ifs >> j; + + std::string file_action_name = j["action_name"].get(); + if (file_action_name != std::string(action_name)) { + return false; // Action name does not match + } + goal_request_action_type = j["goal_request_action_type"].get(); + goal_reply_action_type = j["goal_reply_action_type"].get(); + cancel_request_action_type = j["cancel_request_action_type"].get(); + cancel_reply_action_type = j["cancel_reply_action_type"].get(); + result_request_action_type = j["result_request_action_type"].get(); + result_reply_action_type = j["result_reply_action_type"].get(); + feedback_action_type = j["feedback_action_type"].get(); + status_action_type = j["status_action_type"].get(); + goal_request_action_serialized_qos = j["goal_request_action_serialized_qos"].get(); + goal_reply_action_serialized_qos = j["goal_reply_action_serialized_qos"].get(); + cancel_request_action_serialized_qos = j["cancel_request_action_serialized_qos"].get(); + cancel_reply_action_serialized_qos = j["cancel_reply_action_serialized_qos"].get(); + result_request_action_serialized_qos = j["result_request_action_serialized_qos"].get(); + result_reply_action_serialized_qos = j["result_reply_action_serialized_qos"].get(); + feedback_action_serialized_qos = j["feedback_action_serialized_qos"].get(); + status_action_serialized_qos = j["status_action_serialized_qos"].get(); + ifs.close(); + + return true; +} + + +} // namespace utils +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 3ae3706f..8669f6cf 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -16,8 +16,6 @@ * @file Writer.cpp */ -#include - #include #include #include @@ -25,7 +23,9 @@ #include #include +#include #include +#include #include @@ -36,6 +36,24 @@ namespace participants { using namespace eprosima::ddsenabler::participants::serialization; using namespace eprosima::ddspipe::core::types; + +UUID json_to_uuid(const nlohmann::json& json) +{ + UUID uuid; + if (!json.contains("uuid") || !json["uuid"].is_array() || json["uuid"].size() != sizeof(UUID)) + + { + throw std::invalid_argument("Invalid UUID format in JSON"); + } + + for (size_t i = 0; i < sizeof(UUID); ++i) + { + uuid[i] = json["uuid"][i].get(); + } + + return uuid; +} + void Writer::write_schema( const fastdds::dds::DynamicType::_ref_type& dyn_type, const fastdds::dds::xtypes::TypeIdentifier& type_id) @@ -85,6 +103,39 @@ void Writer::write_schema( return; } + // Filter placeholder based on action/service type suffix + std::string data_placeholder = ss_data_holder.str(); + try { + using json = nlohmann::json; + auto j = json::parse(data_placeholder); + + if (type_name.find("SendGoal_Request_") != std::string::npos) { + // only the 'goal' sub-object + data_placeholder = j.at("goal").dump(); + } + else if (type_name.find("GetResult_Response_") != std::string::npos) { + // only the 'result' sub-object + data_placeholder = j.at("result").dump(); + } + else if (type_name.find("FeedbackMessage_") != std::string::npos) { + // only the 'feedback' sub-object + data_placeholder = j.at("feedback").dump(); + } + // all other types (SendGoal_Response, CancelGoal_*, GetResult_Request, + // GoalStatusArray_ get an empty placeholder + else if (type_name.find("SendGoal_Response_") != std::string::npos || + type_name.find("CancelGoal_Request_") != std::string::npos || + type_name.find("GetResult_Request_") != std::string::npos || + type_name.find("GoalStatusArray_") != std::string::npos) + { + data_placeholder = "{}"; + } + } + catch (const std::exception& e) { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "JSON filter failed for " << type_name << ": " << e.what()); + } + // Notify type reception if (type_notification_callback_) { @@ -93,7 +144,7 @@ void Writer::write_schema( ss_idl.str().c_str(), types_collection_payload->data, types_collection_payload->length, - ss_data_holder.str().c_str() + data_placeholder.c_str() ); } } @@ -119,6 +170,542 @@ void Writer::write_topic( void Writer::write_data( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + //STORE DATA + if (data_notification_callback_) + { + data_notification_callback_( + msg.topic.topic_name().c_str(), + json_data.dump(4).c_str(), + msg.publish_time.to_ns() + ); + } +} + +void Writer::write_service_notification( + const ddspipe::core::types::RpcTopic& service) +{ + EPROSIMA_LOG_INFO(DDSENABLER_WRITER, + "Writting service: " << service.service_name() << "."); + + if (service_notification_callback_) + { + std::string request_serialized_qos = serialize_qos(service.request_topic().topic_qos); + std::string reply_serialized_qos = serialize_qos(service.reply_topic().topic_qos); + service_notification_callback_( + service.service_name().c_str(), + service.request_topic().type_name.c_str(), + service.reply_topic().type_name.c_str(), + request_serialized_qos.c_str(), + reply_serialized_qos.c_str() + ); + } +} + +void Writer::write_service_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the service name + std::string service_name; + if(RpcUtils::RpcType::RPC_REPLY != RpcUtils::get_rpc_name(msg.topic.topic_name(), service_name)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Wrong topic name for service reply: " << msg.topic.topic_name() << "."); + return; + } + + //STORE DATA + if (service_reply_notification_callback_) + { + service_reply_notification_callback_( + service_name.c_str(), + json_data.dump(4).c_str(), + request_id, + msg.publish_time.to_ns() + ); + } +} + +void Writer::write_service_request_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the service name + std::string service_name; + if(RpcUtils::RpcType::RPC_REQUEST != RpcUtils::get_rpc_name(msg.topic.topic_name(), service_name)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Wrong topic name for service request: " << msg.topic.topic_name() << "."); + return; + } + + //STORE DATA + if (service_request_notification_callback_) + { + service_request_notification_callback_( + service_name.c_str(), + json_data.dump(4).c_str(), + request_id, + msg.publish_time.to_ns() + ); + } +} + +void Writer::write_action_notification( + const RpcUtils::RpcAction& action) +{ + EPROSIMA_LOG_INFO(DDSENABLER_WRITER, + "Writting action: " << action.action_name << "."); + + if (action_notification_callback_) + { + std::string goal_request_serialized_qos = serialize_qos(action.goal.request_topic().topic_qos); + std::string goal_reply_serialized_qos = serialize_qos(action.goal.reply_topic().topic_qos); + std::string cancel_request_serialized_qos = serialize_qos(action.cancel.request_topic().topic_qos); + std::string cancel_reply_serialized_qos = serialize_qos(action.cancel.reply_topic().topic_qos); + std::string result_request_serialized_qos = serialize_qos(action.result.request_topic().topic_qos); + std::string result_reply_serialized_qos = serialize_qos(action.result.reply_topic().topic_qos); + std::string feedback_serialized_qos = serialize_qos(action.feedback.topic_qos); + std::string status_serialized_qos = serialize_qos(action.status.topic_qos); + + action_notification_callback_( + action.action_name.c_str(), + action.goal.request_topic().type_name.c_str(), + action.goal.reply_topic().type_name.c_str(), + action.cancel.request_topic().type_name.c_str(), + action.cancel.reply_topic().type_name.c_str(), + action.result.request_topic().type_name.c_str(), + action.result.reply_topic().type_name.c_str(), + action.feedback.type_name.c_str(), + action.status.type_name.c_str(), + goal_request_serialized_qos.c_str(), + goal_reply_serialized_qos.c_str(), + cancel_request_serialized_qos.c_str(), + cancel_reply_serialized_qos.c_str(), + result_request_serialized_qos.c_str(), + result_reply_serialized_qos.c_str(), + feedback_serialized_qos.c_str(), + status_serialized_qos.c_str() + ); + } +} + +void Writer::write_action_result_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the action name + std::string action_name; + if(RpcUtils::RpcType::ACTION_RESULT_REPLY != RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Wrong topic name for action result: " << msg.topic.topic_name() << "."); + return; + } + + //STORE DATA + if (action_result_notification_callback_) + { + action_result_notification_callback_( + action_name.c_str(), + json_data.dump(4).c_str(), + action_id, + msg.publish_time.to_ns() + ); + } +} + +void Writer::write_action_feedback_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the action name + std::string action_name; + RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); + + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + if (action_feedback_notification_callback_) + { + action_feedback_notification_callback_( + action_name.c_str(), + json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["feedback"].dump(4).c_str(), + json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), + msg.publish_time.to_ns() + ); + } +} + +void Writer::write_action_goal_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id) +{ + std::string action_name; + RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); + + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + std::string status_message = "Action goal accepted"; + ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED; + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + try + { + if (!json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["accepted"]) + { + status_message = "Action goal rejected"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_REJECTED; + } + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing action goal reply notification: " << e.what()); + status_message = "Action goal reply notification malformed"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + } + if (action_status_notification_callback_) + { + action_status_notification_callback_( + action_name.c_str(), + action_id, + status_code, + status_message.c_str(), + msg.publish_time.to_ns() + ); + } + + if (ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED == status_code && + send_action_get_result_request_callback_ && + !send_action_get_result_request_callback_( + action_name.c_str(), + action_id)) + { + status_message = "Action goal aborted"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_ABORTED; + + if (action_status_notification_callback_) + { + action_status_notification_callback_( + action_name.c_str(), + action_id, + status_code, + status_message.c_str(), + msg.publish_time.to_ns() + ); + } + } +} + +void Writer::write_action_cancel_reply_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCELED; + std::string action_name; + RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); + + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + + std::string status_message; + int return_code; + try + { + return_code = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["return_code"]; + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing action cancel reply notification: " << e.what()); + status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + return; + } + switch (return_code) + { + case 0: + status_message = "Action canceled successfully"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCELED; + break; + case 1: + status_message = "Action cancel request rejected"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_REJECTED; + break; + case 2: + status_message = "Action cancel request unknown goal ID"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCEL_REQUEST_FAILED; + break; + case 3: + status_message = "Action cancel request rejected as goal was already terminated"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCEL_REQUEST_FAILED; + break; + default: + status_message = "Action cancel request unknown code"; + status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + break; + } + + try + { + const auto& goals = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goals_canceling"]; + for (const auto& goal : goals) + { + UUID msg_action_id = json_to_uuid(goal["goal_id"]); + if(is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, msg_action_id)) + continue; + + if (action_status_notification_callback_) + { + action_status_notification_callback_( + action_name.c_str(), + msg_action_id, + status_code, + status_message.c_str(), + msg.publish_time.to_ns() + ); + } + } + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing action cancel reply notification goals: " << e.what()); + } +} + +void Writer::write_action_status_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the action name + std::string action_name; + RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); + + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + + try + { + const auto& list = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["status_list"]; + for (const auto& status : list) + { + UUID uuid = json_to_uuid(status["goal_info"]["goal_id"]); + if(is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, uuid)) + continue; + + ddsenabler::participants::STATUS_CODE status_code(status["status"]); + std::string status_message; + switch (status_code) + { + case ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN: + status_message = "The status has not been properly set"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED: + status_message = "The goal has been accepted and is awaiting execution"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_EXECUTING: + status_message = "The goal is currently being executed by the action server"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_CANCELING: + status_message = "The client has requested that the goal be canceled and the action server has accepted the cancel request"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED: + if (erase_action_UUID_callback_) + erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + status_message = "The goal was achieved successfully by the action server"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_CANCELED: + if (erase_action_UUID_callback_) + erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + status_message = "The goal was canceled after an external request from an action client"; + break; + + case ddsenabler::participants::STATUS_CODE::STATUS_ABORTED: + if (erase_action_UUID_callback_) + erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + status_message = "The goal was terminated by the action server without an external request"; + break; + case ddsenabler::participants::STATUS_CODE::STATUS_REJECTED: + if (erase_action_UUID_callback_) + erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + status_message = "The goal was rejected by the action server, it will not be executed"; + break; + default: + status_message = "Unknown status code"; + break; + } + + if (action_status_notification_callback_) + { + action_status_notification_callback_( + action_name.c_str(), + uuid, + status_code, + status_message.c_str(), + msg.publish_time.to_ns() + ); + } + } + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing action status notification: " << e.what()); + return; + } +} + +void Writer::write_action_request_notification( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return; + } + + // Get the action name + std::string action_name; + RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); + + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + try + { + if (RpcUtils::RpcType::ACTION_GOAL_REQUEST == rpc_type) + { + bool accepted; + if (action_goal_request_notification_callback_) + accepted = action_goal_request_notification_callback_( + action_name.c_str(), + json_data.dump(4).c_str(), + json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), + msg.publish_time.to_ns() + ); + + send_action_send_goal_reply_callback_( + action_name.c_str(), + request_id, + accepted); + + return; + } + if (RpcUtils::RpcType::ACTION_CANCEL_REQUEST == rpc_type) + { + if (action_cancel_request_notification_callback_) + { + auto sec = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_info"]["sec"]; + auto nanosec = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_info"]["nanosec"]; + int64_t timestamp = static_cast(sec.get()) * 1000000000 + + static_cast(nanosec.get()); + action_cancel_request_notification_callback_( + action_name.c_str(), + json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), + timestamp, + request_id, + msg.publish_time.to_ns() + ); + } + return; + } + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing action request notification: " << e.what()); + return; + } +} + +bool Writer::uuid_from_request_json( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + UUID& uuid) +{ + nlohmann::json json_data; + if (!prepare_json_data_(msg, dyn_type, json_data)) + { + return false; + } + + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; + try + { + uuid = json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]); + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing UUID from request JSON: " << e.what()); + return false; + } + return true; +} + +bool Writer::prepare_json_data_( + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + nlohmann::json& json_output) { assert(nullptr != dyn_type); @@ -132,7 +719,7 @@ void Writer::write_data( { EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Not able to get DynamicData from topic " << msg.topic.topic_name() << "."); - return; + return false; } std::stringstream ss_dyn_data; @@ -142,11 +729,10 @@ void Writer::write_data( { EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Not able to serialize data of topic " << msg.topic.topic_name() << " into JSON format."); - return; + return false; } // Fill JSON object with the data - nlohmann::json json_output; { // Set id to be the source guid prefix std::stringstream ss_source_guid_prefix; @@ -177,6 +763,8 @@ void Writer::write_data( msg.publish_time.to_ns() ); } + + return true; } fastdds::dds::DynamicData::_ref_type Writer::get_dynamic_data_( diff --git a/ddsenabler_test/compose/CMakeLists.txt b/ddsenabler_test/compose/CMakeLists.txt index f855833b..2295c3ae 100644 --- a/ddsenabler_test/compose/CMakeLists.txt +++ b/ddsenabler_test/compose/CMakeLists.txt @@ -18,6 +18,13 @@ set(TESTS publish/requested_type reception/topics_json reception/topics_yaml + services/service_discovery + services/service_server + services/service_client + actions/action_discovery + actions/action_client + actions/action_client_cancel + actions/action_server ) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_cases DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml new file mode 100644 index 00000000..cbf35b34 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml @@ -0,0 +1,34 @@ +# Test description: +# Run ddsenabler example action client against a Fibonacci action server. +# The action client sends 3 consecutive goal requests and expects to receive +# the corresponding feedbacks, status and results. +# Domain 40 is set for ROS 2 nodes. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + + fibonacci_server: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_server + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=40 + volumes: + - ./../run_action_server_timeout.sh:/run_action_server_timeout.sh:ro + entrypoint: ["/bin/bash", "/run_action_server_timeout.sh"] + +networks: + std_net: + default: + driver: none \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/config.yml b/ddsenabler_test/compose/test_cases/actions/action_client/config.yml new file mode 100644 index 00000000..820ec0f8 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 40 diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml new file mode 100644 index 00000000..21b3acdd --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml @@ -0,0 +1,33 @@ +# Test description: +# Run ddsenabler example action client with the cancel cli option against a Fibonacci action server. +# The action client sends a goal request and then it cancels it. +# All containers use domain 41. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 --cancel-requests true + + fibonacci_server: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_server + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=41 + volumes: + - ./../run_action_server_timeout.sh:/run_action_server_timeout.sh:ro + entrypoint: ["/bin/bash", "/run_action_server_timeout.sh"] + +networks: + std_net: + default: + driver: none \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/config.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/config.yml new file mode 100644 index 00000000..203583b5 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 41 diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml new file mode 100644 index 00000000..04e59ffe --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -0,0 +1,55 @@ +# Test description: +# Run ddsenabler example action server and a Fibonacci client sending goals. +# Domain 42 is used by all containers. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server true --persistence-path /persistence --config /config/config.yml --expected-requests 3 + + fibonacci_client_1: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_1 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=42 + command: > + sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" + + fibonacci_client_2: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_2 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=42 + command: > + sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" + + fibonacci_client_3: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_3 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=42 + command: > + sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" + +networks: + std_net: + default: + driver: none \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/config.yml b/ddsenabler_test/compose/test_cases/actions/action_server/config.yml new file mode 100644 index 00000000..eff135c7 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_server/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 42 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/actions/fibonacci__action_ b/ddsenabler_test/compose/test_cases/actions/persistence/actions/fibonacci__action_ new file mode 100644 index 00000000..22db6867 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/actions/fibonacci__action_ @@ -0,0 +1,19 @@ +{ + "action_name": "fibonacci/_action/", + "cancel_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "cancel_reply_action_type": "action_msgs::srv::dds_::CancelGoal_Response_", + "cancel_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "cancel_request_action_type": "action_msgs::srv::dds_::CancelGoal_Request_", + "feedback_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "feedback_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_FeedbackMessage_", + "goal_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "goal_reply_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_SendGoal_Response_", + "goal_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "goal_request_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_SendGoal_Request_", + "result_reply_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "result_reply_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_GetResult_Response_", + "result_request_action_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "result_request_action_type": "action_tutorials_interfaces::action::dds_::Fibonacci_GetResult_Request_", + "status_action_serialized_qos": "reliability: true\ndurability: true\nownership: false\nkeyed: false", + "status_action_type": "action_msgs::msg::dds_::GoalStatusArray_" +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/goals/1 b/ddsenabler_test/compose/test_cases/actions/persistence/goals/1 new file mode 100644 index 00000000..8402bb25 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/goals/1 @@ -0,0 +1,3 @@ +{ + "order": 3 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/goals/2 b/ddsenabler_test/compose/test_cases/actions/persistence/goals/2 new file mode 100644 index 00000000..461fa735 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/goals/2 @@ -0,0 +1,3 @@ +{ + "order": 5 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/goals/3 b/ddsenabler_test/compose/test_cases/actions/persistence/goals/3 new file mode 100644 index 00000000..853b8317 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/goals/3 @@ -0,0 +1,3 @@ +{ + "order": 7 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 new file mode 100644 index 00000000..0fbddba4 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 @@ -0,0 +1,4 @@ +{ + "a": 1, + "b": 2 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 new file mode 100644 index 00000000..9e5938e4 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 @@ -0,0 +1,4 @@ +{ + "a": 2, + "b": 3 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 new file mode 100644 index 00000000..fe99b20a --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 @@ -0,0 +1,4 @@ +{ + "a": 3, + "b": 4 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b2666b485208d5c75e4eaddcea453f1b4ca49c5 GIT binary patch literal 1301 zcmb7EOOo0!5Ope*L*xi47K6=a3{|s`Z2TdE85{h;8_J)60U12l4A{4rBV?H)o88F580emB!1}Oq*Y(C%NvlOmEfnwx)&9!vkFse$qEtBZQvD4zf{2NBmJ->hUJ^ zNtx>86iDQh>Ruh@+BOU({b?>XVRPt*y3+*IdpfB?PiA{9$cIcYGcf!aA&k%n#);%@ zuOEHpZLoCx%s0ikc8WU|S)6$k)cGOY;uUw+#|kdQvAJGNHNVL3UHyjp56!uQ^c?py zKZ#le>c-ik;}o&fTg8F3Pbfa{(`~T}4QoZc5ldP*^Lu$L0%p8m`vJGYhiq=E^+{Lp zJ+U8c>uKZ7e4=KI7iL0fkj2`d2w5;fW9At}7(G3@nJdqaFO%wSqXlwnQLBt6$d8*; z*Q$iY^FDrvAL+`^FJzFFXP1a_e@Z-W<~l2uLt#}@DIjEA`wI!tSZ&xkmxv8m zG2k^kG4dI3^kE%zt~j4Z6GO|?u34?`_Jv~B3B|*4{-#OSke=f#c@5Mm@bP^*a63+x z8eS8eF>fK$0lNe|9o2zx7@7Ls-EFYk^`bnkY^Ia%5OC8$oQE$k*BIQZ4$v9y1?9nN zF9JtQ{&B|Z|3>S7@BaY!WB&tEEAw-2o3?gA;ca8lxwLM4{Gu@_l>T<#-*qo;eAvOb nUIc{qU1fM#-yi=|gORD$fLVUCM`!|T$&Fv>QY0O&1y=80o(g{o literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..3312fb7d0c1bdff5828d78c9b30010552eda61aa GIT binary patch literal 1029 zcmbVLU2@tm5O$}%M9+{;8=F9YnLJ2#Y@i9mHvT~`j4fjfk-@}v0N&G;xScDj2m*_rTIk z5{NRfL>+3PPAvb-a&ybV$KEVg8`kW5%yOC#tZ#{m`F(kIit)%8!9{4>J)wl$7+-7|v5GmS3wajvthYlsw~cdc z8T3}z5BBtFwQwz;hM;2t|J8?g zCfZ;67>l60Wx+}66si-!LtpR?)C1gr0T8|;v<>)q$25txuaL+CHX^f*04?^2Ip z)k^Klb|lY??eW;(Hy-JO^zoAi!OVVe4Myr?R>asX%*FkUUXN`K8+6dj>^DXH+A9RZldYZY&K{fYU(LHYQ zJ`GrvTI?Ju?3`NumE`7ug!ADdmmAWYhQxB4kXzqkHSslZ)`om&3Tg?el?Q|odH|m) z{-Ik8gmpmk{nz$TlAGsbV6*78je>W+8@t?Lf8K3hH>#)ijnyslSn1sIH?`Qm@w^1? zXt7_~+ql+`TwyuM*(DA9EDl_j6mCg!#wZ)rR7sn~q2!iw9^509wc&#K{?c?=J&p?8HA1iYTL9Vvb58f)SbtE4~CqPmkWt(^k(f^ZI6QhFUMW0zU{r ze%z#%SqoOX+I``8-qQ=ftLOz*;~XEW6TM6|ucDKl(|hCSCyyz9_kt{*2TJe58~);m z4ra<992rrd9!PKzT!r$C(E)x*3Y&%E58xP5A;^zU!WGIvbA%uOUrFf7G*`1o868Rc o9nc)&+qS`IYFuHa{j<)zd$|aXdCellJV%OO#erJDI+uIt7hl3crvLx| literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin new file mode 100644 index 0000000000000000000000000000000000000000..fac6aee92c1c40e6410c8788f2e2c699efde0400 GIT binary patch literal 925 zcmb_aS#p~|5GCbP99dvznZi|p!f}-w{HVsK~k>#-{%W-@OWLYnwa~%>= z1bULhQAkdk|#-=lg?$?d)UI$O4eQY@IxYA4PZKNH<*r2abd6uwY58iN=?1~of zU+#3o!%FZyp`R3 zJC3F!M{S3@v%5J<5Q1bz9uag(o8HlLY*x@>i z_`VEq#rA!grM~xus?4eN)7tI}=ipK`e_}-rSbWSQ{jtHH?d$)#Q_%j&@bbCRmp1C3 ZuTq<4)|OMt-?YN6bMisg;rK2~;V)fbA8P;r literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..423f3111aa0077f6c6d6a53717318aeaca2a52cf GIT binary patch literal 577 zcmb_YZE}Jz5T)%YdJDw*#Y}$$C|I;Ap#tU)0|^#%5h_rXTl7f1SreGvpgZ&SZFZC0 z&6Dn=hkHqqY>tT5S#b*MrY_D|1XY-w>g2qSXi}+aUsP4bs!&zUEG|wFrCDetHBPDq z>JTTNO;XiiDDz&A9Mg09aY;s7T{hmIU<;-5@bm%oG7K_Nhm$f_5w*ibM%iG7F20wgO#!tNl-8S7G z=tU&8bT`Chtc><-?#c1cE_eR54HRgY<=seb9!T)UH82m%g0J{cjERNYpe@EYhm5~V zcgm^^WCqN%feyWjnKPFJ=70n%Ik=#v8z#Q4@A|pIJI1ZC3~d6=(phaX&-KAbUqz*J PM46?rIV*|CaFc!ky)3dA literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..62adda76b594f80efa4318abe2d93f4575438fac GIT binary patch literal 649 zcmb`EU2=jj5XaN@6g@*fg@pud=^b3cbF~&>N!m9~^NZM2Z zKiRpeRfOGs%x1O{s%GJCFOAdXH8bq1my*5bd=9?AGlTzx`+VRTR^v4Jz)E=nbvw7a zD4dSTscM&u4BNNoq94|UghHh0_>AIOyw;*Wo(r*s zNYn8YD2bTDVqrh9Q)y;}QRbi_tJ5M6>ZUHvX~?S}&FlEQ3t3$0dgs*jD5?TopQg0PL&nm; zj`PSYLLQL#)WlUC1U*Ql`~-bzrg2dX2U+c}PI1=SHntFYeHH#cpcH|u7X(?@5LYQi z1qLVEJ}Id-+(k2|NBfI%>t0(=<4t5bUw$?{_}=f)3T$NZ3q2Gg-z2Tq79*1J6#gY! z?Y;DR(FOkPAR&{vp*j*R+{Hp~2yMmVg=K`Zy>N8>J&=bg=9N6o$^J7QZYDkBW574O zv)qe(f-Sr3Oo0#E2JE6XFnvogRrj@5IIP)CN`hpeqWIeG16R{IF zv5c?AH1IRGme%_^b!?X#$y_+);cMfBPRFHx3!h8Ik|{>(W#XNdt9WsCKTdgB^^W_E Oj1wo$MGxIK*tvf|-xo^& literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..63bb3f25a2b372c7a6ed1d84602f26c66c618ccb GIT binary patch literal 625 zcmb`E$!>!%5Qb^{6n%zXSdu70%E7cOL8_CGmhFPDAq~_liXjVc(?{!@)HbPlXpbFf zW-Jdg|L|G5k?w9KNphK|xGS1E>H4lY6e*!eQFr-am*Sl2`dHNUETf68TLo(B6yqY< z=5=N_DM`GXwoOg*B$3&yd*<_QYrULT{rsXmEdAXuEte30#e$Wj59as{0I+sFumK%A zjrRD;vQcCKp_xtkP$hk4`cx3g{*n}#pM;av2Y5a=s=`jB%E>|WS6%P4&GI^3At!kyUg)rq`7SroQL0htdem%qVk84SCNAC?IRVop#ll2 zJO`;34HcJQ%{ZbOlJH~*a6m|5AuGa$<9i?VRYl@M-jAW>;A^ zkx26!zcmqCuPoRgZ%7$Vyj}W~hVWk*CWyXI Hw?2hG43FA9v8c!$yt5@Z$;@tMGJ`s(+d&A8 zHAQvI@0p0NvJ{W=F%b%5^>|^-xr#9c&VzTckfn+}q3(rLB1S#kv*ZfY_2L9hN}u)F z&#N>Cux%Zoujb(b0K26J6fFIsy?8!;^VYz!_(c0X~&4=F#lM%0u v>cXUZFAeAXvKo+ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___Log_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___Log_.bin new file mode 100644 index 0000000000000000000000000000000000000000..6e56d56ad6b88f745f211f24b249834ebe089637 GIT binary patch literal 653 zcmah{TTg>f3`YGGz8PPAaALL)l0Eb|!7YOgw{bZy%K(|fgEIqm;otaAZHq?VY|=|k z`!)UAqn&9N=bENnqwW&5+`LyWyKI%bl%`pfYtu~Aa%r05?RvTFV9h0}QO&IRaZ($n z`H2_RU&)`9YQ7aD%^kS0+s!VNFhq|g$+ds*|%4O*ECdFMN zn{7|p&rOKlw^b#5gRw64gCUt2nN}V_06bEh=zjkF7_j%qV*b#A;=-!qdsjt=wu2eY&Ttphv*o&NyQ6)eNSq@5n5}|tM~0&!3S5;S zuQ+tyC;7*ld~!4NPOPUHjG5;Xp+;m{5ilJuUKhrEw|A=BjTIU<(P_ZkBCHTiYFkx8 zwSpgU9Vi~)EjVAwP^y^TghQ660uQ$We2Y2??i3|J@NNejbDsK%D$%+751x1Z2Vbm$ m<2Rn`tY7>a;fplr=6LIU%=d#iFGwCA`q~#W4!c1B literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin new file mode 100644 index 0000000000000000000000000000000000000000..98649ae7fda80fa8104ddd2e1b057efb1527a399 GIT binary patch literal 1709 zcmb_c{f?SI5a-&yM4!PlRjgMuxjz;ZkgKSi^0EII0XXYtreV8+LbA$JT4}y@6dyI_?i;Y>y&O=FICl{W0 zT+W?Vox4WjIc6M`Kd*h)+z!{f4cE;jtYgnLBHyu5#_^nEgWD2gdQS#`TZHR9;7kL~ z>P#NPUbk9-Hl;%i{~7oI260tTUNa6p*bWml4V_93P6HHT_c-+sXNWuU&k5roZi{3e z@nrO$b#a2Yz>hj?azbW0D3O0=JxJo5H(p>ewnjMeAMD?c2Ka0C zP+l`yA>aZRh3Cev@cV@Cp{&gM-HKxiN;d;zhhsur;EE{mMsXP$)#wlRYIuU!UW@2Hvsh^joz(N7x0)4TI@iMkd6^l_fh zmZlyinTlIKQ8P|lunk?Ec)46pz%DwdKffWy^-eBC)FCdiJ9Tm#=2FqD_3dTZTKCN} z7mpwlpsk9FjC{jM!Ss+HPt-Mc2iL=-QF5qXu34oEtF6Tu)hcM2 zL@sf0hfvjk8aowcAlj7saPH9Ei3`XMQUb1WziGx^l`Rb8sKNL4eszj_{cEL6i(DDy ziQ1Lfq2@v%SH0@-3i{Rm>s4x)*mX=dDRr1U%FSiS+$0cWmIa zi~MP=IBc{ZUi8(czHAcj)OWD93&fNz)=ibuo)|??uQ6Bug-4)o!sD8qa@YDRp6~}T C4gHz` literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..d33a48d98096fbc64147c4f83e935f29597cfdaf GIT binary patch literal 261 zcmX9&TW*6e5ZtJz$SGRo)yNVbODIi|LJ3lU_y-X`1Sw7%n^cs$^sceVNHaUy$7o>! zPZI!mwbZOFn@cCOte7x_82w8K=cXhi5QgdIB$7&3O4t=srs8@NrYixa_I9l|hrSjy zUFeW!OS!t`38LrO5&T;+v`C^9_xSAWh`@FIzvHZzRlaCO+wKqEYis8aw|FdXBTVejAIlqZT0sS|t? z{7_D@?(o@7ejm}VjoNViw$F=6REKG-CbM|a=|{QM@c%+gcG0iq`=M?~`Myg(Gb-#1 z^*Ua3!>Jl07L_`k@)r&Dn81+M(}QEwX{T|nm9a~?^CtA>_z@^$FljW_T6+*X$SyQ`jGEBjc!%{F?!O!wyN8{m-ZKrb%~x3zWZ|{Nio$}`0iG$j6Kiz zUAm2Z&zwiDL*5((p7qM|?0~r*y#pN36T%$ACxU*gVCLK>mG8EN-$WdBz%~Y~E04Dl zPdUd|6gm5h=975J^0HpGk7fh`FuCsBmkJnILW1hrGSIVD=*qZeo%$WQVqN>_yIB<* z97|Ju>cl2c6MjAbSnkXNP2NX&-J`g{`FX7oIs%pR+r22)cA;yfv5_6{{1t?yW>LJM zeo&A2qg=lWz#(Li*L&Zy*HIp)OqbW_%arl6%-005TkcB*8osM%1D=VG-y3e6u}sE% zdqu$aFY4b%kNoGoCeGx%8y;7$aPW7EW$d(5_#M|2+&__fMm6Ey5~|XEK&8R!-eO&| z^Us~u_-PS1${aP=1)iO;!b&H(b3$z@M)#X~Dcj@O1GK2}a4}$~{BNY@G_JyqLlD0ytEN#_)@n1V@PjW8FnVAgh zv3`#+HY2vGF5f>p-Bwa*!?|gHI6oXr$$6l=wQOahsoh>r+LWn2e{0i~v^O9=H+arG zZ*`P`znGilGTYt&9EU1)Cn_MUqZAT&vhe}0Aak$9_)^JyIusZ+MIP7c_BB(JX#Dzd zI*Kr^$U}i?QegD9&v$k%)9BV}^s*7?j|9d;{H0U##GZAngjW9H!os6p03JU81UBy* KzZ1B!(P4kJGfW=< literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..55815c1fadef8ef09e4d88f94610111b00de5ef1 GIT binary patch literal 257 zcmXX=+YW*-44v^S{0bF=mnA+7Nl+dTP-N_dz!(uhC7bcWpZK?S#FL!%w5M%~252}y z2rYn;H)(Zy2w7%aD2$bSVq6p|#n=%KKa<&2fP4J3LZzWl?fs@iiqHslm$IPm+V`qj zc2zX4qfIa)WW5FpeStXv_-;r7GS;$(%^_Kz#CVrkY)%+;uSx7Ryt~i&%r*9xwq{$e zguG=m3=-;|^Z2CaB0;T&Pge&z&s^5+E#?{O3?>TNa=lrOsX{-ELh@=~UNAVT($m>vEyb7wzgCcRGks6 zL(g#f^y#jnd{VxARurWVdoRo7rhd)$>y^w~!)W&h!^pCBX&83?I$!NqRStjKrJuLW zu5RHK8?J3wryS#$6Ld95l5m(!vHa19KQ9EV8EC&=0NZR>BhhDqy=v( z;|qu#zc1}4dbIJ*Km!!SuZehD98##ARg*RgPdIp$2x8B8jFD%C5$OxFQkFxF>LVXV z{mjAx`T`v)1pFn{gH37&SG+dqBN3cAkVN`CRaWJ%q<6u|*cRzXKh%GoyLk1+h_^*Q z174WLF^`#QfBoOm34jL6nUsI-k5gsFDZk4c(WF&&vrkARPwC*R z|M%;=SBszX;ZD=+2N-0-#GPyH&R+ckyg6z+dG!Ic(y~a~O|ME_Xct~}lE}aGYZvuI zDRq8GYp;x;Q}?}h;H6od3g9fJ5L(Cee(Tv~cl@TiYUX-(vmwYMTk@0lBJu>Ljg-GL CZyv?~ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b9387d7860fc1dfcb36ae4a1c7496aea715ef33 GIT binary patch literal 289 zcmXAi+fsut5Qfw7DSQSmEbVy83>T@=C|X21g^(L269SD8tpr7UH{Y!r`px`%`jcHW zLuWID&=SM9|X#n^T~7?-6jFn-atk3}bp0^1ge`ubM3FAzG1f47H=OS-o~ zGUm0)Ory1UCdBu_LjNF5fH+LZ8@X}i#KQ*CYRnhEmB_B0xJGvh8%xg=Uj?%l^a<=w3%-KL-t>ejs%7qgFspIJeyl^z2)gVo31lzar XG~G?sv>+h&gizOWnhqtcUFoAE2nSVj literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..a1212fb47b828ab89c6d5540b97d2673521949be GIT binary patch literal 569 zcmbV}OK!q25QfwC6g>kQ2oI%^SWI}O5x5Bzd2J%&gqGAm8q?C`Mm{ z@p#7mt@*6oXm_`orVXT*j3?XuF)KHeWx_N?`DvPIDiYJ2Z^hB2CEaDREs|v>io;%H zNz#`0?xh=rYrJxA-E9rtThyklmx*=1G+Im4her$ygR%*{ zxC@zDO&1`-`~x)@R;=c()tvQ4U|`K|b};fVx2iaZi)`lCs;cJc$$9?4>dYy~^@7yV z$R$&K)hqMW;lk-#>ZbUv;-m({hsRjF&WUv${clbW&v8gjYrS8`z5#QT0^|-HgR%)+ P|GzUi`^@@s9RKwfsUxVn literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c19eeb6a6d5e895949e8906d2dd53d536afdfd3e GIT binary patch literal 1277 zcmbtT(Q=wl5T(sm^c(tuS`y5!s$wbBYFSy&Q%Wt*67VX`2?b@U6Y_XdH+}z-ma{F0PO0NenbbRoj zhT}3ywDkSB`7)b^ni@w=F%DfR>c`6@a#w@JdKug944>XOa`Ge$$R`|!FO4{81K2$s z0e%u(@0m_s_)P`fL)-Q>Vcqjbi{1e_U_yEtf(JT!gfk$E z`Gu(z^18|S2~Q{f(4_5c6|YQOIrFIKc#15FGQz z{13xhdUbo`Z#i0uxY&#RIFj%1`;0#(Umg10Lyvu`SDz=%>oRJZdr_EL)Qa=O4kS5( z!T!hwmuEnmG48n$C-vrH<>XoLjw3i+3ODIrJ|ictZ}p$!i4JQ@XK?(nKAkgz&hd3> zJL{xK&(?{dJX0T?+s1Kjm-$K#TF#49#XhO4pIRIo=k_=HaD|7t-4btJ+_(Rp+Zo0B z4A7@@#3mm-8ak8Aq%f<%YqVy!0k&O+?-h>|a1?CU{xwbw=jocLEq`BD~Hh>)HBWj9lXFQ_R*OK5!bm_<}*3>isSX21@?@!hoIc T6HKoE<%Ln!3wVA$AQ=4s0m8Eq literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..da5208da88ddae75cefac8d0b9ae581cba260418 GIT binary patch literal 1233 zcmbVMQFEd|4Cb!C;(o)uAeNpw(}x8Gq*D~CfV?=efT)XS1+DV0`VTLOwbdD4dOJf1 zyUCX?AzA5%bay97(mgy|E~blhm2R^cPs>iH-0nM_Bq^tz&P!SiXWLnk!f846($`&D zR@130{Q|$%`r*FzHoUcO*N!#nX3PDIvByU^lAeD`Qt9>>8`>UoS#4kt$7j1>&Bc6u* zSr-N51w3R>v{l^n7qRJI;hMycNNCIgC*tSGyb!ynae>L$65)tH#GenJ@zd#{y=kin z;6g2qlTcjY_X&T3wi@eqPc`;1Uu_X9?J`u1BQFd!Y({x(`2r1@PWHeCmaDTCVT`E| z7y0IVZRe?f#gW;R3Ki)yo}MGuul#TE1cMER)5-swpGJ|HM*ekT*_*gXZsrND)KmZ0 ztBq5yuJW}QH0^_s`7y4mCpGfVz4{LQN?DzHb%$JOQLVn+s~P%w1kgu0B9%lB8_hs9 zE{rOodaxB8ebnamOhJW_p!M}1amEyQzCF9(L$muj*G1^N$Mm%p70axuH3DD*Dpw+l*L|A;<)q`#p2a8D1r^gZ0Vc4+->uc`+f`C zq+8U-_ob#fpF@{?HrT9>9#yZHm*an zsNVKMM)S#PxAt_Jpr3inG+ai~(6L2bJ>S@M>>OL{08b6rLO`vXurUUx0HyfEI=b>0 zt-ah9AB|{YA9xW)1s%-+Bb{U}qx(=`HFDlx#{K`#&4riBPPCmm(?RxP=gxhNDE;Q; z197>Sb>`*aG8AAi#_)GuBAIml;)S(I7Rl;9%xQ+)z__`kx%2G@AMajFhxiHq)$ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin b/ddsenabler_test/compose/test_cases/actions/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c3236d9624c069dfe9de6002e525a51609b867f5 GIT binary patch literal 1025 zcmbVL+isgc5GBf2^c(t6gJTDf@~~VCrZ%=WGT@ae3)nio0Hy}xn74j*-#W9n?Mo^} z8EI#SVRqOv=OEol_xF+{4Pl+~%bN3QogVZ2Sm=6Qz34h7bbTJ5>Rq}k&THAx}^6O8RyuNnaL(khw?6g2)hcX7*q= zu1Ul<%%N?h_)QYZO|m}@lgKY-`|`kCe*^n0QD{cPK`)MI$s*rNa@Ir_Y-0}48zQvP zceXHIA;9z;6G^TeSfHI(p`4|CW4lt8m_|#5$NLeRq`1Q}Uto6z4ReA`l8;WeIrb-!_Nvkkw-*j;oV#>TZJ@BGp&e2x=ED)?<8z0zBk3#AYe{^#YbU2imRDATRpS1<@0HvMu93n^Hqu%a{lzL~{89eoKm5JIg1(iQw9uz|LkA>c@?H2AtH|rcpDd9UZz_5pgOy-sVl8*HxTXy=b$9iw@(iyfG>|gVC*DX$_nIesDc?K(@4oRe@vL6CWp?xQ)%bSe3%0z)RQr{izF^O@%Ea$c2D05v$I{j0i*{Dn@?hCZ&K71;wBy_)g~m_L252w!0yl zlhoO&t(0BGFgRmR&(~jnGmUSJKmKeq8U{RvGLIg^s0f~)^25_^`}njyM9-^55Eb2S z@qFrb!?1Ylc8%!p08_PJX4+Aa@3uws_$W0R-@#Ys?a-mhR@%C&mM!Q@abTeOv50*hL2;WFT$}-p*L6yr^9@5IKsB- z(l_mYh~1Fpt4H6JQ~cInuqEg?Ga2h)D28+N6?L<4+gluEyRS^8eM5?NXZ zM_n(Kwj|uP6p+7)4;RB$sj)pyhP>RLTa$Tyh;psC83HG&wLW3nqKGMWg!yaO+F6<| z4I9?rz;Q6#8z*e(lOYxixy1j)ll5pEat=1t%G04WeI58^9-p$A2E5pjD;({WIx$Vuu6S***WU1Tjz;OD)v(`bDzJx}4TBeY1$nQ3gEKnmxqI zr2nm!nSLN_dW3C_eUEi;&g6bw#=*W&&+>5T?Wecnr!8a+Gsg^A-+kRwoJHps#`e0# z_W3rHMl*M`_wU=A_-Ym}25)P9|JG=f7)zxIw-^PP_H}G)-p)yH!FP=QL6E^*Y%1$B zkR1}zS`%_nk9^PsAZ4WqRuUNcdg0lXzVd6FT`2?lA=LRfGza-I3s=6Pzxb||hh|ke zjFa4Hv;@>m^A$CRA0g+U8}{n6F1_J%F%4GS;4nMe8Hx9FN`zW0630rZb z-{wOeq(O_HmRl?JC^y;;m*QA5we;gRU<;fm@W*rLT5w;n&SLA}4`e2l*!x+kp)W%u z3(#)Bc?C}rDC)7E&hBX~DnZUB!-Y`!{J|6(Zy=iC+#g3ck)yxgbC3K~+^Os8P4n)C z59xF~i+v|ikEf1uw?bafHKW!{hy!A>(pvjSXe+|Mb4L|hRgDvAG~RF#wI1drIH}J5 XG&1edcT}i#aSAdyA/dev/null + +# Return 0 +exit 0 diff --git a/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml b/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml index 4e6a437f..7e4493a9 100644 --- a/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml +++ b/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml @@ -21,7 +21,7 @@ services: volumes: - ./config.yml:/config/config.yml - ./samples:/samples - command: ./build/ddsenabler/examples/ddsenabler_example --config /config/config.yml --timeout 5 --expected-types 1 --expected-topics 1 --publish-path /samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 2000 + command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --expected-types 1 --expected-topics 1 --publish-path /samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 2000 listener: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml b/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml index ef716078..8b9f9e22 100644 --- a/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml +++ b/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml @@ -16,7 +16,7 @@ services: - ./config.yml:/config/config.yml - ./samples:/samples - ./persistence:/persistence - command: ./build/ddsenabler/examples/ddsenabler_example --config /config/config.yml --timeout 5 --publish-path /samples --publish-topic test_topic --publish-period 200 --persistence-path /persistence + command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --publish-path /samples --publish-topic test_topic --publish-period 200 --persistence-path /persistence subscriber: image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml b/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml index 4d80171b..557f471d 100644 --- a/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml +++ b/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml @@ -18,7 +18,7 @@ services: - std_net volumes: - ./config.json:/config/config.json - command: ./build/ddsenabler/examples/ddsenabler_example --config /config/config.json --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 + command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.json --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 talker: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml b/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml index fb0739e0..166462b0 100644 --- a/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml +++ b/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml @@ -18,7 +18,7 @@ services: - std_net volumes: - ./config.yml:/config/config.yml - command: ./build/ddsenabler/examples/ddsenabler_example --config /config/config.yml --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 + command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 talker: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/1 b/ddsenabler_test/compose/test_cases/services/persistence/goals/1 new file mode 100644 index 00000000..8402bb25 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/goals/1 @@ -0,0 +1,3 @@ +{ + "order": 3 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/2 b/ddsenabler_test/compose/test_cases/services/persistence/goals/2 new file mode 100644 index 00000000..461fa735 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/goals/2 @@ -0,0 +1,3 @@ +{ + "order": 5 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/3 b/ddsenabler_test/compose/test_cases/services/persistence/goals/3 new file mode 100644 index 00000000..853b8317 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/goals/3 @@ -0,0 +1,3 @@ +{ + "order": 7 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/requests/1 b/ddsenabler_test/compose/test_cases/services/persistence/requests/1 new file mode 100644 index 00000000..0fbddba4 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/requests/1 @@ -0,0 +1,4 @@ +{ + "a": 1, + "b": 2 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/requests/2 b/ddsenabler_test/compose/test_cases/services/persistence/requests/2 new file mode 100644 index 00000000..9e5938e4 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/requests/2 @@ -0,0 +1,4 @@ +{ + "a": 2, + "b": 3 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/requests/3 b/ddsenabler_test/compose/test_cases/services/persistence/requests/3 new file mode 100644 index 00000000..fe99b20a --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/requests/3 @@ -0,0 +1,4 @@ +{ + "a": 3, + "b": 4 +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/services/add_two_ints b/ddsenabler_test/compose/test_cases/services/persistence/services/add_two_ints new file mode 100644 index 00000000..5af99fa0 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/persistence/services/add_two_ints @@ -0,0 +1,7 @@ +{ + "reply_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "reply_type_name": "example_interfaces::srv::dds_::AddTwoInts_Response_", + "request_serialized_qos": "reliability: true\ndurability: false\nownership: false\nkeyed: false", + "request_type_name": "example_interfaces::srv::dds_::AddTwoInts_Request_", + "service_name": "add_two_ints" +} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__msg__dds___GoalStatusArray_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b2666b485208d5c75e4eaddcea453f1b4ca49c5 GIT binary patch literal 1301 zcmb7EOOo0!5Ope*L*xi47K6=a3{|s`Z2TdE85{h;8_J)60U12l4A{4rBV?H)o88F580emB!1}Oq*Y(C%NvlOmEfnwx)&9!vkFse$qEtBZQvD4zf{2NBmJ->hUJ^ zNtx>86iDQh>Ruh@+BOU({b?>XVRPt*y3+*IdpfB?PiA{9$cIcYGcf!aA&k%n#);%@ zuOEHpZLoCx%s0ikc8WU|S)6$k)cGOY;uUw+#|kdQvAJGNHNVL3UHyjp56!uQ^c?py zKZ#le>c-ik;}o&fTg8F3Pbfa{(`~T}4QoZc5ldP*^Lu$L0%p8m`vJGYhiq=E^+{Lp zJ+U8c>uKZ7e4=KI7iL0fkj2`d2w5;fW9At}7(G3@nJdqaFO%wSqXlwnQLBt6$d8*; z*Q$iY^FDrvAL+`^FJzFFXP1a_e@Z-W<~l2uLt#}@DIjEA`wI!tSZ&xkmxv8m zG2k^kG4dI3^kE%zt~j4Z6GO|?u34?`_Jv~B3B|*4{-#OSke=f#c@5Mm@bP^*a63+x z8eS8eF>fK$0lNe|9o2zx7@7Ls-EFYk^`bnkY^Ia%5OC8$oQE$k*BIQZ4$v9y1?9nN zF9JtQ{&B|Z|3>S7@BaY!WB&tEEAw-2o3?gA;ca8lxwLM4{Gu@_l>T<#-*qo;eAvOb nUIc{qU1fM#-yi=|gORD$fLVUCM`!|T$&Fv>QY0O&1y=80o(g{o literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_msgs__srv__dds___CancelGoal_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..3312fb7d0c1bdff5828d78c9b30010552eda61aa GIT binary patch literal 1029 zcmbVLU2@tm5O$}%M9+{;8=F9YnLJ2#Y@i9mHvT~`j4fjfk-@}v0N&G;xScDj2m*_rTIk z5{NRfL>+3PPAvb-a&ybV$KEVg8`kW5%yOC#tZ#{m`F(kIit)%8!9{4>J)wl$7+-7|v5GmS3wajvthYlsw~cdc z8T3}z5BBtFwQwz;hM;2t|J8?g zCfZ;67>l60Wx+}66si-!LtpR?)C1gr0T8|;v<>)q$25txuaL+CHX^f*04?^2Ip z)k^Klb|lY??eW;(Hy-JO^zoAi!OVVe4Myr?R>asX%*FkUUXN`K8+6dj>^DXH+A9RZldYZY&K{fYU(LHYQ zJ`GrvTI?Ju?3`NumE`7ug!ADdmmAWYhQxB4kXzqkHSslZ)`om&3Tg?el?Q|odH|m) z{-Ik8gmpmk{nz$TlAGsbV6*78je>W+8@t?Lf8K3hH>#)ijnyslSn1sIH?`Qm@w^1? zXt7_~+ql+`TwyuM*(DA9EDl_j6mCg!#wZ)rR7sn~q2!iw9^509wc&#K{?c?=J&p?8HA1iYTL9Vvb58f)SbtE4~CqPmkWt(^k(f^ZI6QhFUMW0zU{r ze%z#%SqoOX+I``8-qQ=ftLOz*;~XEW6TM6|ucDKl(|hCSCyyz9_kt{*2TJe58~);m z4ra<992rrd9!PKzT!r$C(E)x*3Y&%E58xP5A;^zU!WGIvbA%uOUrFf7G*`1o868Rc o9nc)&+qS`IYFuHa{j<)zd$|aXdCellJV%OO#erJDI+uIt7hl3crvLx| literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin new file mode 100644 index 0000000000000000000000000000000000000000..fac6aee92c1c40e6410c8788f2e2c699efde0400 GIT binary patch literal 925 zcmb_aS#p~|5GCbP99dvznZi|p!f}-w{HVsK~k>#-{%W-@OWLYnwa~%>= z1bULhQAkdk|#-=lg?$?d)UI$O4eQY@IxYA4PZKNH<*r2abd6uwY58iN=?1~of zU+#3o!%FZyp`R3 zJC3F!M{S3@v%5J<5Q1bz9uag(o8HlLY*x@>i z_`VEq#rA!grM~xus?4eN)7tI}=ipK`e_}-rSbWSQ{jtHH?d$)#Q_%j&@bbCRmp1C3 ZuTq<4)|OMt-?YN6bMisg;rK2~;V)fbA8P;r literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..423f3111aa0077f6c6d6a53717318aeaca2a52cf GIT binary patch literal 577 zcmb_YZE}Jz5T)%YdJDw*#Y}$$C|I;Ap#tU)0|^#%5h_rXTl7f1SreGvpgZ&SZFZC0 z&6Dn=hkHqqY>tT5S#b*MrY_D|1XY-w>g2qSXi}+aUsP4bs!&zUEG|wFrCDetHBPDq z>JTTNO;XiiDDz&A9Mg09aY;s7T{hmIU<;-5@bm%oG7K_Nhm$f_5w*ibM%iG7F20wgO#!tNl-8S7G z=tU&8bT`Chtc><-?#c1cE_eR54HRgY<=seb9!T)UH82m%g0J{cjERNYpe@EYhm5~V zcgm^^WCqN%feyWjnKPFJ=70n%Ik=#v8z#Q4@A|pIJI1ZC3~d6=(phaX&-KAbUqz*J PM46?rIV*|CaFc!ky)3dA literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..62adda76b594f80efa4318abe2d93f4575438fac GIT binary patch literal 649 zcmb`EU2=jj5XaN@6g@*fg@pud=^b3cbF~&>N!m9~^NZM2Z zKiRpeRfOGs%x1O{s%GJCFOAdXH8bq1my*5bd=9?AGlTzx`+VRTR^v4Jz)E=nbvw7a zD4dSTscM&u4BNNoq94|UghHh0_>AIOyw;*Wo(r*s zNYn8YD2bTDVqrh9Q)y;}QRbi_tJ5M6>ZUHvX~?S}&FlEQ3t3$0dgs*jD5?TopQg0PL&nm; zj`PSYLLQL#)WlUC1U*Ql`~-bzrg2dX2U+c}PI1=SHntFYeHH#cpcH|u7X(?@5LYQi z1qLVEJ}Id-+(k2|NBfI%>t0(=<4t5bUw$?{_}=f)3T$NZ3q2Gg-z2Tq79*1J6#gY! z?Y;DR(FOkPAR&{vp*j*R+{Hp~2yMmVg=K`Zy>N8>J&=bg=9N6o$^J7QZYDkBW574O zv)qe(f-Sr3Oo0#E2JE6XFnvogRrj@5IIP)CN`hpeqWIeG16R{IF zv5c?AH1IRGme%_^b!?X#$y_+);cMfBPRFHx3!h8Ik|{>(W#XNdt9WsCKTdgB^^W_E Oj1wo$MGxIK*tvf|-xo^& literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..63bb3f25a2b372c7a6ed1d84602f26c66c618ccb GIT binary patch literal 625 zcmb`E$!>!%5Qb^{6n%zXSdu70%E7cOL8_CGmhFPDAq~_liXjVc(?{!@)HbPlXpbFf zW-Jdg|L|G5k?w9KNphK|xGS1E>H4lY6e*!eQFr-am*Sl2`dHNUETf68TLo(B6yqY< z=5=N_DM`GXwoOg*B$3&yd*<_QYrULT{rsXmEdAXuEte30#e$Wj59as{0I+sFumK%A zjrRD;vQcCKp_xtkP$hk4`cx3g{*n}#pM;av2Y5a=s=`jB%E>|WS6%P4&GI^3At!kyUg)rq`7SroQL0htdem%qVk84SCNAC?IRVop#ll2 zJO`;34HcJQ%{ZbOlJH~*a6m|5AuGa$<9i?VRYl@M-jAW>;A^ zkx26!zcmqCuPoRgZ%7$Vyj}W~hVWk*CWyXI Hw?2hG43FA9v8c!$yt5@Z$;@tMGJ`s(+d&A8 zHAQvI@0p0NvJ{W=F%b%5^>|^-xr#9c&VzTckfn+}q3(rLB1S#kv*ZfY_2L9hN}u)F z&#N>Cux%Zoujb(b0K26J6fFIsy?8!;^VYz!_(c0X~&4=F#lM%0u v>cXUZFAeAXvKo+ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___Log_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___Log_.bin new file mode 100644 index 0000000000000000000000000000000000000000..6e56d56ad6b88f745f211f24b249834ebe089637 GIT binary patch literal 653 zcmah{TTg>f3`YGGz8PPAaALL)l0Eb|!7YOgw{bZy%K(|fgEIqm;otaAZHq?VY|=|k z`!)UAqn&9N=bENnqwW&5+`LyWyKI%bl%`pfYtu~Aa%r05?RvTFV9h0}QO&IRaZ($n z`H2_RU&)`9YQ7aD%^kS0+s!VNFhq|g$+ds*|%4O*ECdFMN zn{7|p&rOKlw^b#5gRw64gCUt2nN}V_06bEh=zjkF7_j%qV*b#A;=-!qdsjt=wu2eY&Ttphv*o&NyQ6)eNSq@5n5}|tM~0&!3S5;S zuQ+tyC;7*ld~!4NPOPUHjG5;Xp+;m{5ilJuUKhrEw|A=BjTIU<(P_ZkBCHTiYFkx8 zwSpgU9Vi~)EjVAwP^y^TghQ660uQ$We2Y2??i3|J@NNejbDsK%D$%+751x1Z2Vbm$ m<2Rn`tY7>a;fplr=6LIU%=d#iFGwCA`q~#W4!c1B literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__msg__dds___ParameterEvent_.bin new file mode 100644 index 0000000000000000000000000000000000000000..98649ae7fda80fa8104ddd2e1b057efb1527a399 GIT binary patch literal 1709 zcmb_c{f?SI5a-&yM4!PlRjgMuxjz;ZkgKSi^0EII0XXYtreV8+LbA$JT4}y@6dyI_?i;Y>y&O=FICl{W0 zT+W?Vox4WjIc6M`Kd*h)+z!{f4cE;jtYgnLBHyu5#_^nEgWD2gdQS#`TZHR9;7kL~ z>P#NPUbk9-Hl;%i{~7oI260tTUNa6p*bWml4V_93P6HHT_c-+sXNWuU&k5roZi{3e z@nrO$b#a2Yz>hj?azbW0D3O0=JxJo5H(p>ewnjMeAMD?c2Ka0C zP+l`yA>aZRh3Cev@cV@Cp{&gM-HKxiN;d;zhhsur;EE{mMsXP$)#wlRYIuU!UW@2Hvsh^joz(N7x0)4TI@iMkd6^l_fh zmZlyinTlIKQ8P|lunk?Ec)46pz%DwdKffWy^-eBC)FCdiJ9Tm#=2FqD_3dTZTKCN} z7mpwlpsk9FjC{jM!Ss+HPt-Mc2iL=-QF5qXu34oEtF6Tu)hcM2 zL@sf0hfvjk8aowcAlj7saPH9Ei3`XMQUb1WziGx^l`Rb8sKNL4eszj_{cEL6i(DDy ziQ1Lfq2@v%SH0@-3i{Rm>s4x)*mX=dDRr1U%FSiS+$0cWmIa zi~MP=IBc{ZUi8(czHAcj)OWD93&fNz)=ibuo)|??uQ6Bug-4)o!sD8qa@YDRp6~}T C4gHz` literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..d33a48d98096fbc64147c4f83e935f29597cfdaf GIT binary patch literal 261 zcmX9&TW*6e5ZtJz$SGRo)yNVbODIi|LJ3lU_y-X`1Sw7%n^cs$^sceVNHaUy$7o>! zPZI!mwbZOFn@cCOte7x_82w8K=cXhi5QgdIB$7&3O4t=srs8@NrYixa_I9l|hrSjy zUFeW!OS!t`38LrO5&T;+v`C^9_xSAWh`@FIzvHZzRlaCO+wKqEYis8aw|FdXBTVejAIlqZT0sS|t? z{7_D@?(o@7ejm}VjoNViw$F=6REKG-CbM|a=|{QM@c%+gcG0iq`=M?~`Myg(Gb-#1 z^*Ua3!>Jl07L_`k@)r&Dn81+M(}QEwX{T|nm9a~?^CtA>_z@^$FljW_T6+*X$SyQ`jGEBjc!%{F?!O!wyN8{m-ZKrb%~x3zWZ|{Nio$}`0iG$j6Kiz zUAm2Z&zwiDL*5((p7qM|?0~r*y#pN36T%$ACxU*gVCLK>mG8EN-$WdBz%~Y~E04Dl zPdUd|6gm5h=975J^0HpGk7fh`FuCsBmkJnILW1hrGSIVD=*qZeo%$WQVqN>_yIB<* z97|Ju>cl2c6MjAbSnkXNP2NX&-J`g{`FX7oIs%pR+r22)cA;yfv5_6{{1t?yW>LJM zeo&A2qg=lWz#(Li*L&Zy*HIp)OqbW_%arl6%-005TkcB*8osM%1D=VG-y3e6u}sE% zdqu$aFY4b%kNoGoCeGx%8y;7$aPW7EW$d(5_#M|2+&__fMm6Ey5~|XEK&8R!-eO&| z^Us~u_-PS1${aP=1)iO;!b&H(b3$z@M)#X~Dcj@O1GK2}a4}$~{BNY@G_JyqLlD0ytEN#_)@n1V@PjW8FnVAgh zv3`#+HY2vGF5f>p-Bwa*!?|gHI6oXr$$6l=wQOahsoh>r+LWn2e{0i~v^O9=H+arG zZ*`P`znGilGTYt&9EU1)Cn_MUqZAT&vhe}0Aak$9_)^JyIusZ+MIP7c_BB(JX#Dzd zI*Kr^$U}i?QegD9&v$k%)9BV}^s*7?j|9d;{H0U##GZAngjW9H!os6p03JU81UBy* KzZ1B!(P4kJGfW=< literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..55815c1fadef8ef09e4d88f94610111b00de5ef1 GIT binary patch literal 257 zcmXX=+YW*-44v^S{0bF=mnA+7Nl+dTP-N_dz!(uhC7bcWpZK?S#FL!%w5M%~252}y z2rYn;H)(Zy2w7%aD2$bSVq6p|#n=%KKa<&2fP4J3LZzWl?fs@iiqHslm$IPm+V`qj zc2zX4qfIa)WW5FpeStXv_-;r7GS;$(%^_Kz#CVrkY)%+;uSx7Ryt~i&%r*9xwq{$e zguG=m3=-;|^Z2CaB0;T&Pge&z&s^5+E#?{O3?>TNa=lrOsX{-ELh@=~UNAVT($m>vEyb7wzgCcRGks6 zL(g#f^y#jnd{VxARurWVdoRo7rhd)$>y^w~!)W&h!^pCBX&83?I$!NqRStjKrJuLW zu5RHK8?J3wryS#$6Ld95l5m(!vHa19KQ9EV8EC&=0NZR>BhhDqy=v( z;|qu#zc1}4dbIJ*Km!!SuZehD98##ARg*RgPdIp$2x8B8jFD%C5$OxFQkFxF>LVXV z{mjAx`T`v)1pFn{gH37&SG+dqBN3cAkVN`CRaWJ%q<6u|*cRzXKh%GoyLk1+h_^*Q z174WLF^`#QfBoOm34jL6nUsI-k5gsFDZk4c(WF&&vrkARPwC*R z|M%;=SBszX;ZD=+2N-0-#GPyH&R+ckyg6z+dG!Ic(y~a~O|ME_Xct~}lE}aGYZvuI zDRq8GYp;x;Q}?}h;H6od3g9fJ5L(Cee(Tv~cl@TiYUX-(vmwYMTk@0lBJu>Ljg-GL CZyv?~ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..9b9387d7860fc1dfcb36ae4a1c7496aea715ef33 GIT binary patch literal 289 zcmXAi+fsut5Qfw7DSQSmEbVy83>T@=C|X21g^(L269SD8tpr7UH{Y!r`px`%`jcHW zLuWID&=SM9|X#n^T~7?-6jFn-atk3}bp0^1ge`ubM3FAzG1f47H=OS-o~ zGUm0)Ory1UCdBu_LjNF5fH+LZ8@X}i#KQ*CYRnhEmB_B0xJGvh8%xg=Uj?%l^a<=w3%-KL-t>ejs%7qgFspIJeyl^z2)gVo31lzar XG~G?sv>+h&gizOWnhqtcUFoAE2nSVj literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___ListParameters_Response_.bin new file mode 100644 index 0000000000000000000000000000000000000000..a1212fb47b828ab89c6d5540b97d2673521949be GIT binary patch literal 569 zcmbV}OK!q25QfwC6g>kQ2oI%^SWI}O5x5Bzd2J%&gqGAm8q?C`Mm{ z@p#7mt@*6oXm_`orVXT*j3?XuF)KHeWx_N?`DvPIDiYJ2Z^hB2CEaDREs|v>io;%H zNz#`0?xh=rYrJxA-E9rtThyklmx*=1G+Im4her$ygR%*{ zxC@zDO&1`-`~x)@R;=c()tvQ4U|`K|b};fVx2iaZi)`lCs;cJc$$9?4>dYy~^@7yV z$R$&K)hqMW;lk-#>ZbUv;-m({hsRjF&WUv${clbW&v8gjYrS8`z5#QT0^|-HgR%)+ P|GzUi`^@@s9RKwfsUxVn literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c19eeb6a6d5e895949e8906d2dd53d536afdfd3e GIT binary patch literal 1277 zcmbtT(Q=wl5T(sm^c(tuS`y5!s$wbBYFSy&Q%Wt*67VX`2?b@U6Y_XdH+}z-ma{F0PO0NenbbRoj zhT}3ywDkSB`7)b^ni@w=F%DfR>c`6@a#w@JdKug944>XOa`Ge$$R`|!FO4{81K2$s z0e%u(@0m_s_)P`fL)-Q>Vcqjbi{1e_U_yEtf(JT!gfk$E z`Gu(z^18|S2~Q{f(4_5c6|YQOIrFIKc#15FGQz z{13xhdUbo`Z#i0uxY&#RIFj%1`;0#(Umg10Lyvu`SDz=%>oRJZdr_EL)Qa=O4kS5( z!T!hwmuEnmG48n$C-vrH<>XoLjw3i+3ODIrJ|ictZ}p$!i4JQ@XK?(nKAkgz&hd3> zJL{xK&(?{dJX0T?+s1Kjm-$K#TF#49#XhO4pIRIo=k_=HaD|7t-4btJ+_(Rp+Zo0B z4A7@@#3mm-8ak8Aq%f<%YqVy!0k&O+?-h>|a1?CU{xwbw=jocLEq`BD~Hh>)HBWj9lXFQ_R*OK5!bm_<}*3>isSX21@?@!hoIc T6HKoE<%Ln!3wVA$AQ=4s0m8Eq literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rcl_interfaces__srv__dds___SetParameters_Request_.bin new file mode 100644 index 0000000000000000000000000000000000000000..da5208da88ddae75cefac8d0b9ae581cba260418 GIT binary patch literal 1233 zcmbVMQFEd|4Cb!C;(o)uAeNpw(}x8Gq*D~CfV?=efT)XS1+DV0`VTLOwbdD4dOJf1 zyUCX?AzA5%bay97(mgy|E~blhm2R^cPs>iH-0nM_Bq^tz&P!SiXWLnk!f846($`&D zR@130{Q|$%`r*FzHoUcO*N!#nX3PDIvByU^lAeD`Qt9>>8`>UoS#4kt$7j1>&Bc6u* zSr-N51w3R>v{l^n7qRJI;hMycNNCIgC*tSGyb!ynae>L$65)tH#GenJ@zd#{y=kin z;6g2qlTcjY_X&T3wi@eqPc`;1Uu_X9?J`u1BQFd!Y({x(`2r1@PWHeCmaDTCVT`E| z7y0IVZRe?f#gW;R3Ki)yo}MGuul#TE1cMER)5-swpGJ|HM*ekT*_*gXZsrND)KmZ0 ztBq5yuJW}QH0^_s`7y4mCpGfVz4{LQN?DzHb%$JOQLVn+s~P%w1kgu0B9%lB8_hs9 zE{rOodaxB8ebnamOhJW_p!M}1amEyQzCF9(L$muj*G1^N$Mm%p70axuH3DD*Dpw+l*L|A;<)q`#p2a8D1r^gZ0Vc4+->uc`+f`C zq+8U-_ob#fpF@{?HrT9>9#yZHm*an zsNVKMM)S#PxAt_Jpr3inG+ai~(6L2bJ>S@M>>OL{08b6rLO`vXurUUx0HyfEI=b>0 zt-ah9AB|{YA9xW)1s%-+Bb{U}qx(=`HFDlx#{K`#&4riBPPCmm(?RxP=gxhNDE;Q; z197>Sb>`*aG8AAi#_)GuBAIml;)S(I7Rl;9%xQ+)z__`kx%2G@AMajFhxiHq)$ literal 0 HcmV?d00001 diff --git a/ddsenabler_test/compose/test_cases/services/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin b/ddsenabler_test/compose/test_cases/services/persistence/types/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin new file mode 100644 index 0000000000000000000000000000000000000000..c3236d9624c069dfe9de6002e525a51609b867f5 GIT binary patch literal 1025 zcmbVL+isgc5GBf2^c(t6gJTDf@~~VCrZ%=WGT@ae3)nio0Hy}xn74j*-#W9n?Mo^} z8EI#SVRqOv=OEol_xF+{4Pl+~%bN3QogVZ2Sm=6Qz34h7bbTJ5>Rq}k&THAx}^6O8RyuNnaL(khw?6g2)hcX7*q= zu1Ul<%%N?h_)QYZO|m}@lgKY-`|`kCe*^n0QD{cPK`)MI$s*rNa@Ir_Y-0}48zQvP zceXHIA;9z;6G^TeSfHI(p`4|CW4lt8m_|#5$NLeRq`1Q}Uto6z4ReA`l8;WeIrb-!_Nvkkw-*j;oV#>TZJ@BGp&e2x=ED)?<8z0zBk3#AYe{^#YbU2imRDATRpS1<@0HvMu93n^Hqu%a{lzL~{89eoKm5JIg1(iQw9uz|LkA>c@?H2AtH|rcpDd9UZz_5pgOy-sVl8*HxTXy=b$9iw@(iyfG>|gVC*DX$_nIesDc?K(@4oRe@vL6CWp?xQ)%bSe3%0z)RQr{izF^O@%Ea$c2D05v$I{j0i*{Dn@?hCZ&K71;wBy_)g~m_L252w!0yl zlhoO&t(0BGFgRmR&(~jnGmUSJKmKeq8U{RvGLIg^s0f~)^25_^`}njyM9-^55Eb2S z@qFrb!?1Ylc8%!p08_PJX4+Aa@3uws_$W0R-@#Ys?a-mhR@%C&mM!Q@abTeOv50*hL2;WFT$}-p*L6yr^9@5IKsB- z(l_mYh~1Fpt4H6JQ~cInuqEg?Ga2h)D28+N6?L<4+gluEyRS^8eM5?NXZ zM_n(Kwj|uP6p+7)4;RB$sj)pyhP>RLTa$Tyh;psC83HG&wLW3nqKGMWg!yaO+F6<| z4I9?rz;Q6#8z*e(lOYxixy1j)ll5pEat=1t%G04WeI58^9-p$A2E5pjD;({WIx$Vuu6S***WU1Tjz;OD)v(`bDzJx}4TBeY1$nQ3gEKnmxqI zr2nm!nSLN_dW3C_eUEi;&g6bw#=*W&&+>5T?Wecnr!8a+Gsg^A-+kRwoJHps#`e0# z_W3rHMl*M`_wU=A_-Ym}25)P9|JG=f7)zxIw-^PP_H}G)-p)yH!FP=QL6E^*Y%1$B zkR1}zS`%_nk9^PsAZ4WqRuUNcdg0lXzVd6FT`2?lA=LRfGza-I3s=6Pzxb||hh|ke zjFa4Hv;@>m^A$CRA0g+U8}{n6F1_J%F%4GS;4nMe8Hx9FN`zW0630rZb z-{wOeq(O_HmRl?JC^y;;m*QA5we;gRU<;fm@W*rLT5w;n&SLA}4`e2l*!x+kp)W%u z3(#)Bc?C}rDC)7E&hBX~DnZUB!-Y`!{J|6(Zy=iC+#g3ck)yxgbC3K~+^Os8P4n)C z59xF~i+v|ikEf1uw?bafHKW!{hy!A>(pvjSXe+|Mb4L|hRgDvAG~RF#wI1drIH}J5 XG&1edcT}i#aSAdyA/dev/null + +# Return 0 +exit 0 + diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml new file mode 100644 index 00000000..12126a25 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -0,0 +1,33 @@ +# Test description: +# Run ddsenabler example service client against an AddTwoInts server. +# 3 requests are sent to the server. +# Domain 33 is used. + +services: + # ENABLER + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./build/ddsenabler/examples/service/ddsenabler_example_service --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + add_two_ints_server: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_server + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=33 + volumes: + - ./../run_service_server_timeout.sh:/run_service_server_timeout.sh:ro + entrypoint: ["/bin/bash", "/run_service_server_timeout.sh"] + +networks: + std_net: + default: + driver: none \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/service_client/config.yml b/ddsenabler_test/compose/test_cases/services/service_client/config.yml new file mode 100644 index 00000000..21f38f14 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_client/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 33 diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml new file mode 100644 index 00000000..07b17e47 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -0,0 +1,54 @@ +# Test description: +# Run ddsenabler example action_server and a Fibonacci client sending goals. +# Domain 34 is used by all containers. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./build/ddsenabler/examples/service/ddsenabler_example_service --announce-server true --persistence-path /persistence --config /config/config.yml --expected-requests 3 + + add_two_ints_client_1: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_1 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=34 + command: ros2 run demo_nodes_cpp add_two_ints_client + + add_two_ints_client_2: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_2 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=34 + command: > + sh -c "sleep 3 && + ros2 run demo_nodes_cpp add_two_ints_client" + add_two_ints_client_3: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_3 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=34 + command: > + sh -c "sleep 6 && + ros2 run demo_nodes_cpp add_two_ints_client" +networks: + std_net: + default: + driver: none \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/service_server/config.yml b/ddsenabler_test/compose/test_cases/services/service_server/config.yml new file mode 100644 index 00000000..7c7408ac --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_server/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 34 diff --git a/ddsenabler_yaml/src/cpp/EnablerConfiguration.cpp b/ddsenabler_yaml/src/cpp/EnablerConfiguration.cpp index bbd5d3f9..eb8a6ef4 100644 --- a/ddsenabler_yaml/src/cpp/EnablerConfiguration.cpp +++ b/ddsenabler_yaml/src/cpp/EnablerConfiguration.cpp @@ -204,23 +204,6 @@ void EnablerConfiguration::load_ddsenabler_configuration_( load_dds_configuration_(dds_yml, version); } - // Block ROS 2 services (RPC) topics - // RATIONALE: - // At the time of this writing, services in ROS 2 behave in the following manner: a ROS 2 service - // client awaits to discover a server, and it is then when a request is sent to this (and only this) server, - // from which a response is expected. - // Hence, if these topics are not blocked, the client would wrongly believe DDS-Enabler is a server, thus - // sending a request for which a response will not be received. - WildcardDdsFilterTopic rpc_request_topic, rpc_response_topic; - rpc_request_topic.topic_name.set_value("rq/*"); - rpc_response_topic.topic_name.set_value("rr/*"); - - ddspipe_configuration.blocklist.insert( - utils::Heritable::make_heritable(rpc_request_topic)); - - ddspipe_configuration.blocklist.insert( - utils::Heritable::make_heritable(rpc_response_topic)); - // Enable manually after all callbacks are set to avoid missing notifications ddspipe_configuration.init_enabled = false; From e43c240af328e4da0d102afbc7a0fc0b6ca306d1 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 4 Jul 2025 10:22:33 +0200 Subject: [PATCH 02/87] Fix doxygen Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/Callbacks.hpp | 147 +++++++++--------- 1 file changed, 77 insertions(+), 70 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index b7c1e7b2..de188d74 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -141,11 +141,11 @@ typedef bool (* DdsTopicQuery)( * * This callback is used to notify the discovery of a service and its associated request and reply types. * - * @param service_name The name of the service that was discovered. - * @param request_type_name The name of the request type associated with the service. - * @param request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. - * @param reply_type_name The name of the reply type associated with the service. - * @param reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + * @param [in] service_name The name of the service that was discovered. + * @param [in] request_type_name The name of the request type associated with the service. + * @param [in] reply_type_name The name of the reply type associated with the service. + * @param [in] request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. + * @param [in] reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. */ typedef void (* ServiceNotification)( const char* service_name, @@ -159,10 +159,10 @@ typedef void (* ServiceNotification)( * * This callback is used to notify the reception of a reply for a specific service. * - * @param service_name The name of the service for which the reply was received. - * @param json The JSON data received in the reply. - * @param request_id The unique identifier of the request for which this is a reply. - * @param publish_time The time at which the reply was published. + * @param [in] service_name The name of the service for which the reply was received. + * @param [in] json The JSON data received in the reply. + * @param [in] request_id The unique identifier of the request for which this is a reply. + * @param [in] publish_time The time at which the reply was published. */ typedef void (* ServiceReplyNotification)( const char* service_name, @@ -175,10 +175,10 @@ typedef void (* ServiceReplyNotification)( * * This callback is used to notify the reception of a request for a specific service. * - * @param service_name The name of the service for which the request was received. - * @param json The JSON data received in the request. - * @param request_id The unique identifier of the request. - * @param publish_time The time at which the request was published. + * @param [in] service_name The name of the service for which the request was received. + * @param [in] json The JSON data received in the request. + * @param [in] request_id The unique identifier of the request. + * @param [in] publish_time The time at which the request was published. * * @note The request_id is unique for each request and must be later used to identify the reply. */ @@ -193,11 +193,12 @@ typedef void (* ServiceRequestNotification)( * * This callback is used to request the type information for a service's request and reply. * - * @param service_name The name of the service for which the type information is requested. - * @param request_type_name The name of the request type associated with the service. - * @param request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. - * @param reply_type_name The name of the reply type associated with the service. - * @param reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + * @param [in] service_name The name of the service for which the type information is requested. + * @param [out] request_type_name The name of the request type associated with the service. + * @param [out] request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. + * @param [out] reply_type_name The name of the reply type associated with the service. + * @param [out] reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + * @return \c true if the service was found and the type information was retrieved successfully, \c false otherwise. */ typedef bool (* ServiceQuery)( const char* service_name, @@ -217,21 +218,23 @@ typedef void (* ServiceRequestNotification)( * * This callback is used to notify the discovery of an action and its associated types. * - * @param action_name The name of the action that was discovered. - * @param goal_request_action_type The type of the goal request action. - * @param goal_reply_action_type The type of the goal reply action. - * @param cancel_request_action_type The type of the cancel request action. - * @param cancel_reply_action_type The type of the cancel reply action. - * @param result_request_action_type The type of the get result request action. - * @param result_reply_action_type The type of the get result reply action. - * @param feedback_action_type The type of the feedback action. - * @param goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. - * @param goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. - * @param cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. - * @param cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. - * @param result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. - * @param result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. - * @param feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + * @param [in] action_name The name of the action that was discovered. + * @param [in] goal_request_action_type The type of the goal request action. + * @param [in] goal_reply_action_type The type of the goal reply action. + * @param [in] cancel_request_action_type The type of the cancel request action. + * @param [in] cancel_reply_action_type The type of the cancel reply action. + * @param [in] result_request_action_type The type of the get result request action. + * @param [in] result_reply_action_type The type of the get result reply action. + * @param [in] feedback_action_type The type of the feedback action. + * @param [in] status_action_type The type of the status action. + * @param [in] goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. + * @param [in] goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. + * @param [in] cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. + * @param [in] cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. + * @param [in] result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. + * @param [in] result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. + * @param [in] feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + * @param [in] status_action_serialized_qos The serialized Quality of Service (QoS) settings for the status action. */ typedef void (* ActionNotification)( const char* action_name, @@ -257,11 +260,11 @@ typedef void (* ActionNotification)( * * This callback is used to notify the request of an action goal. * - * @param action_name The name of the action for which the goal is being requested. - * @param json The JSON data representing the goal request. - * @param goal_id The unique identifier of the goal associated with the action. - * @param publish_time The time at which the goal request was published. - * @param status_code The status code as a place holder for the current state of the action. + * @param [in] action_name The name of the action for which the goal is being requested. + * @param [in] json The JSON data representing the goal request. + * @param [in] goal_id The unique identifier of the goal associated with the action. + * @param [in] publish_time The time at which the goal request was published. + * @return \c true if the goal request has been accepted, \c false otherwise. */ typedef bool (* ActionGoalRequestNotification)( const char* action_name, @@ -279,10 +282,11 @@ typedef bool (* ActionGoalRequestNotification)( * If the goal ID is not empty and timestamp is zero, cancel the goal with the given ID regardless of the time it was accepted * If the goal ID is not empty and timestamp is not zero, cancel the goal with the given ID and all goals accepted at or before the timestamp * - * @param action_name The name of the action for which the cancel request is being made. - * @param goal_id The unique identifier of the goal associated with the action. - * @param publish_time The time at which the cancel request was published. - * @param status_code The status code as a place holder for the current state of the action. + * @param [in] action_name The name of the action for which the cancel request is being made. + * @param [in] goal_id The unique identifier of the goal associated with the action. + * @param [in] timestamp The timestamp used for discriminating which goals to cancel. + * @param [in] request_id The identifier of the cancel request used for dicriminating which goals to cancel. + * @param [in] publish_time The time at which the cancel request was published. */ typedef void (* ActionCancelRequestNotification)( const char* action_name, @@ -296,10 +300,10 @@ typedef void (* ActionCancelRequestNotification)( * * This callback is used to notify the feedback of an action. * - * @param action_name The name of the action for which the feedback is being notified. - * @param json The JSON data representing the feedback of the action. - * @param goal_id The unique identifier of the goal associated with the action. - * @param publish_time The time at which the feedback was published. + * @param [in] action_name The name of the action for which the feedback is being notified. + * @param [in] json The JSON data representing the feedback of the action. + * @param [in] goal_id The unique identifier of the goal associated with the action. + * @param [in] publish_time The time at which the feedback was published. */ typedef void (* ActionFeedbackNotification)( const char* action_name, @@ -312,11 +316,11 @@ typedef void (* ActionFeedbackNotification)( * * This callback is used to notify the update of the status of an action. * - * @param action_name The name of the action for which the status is being notified. - * @param goal_id The unique identifier of the goal associated with the action. - * @param status_code The status code representing the current state of the action. - * @param status_message A message providing additional information about the status. - * @param publish_time The time at which the status was published. + * @param [in] action_name The name of the action for which the status is being notified. + * @param [in] goal_id The unique identifier of the goal associated with the action. + * @param [in] status_code The status code representing the current state of the action. + * @param [in] status_message A message providing additional information about the status. + * @param [in] publish_time The time at which the status was published. */ typedef void (* ActionStatusNotification)( const char* action_name, @@ -330,10 +334,10 @@ typedef void (* ActionStatusNotification)( * * This callback is used to notify the result of an action in case of success. * - * @param action_name The name of the action for which the result is being notified. - * @param json The JSON data representing the result of the action. - * @param goal_id The unique identifier of the goal associated with the action. - * @param publish_time The time at which the result was published. + * @param [in] action_name The name of the action for which the result is being notified. + * @param [in] json The JSON data representing the result of the action. + * @param [in] goal_id The unique identifier of the goal associated with the action. + * @param [in] publish_time The time at which the result was published. */ typedef void (* ActionResultNotification)( const char* action_name, @@ -346,21 +350,24 @@ typedef void (* ActionResultNotification)( * * This callback is used to request the action types for a specific action. * - * @param action_name The name of the action for which the types are being requested. - * @param goal_request_action_type The type of the goal request action. - * @param goal_reply_action_type The type of the goal reply action. - * @param cancel_request_action_type The type of the cancel request action. - * @param cancel_reply_action_type The type of the cancel reply action. - * @param result_request_action_type The type of the get result request action. - * @param result_reply_action_type The type of the get result reply action. - * @param feedback_action_type The type of the feedback action. - * @param goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. - * @param goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. - * @param cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. - * @param cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. - * @param result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. - * @param result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. - * @param feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + * @param [in] action_name The name of the action for which the types are being requested. + * @param [out] goal_request_action_type The type of the goal request action. + * @param [out] goal_reply_action_type The type of the goal reply action. + * @param [out] cancel_request_action_type The type of the cancel request action. + * @param [out] cancel_reply_action_type The type of the cancel reply action. + * @param [out] result_request_action_type The type of the get result request action. + * @param [out] result_reply_action_type The type of the get result reply action. + * @param [out] feedback_action_type The type of the feedback action. + * @param [out] status_action_type The type of the status action. + * @param [out] goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. + * @param [out] goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. + * @param [out] cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. + * @param [out] cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. + * @param [out] result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. + * @param [out] result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. + * @param [out] feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. + * @param [out] status_action_serialized_qos The serialized Quality of Service (QoS) settings for the status action. + * @return \c true if the action was found and the types were retrieved successfully, \c false otherwise. */ typedef bool (* ActionQuery)( const char* action_name, From 20a8c7d9080ab0e3904b4497851d8bea3b6870ec Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 4 Jul 2025 12:35:31 +0200 Subject: [PATCH 03/87] Fix tests Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/Writer.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 8669f6cf..f7eb9b55 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -754,16 +754,6 @@ bool Writer::prepare_json_data_( json_output[msg.topic.topic_name()]["data"][ss_instanceHandle.str()] = nlohmann::json::parse(ss_dyn_data.str()); } - // Notify data reception - if (data_notification_callback_) - { - data_notification_callback_( - msg.topic.topic_name().c_str(), - json_output.dump(4).c_str(), - msg.publish_time.to_ns() - ); - } - return true; } From 6b2f8840a97087d9c520c697f811f495fa3b90fb Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 7 Jul 2025 09:35:55 +0200 Subject: [PATCH 04/87] Update tests Signed-off-by: Eugenio Collado --- ddsenabler_test/compose/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/ddsenabler_test/compose/CMakeLists.txt b/ddsenabler_test/compose/CMakeLists.txt index 2295c3ae..edba0265 100644 --- a/ddsenabler_test/compose/CMakeLists.txt +++ b/ddsenabler_test/compose/CMakeLists.txt @@ -18,10 +18,8 @@ set(TESTS publish/requested_type reception/topics_json reception/topics_yaml - services/service_discovery services/service_server services/service_client - actions/action_discovery actions/action_client actions/action_client_cancel actions/action_server From c9d563b6d41187b41b8e31450664fdea4d04dcc2 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 21 Jul 2025 16:22:33 +0200 Subject: [PATCH 05/87] Rename repository Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/Readme.md | 10 +++++----- ddsenabler/examples/service/Readme.md | 6 +++--- ddsenabler/test/DDSEnablerTester.hpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 6a892efd..53e4db96 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -1,8 +1,8 @@ -# Service Example Readme +# Action Example Readme -This example demonstrates the usage of the FIWARE DDS Enabler for implementing a service. The example includes a client and a server setup for the desired service. +This example demonstrates the usage of the DDS Enabler for implementing an action. The example includes a client and a server setup for the desired action. -By default, the example is prepared for the `Fibonacci` service, providing a standard reply with a constant result of the Fibonacci sequence of order 5 for any request. +By default, the example is prepared for the `Fibonacci` action, providing a standard reply with a constant result of the Fibonacci sequence of order 5 for any request. Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The Persistence/goals directory must be modified to suit the specific action type and its expected goal requests. @@ -10,10 +10,10 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 7176ee59..0ad4e516 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -1,6 +1,6 @@ # Service Example Readme -This example demonstrates the usage of the FIWARE DDS Enabler for implementing a service. The example includes a client and a server setup for the desired service. +This example demonstrates the usage of the DDS Enabler for implementing a service. The example includes a client and a server setup for the desired service. By default, the example is prepared for the `add_two_ints` service, providing a standard reply with a constant result of 3 for any request. @@ -10,10 +10,10 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path /FIWARE-DDS-Enabler/ddsenabler/examples/Persistence/ --config /FIWARE-DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 443a1632..de2f4db3 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -35,7 +35,7 @@ using namespace eprosima::fastdds::dds; #define TEST_SERVICE_NAME "add_two_ints" #define TEST_ACTION_NAME "fibonacci/_action/" -#define TEST_FILE_DIRECTORY "/home/eugenio/Documents/enabler_suite/fast_suite/src/FIWARE-DDS-Enabler/ddsenabler/test/test_files/" +#define TEST_FILE_DIRECTORY "/home/eugenio/Documents/enabler_suite/fast_suite/src/DDS-Enabler/ddsenabler/test/test_files/" #define TEST_SERVICE_FILE "test_service.json" #define TEST_ACTION_FILE "test_action.json" From 972743f1c125caba1c3b716f3089efd358333551 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 09:11:35 +0200 Subject: [PATCH 06/87] Utils as examples library Signed-off-by: Eugenio Collado --- ddsenabler/examples/CMakeLists.txt | 1 + ddsenabler/examples/action/CMakeLists.txt | 3 +- ddsenabler/examples/action/Readme.md | 6 +-- ddsenabler/examples/action/main.cpp | 10 ++-- ddsenabler/examples/publish/CMakeLists.txt | 3 +- ddsenabler/examples/publish/main.cpp | 12 ++--- ddsenabler/examples/service/CMakeLists.txt | 3 +- ddsenabler/examples/service/Readme.md | 6 +-- ddsenabler/examples/service/main.cpp | 10 ++-- ddsenabler/examples/utils/CMakeLists.txt | 24 +++++++++ .../examples/utils}/Utils.cpp | 13 ++--- .../examples/utils}/Utils.hpp | 10 +--- ddsenabler/test/DDSEnablerTester.hpp | 51 ------------------- 13 files changed, 57 insertions(+), 95 deletions(-) create mode 100644 ddsenabler/examples/utils/CMakeLists.txt rename {ddsenabler_participants/src/cpp => ddsenabler/examples/utils}/Utils.cpp (98%) rename {ddsenabler_participants/include/ddsenabler_participants => ddsenabler/examples/utils}/Utils.hpp (95%) diff --git a/ddsenabler/examples/CMakeLists.txt b/ddsenabler/examples/CMakeLists.txt index e11940ae..a61c5f79 100644 --- a/ddsenabler/examples/CMakeLists.txt +++ b/ddsenabler/examples/CMakeLists.txt @@ -13,6 +13,7 @@ # limitations under the License. # Add subdirectories for examples +add_subdirectory(utils) add_subdirectory(publish) add_subdirectory(service) add_subdirectory(action) diff --git a/ddsenabler/examples/action/CMakeLists.txt b/ddsenabler/examples/action/CMakeLists.txt index d047b32e..6e50ded0 100644 --- a/ddsenabler/examples/action/CMakeLists.txt +++ b/ddsenabler/examples/action/CMakeLists.txt @@ -17,7 +17,8 @@ project(ddsenabler_example_action LANGUAGES CXX) add_executable(ddsenabler_example_action main.cpp) -target_link_libraries(ddsenabler_example_action PRIVATE ddsenabler) +target_include_directories(ddsenabler_example_action PRIVATE ${PROJECT_SOURCE_DIR}/../utils) +target_link_libraries(ddsenabler_example_action PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_action diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 53e4db96..ffeea239 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -4,16 +4,16 @@ This example demonstrates the usage of the DDS Enabler for implementing an actio By default, the example is prepared for the `Fibonacci` action, providing a standard reply with a constant result of the Fibonacci sequence of order 5 for any request. -Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The Persistence/goals directory must be modified to suit the specific action type and its expected goal requests. +Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The persistence/goals directory must be modified to suit the specific action type and its expected goal requests. ## Example Commands ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index be9edb57..0229548d 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -28,7 +28,7 @@ #include #include -#include "ddsenabler_participants/Utils.hpp" +#include "Utils.hpp" #include "ddsenabler/dds_enabler_runner.hpp" #include "ddsenabler/DDSEnabler.hpp" @@ -80,7 +80,7 @@ static void test_type_notification_callback( std::lock_guard lock(app_mutex_); std::cout << "Type callback received: " << type_name << std::endl; if (!config.persistence_path.empty() && - !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -100,7 +100,7 @@ static bool test_type_query_callback( } // Load the type from file - if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + if (!utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to load type: " << type_name << std::endl; @@ -165,7 +165,7 @@ static void test_action_notification_callback( ).string(); if (!config.persistence_path.empty()) { - eprosima::ddsenabler::participants::utils::save_action_to_file( + utils::save_action_to_file( action_file, action_name, goal_request_action_type, @@ -222,7 +222,7 @@ static bool test_action_query_callback( config.persistence_path) / ACTION_SUBDIR ).string(); - if (!eprosima::ddsenabler::participants::utils::load_action_from_file( + if (!utils::load_action_from_file( action_file, action_name, goal_request_action_type, diff --git a/ddsenabler/examples/publish/CMakeLists.txt b/ddsenabler/examples/publish/CMakeLists.txt index 0cf3dc87..fb48e70b 100644 --- a/ddsenabler/examples/publish/CMakeLists.txt +++ b/ddsenabler/examples/publish/CMakeLists.txt @@ -17,7 +17,8 @@ project(ddsenabler_example_publish LANGUAGES CXX) add_executable(ddsenabler_example_publish main.cpp) -target_link_libraries(ddsenabler_example_publish PRIVATE ddsenabler) +target_include_directories(ddsenabler_example_publish PRIVATE ${PROJECT_SOURCE_DIR}/../utils) +target_link_libraries(ddsenabler_example_publish PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_publish diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index 64337f9d..680c1aae 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -28,7 +28,7 @@ #include #include -#include "ddsenabler_participants/Utils.hpp" +#include #include "ddsenabler/dds_enabler_runner.hpp" #include "ddsenabler/DDSEnabler.hpp" @@ -88,7 +88,7 @@ static void test_type_notification_callback( std::cout << "Type callback received: " << type_name << ", Total types: " << received_types_ << std::endl << serialized_type << std::endl << std::endl; if (!config.persistence_path.empty() && - !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -113,7 +113,7 @@ static bool test_type_query_callback( } // Load the type from file - if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + if (!utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to load type: " << type_name << std::endl; @@ -135,7 +135,7 @@ static void test_topic_notification_callback( std::cout << "Topic callback received: " << topic_name << " of type " << type_name << ", Total topics: " << received_topics_ << std::endl << serialized_qos << std::endl << std::endl; if (!config.persistence_path.empty() && - !eprosima::ddsenabler::participants::utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), + !utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, type_name, serialized_qos)) { @@ -161,7 +161,7 @@ static bool test_topic_query_callback( } // Load the topic from file - if (!eprosima::ddsenabler::participants::utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, + if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, type_name, serialized_qos)) { @@ -184,7 +184,7 @@ static void test_data_notification_callback( std::cout << "Data callback received: " << topic_name << ", Total data: " << received_data_ << std::endl << json << std::endl << std::endl; if (!config.persistence_path.empty() && - !eprosima::ddsenabler::participants::utils::save_data_to_file((std::filesystem::path(config.persistence_path) / SAMPLES_SUBDIR).string(), + !utils::save_data_to_file((std::filesystem::path(config.persistence_path) / SAMPLES_SUBDIR).string(), topic_name, json, publish_time)) { diff --git a/ddsenabler/examples/service/CMakeLists.txt b/ddsenabler/examples/service/CMakeLists.txt index 05e9837f..563f0379 100644 --- a/ddsenabler/examples/service/CMakeLists.txt +++ b/ddsenabler/examples/service/CMakeLists.txt @@ -17,7 +17,8 @@ project(ddsenabler_example_service LANGUAGES CXX) add_executable(ddsenabler_example_service main.cpp) -target_link_libraries(ddsenabler_example_service PRIVATE ddsenabler) +target_include_directories(ddsenabler_example_service PRIVATE ${PROJECT_SOURCE_DIR}/../utils) +target_link_libraries(ddsenabler_example_service PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_service diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 0ad4e516..831811ed 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -4,16 +4,16 @@ This example demonstrates the usage of the DDS Enabler for implementing a servic By default, the example is prepared for the `add_two_ints` service, providing a standard reply with a constant result of 3 for any request. -Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The Persistence/requests directory must be modified to suit the specific service type and its expected requests. +Users are encouraged to implement their own functional server logic as needed in the `server_specific_logic` function. The persistence/requests directory must be modified to suit the specific service type and its expected requests. ## Example Commands ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/Persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 98621d5e..9418ac45 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -28,7 +28,7 @@ #include #include -#include "ddsenabler_participants/Utils.hpp" +#include #include "ddsenabler/dds_enabler_runner.hpp" #include "ddsenabler/DDSEnabler.hpp" @@ -80,7 +80,7 @@ static void test_type_notification_callback( std::lock_guard lock(app_mutex_); std::cout << "Type callback received: " << type_name << std::endl; if (!config.persistence_path.empty() && - !eprosima::ddsenabler::participants::utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -100,7 +100,7 @@ static bool test_type_query_callback( } // Load the type from file - if (!eprosima::ddsenabler::participants::utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + if (!utils::load_type_from_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to load type: " << type_name << std::endl; @@ -152,7 +152,7 @@ static void test_service_notification_callback( ).string(); if (!config.persistence_path.empty()) { - eprosima::ddsenabler::participants::utils::save_service_to_file( + utils::save_service_to_file( service_file, service_name, request_type_name, @@ -182,7 +182,7 @@ static bool test_service_query_callback( config.persistence_path) / SERVICES_SUBDIR ).string(); - if (eprosima::ddsenabler::participants::utils::load_service_from_file( + if (utils::load_service_from_file( service_file, service_name, request_type_name, diff --git a/ddsenabler/examples/utils/CMakeLists.txt b/ddsenabler/examples/utils/CMakeLists.txt new file mode 100644 index 00000000..a4b58db8 --- /dev/null +++ b/ddsenabler/examples/utils/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.20) +project(ddsenabler_example_utils LANGUAGES CXX) + +add_library(utils STATIC + Utils.cpp +) + +target_include_directories(utils PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/ddsenabler_participants/src/cpp/Utils.cpp b/ddsenabler/examples/utils/Utils.cpp similarity index 98% rename from ddsenabler_participants/src/cpp/Utils.cpp rename to ddsenabler/examples/utils/Utils.cpp index 18d34e45..11ce7f7e 100644 --- a/ddsenabler_participants/src/cpp/Utils.cpp +++ b/ddsenabler/examples/utils/Utils.cpp @@ -13,20 +13,16 @@ // limitations under the License. /** - * @file RpcUtils.cpp + * @file Utils.cpp */ -#include +#include "Utils.hpp" #include #include #include #include - -namespace eprosima { -namespace ddsenabler { -namespace participants { namespace utils { std::string safe_file_name( @@ -601,7 +597,4 @@ bool load_action_from_file( } -} // namespace utils -} // namespace participants -} // namespace ddsenabler -} // namespace eprosima +} // namespace utils \ No newline at end of file diff --git a/ddsenabler_participants/include/ddsenabler_participants/Utils.hpp b/ddsenabler/examples/utils/Utils.hpp similarity index 95% rename from ddsenabler_participants/include/ddsenabler_participants/Utils.hpp rename to ddsenabler/examples/utils/Utils.hpp index efa640b2..ce6114dc 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Utils.hpp +++ b/ddsenabler/examples/utils/Utils.hpp @@ -16,13 +16,8 @@ #include #include -#include - #pragma once -namespace eprosima { -namespace ddsenabler { -namespace participants { namespace utils { std::string safe_file_name( @@ -114,7 +109,4 @@ bool load_action_from_file( std::string& feedback_action_serialized_qos, std::string& status_action_serialized_qos); -} // namespace utils -} // namespace participants -} // namespace ddsenabler -} // namespace eprosima \ No newline at end of file +} // namespace utils \ No newline at end of file diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index de2f4db3..9b20fcd7 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "ddsenabler/dds_enabler_runner.hpp" @@ -32,13 +31,6 @@ using namespace eprosima::ddsenabler; using namespace eprosima::ddsenabler::participants; using namespace eprosima::fastdds::dds; -#define TEST_SERVICE_NAME "add_two_ints" -#define TEST_ACTION_NAME "fibonacci/_action/" - -#define TEST_FILE_DIRECTORY "/home/eugenio/Documents/enabler_suite/fast_suite/src/DDS-Enabler/ddsenabler/test/test_files/" -#define TEST_SERVICE_FILE "test_service.json" -#define TEST_ACTION_FILE "test_action.json" - namespace ddsenablertester { struct KnownType @@ -348,49 +340,6 @@ class DDSEnablerTester : public ::testing::Test { } - // eprosima::ddsenabler::participants::ServiceTypeQuery type_req_callback; - static bool test_service_type_request_callback( - const char* service_name, - char*& request_type_name, - char*& request_serialized_qos, - char*& reply_type_name, - char*& reply_serialized_qos) - { - if (current_test_instance_) - { - std::lock_guard lock(current_test_instance_->rpc_mutex_); - - std::string service_file = TEST_FILE_DIRECTORY; - std::string request_type_name_str; - std::string reply_type_name_str; - std::string request_serialized_qos_str; - std::string reply_serialized_qos_str; - if (eprosima::ddsenabler::participants::utils::load_service_from_file( - service_file, - service_name, - request_type_name_str, - reply_type_name_str, - request_serialized_qos_str, - reply_serialized_qos_str)) - { - request_type_name = new char[request_type_name_str.size() + 1]; - std::strcpy(request_type_name, request_type_name_str.c_str()); - - reply_type_name = new char[reply_type_name_str.size() + 1]; - std::strcpy(reply_type_name, reply_type_name_str.c_str()); - - request_serialized_qos = new char[request_serialized_qos_str.size() + 1]; - std::strcpy(request_serialized_qos, request_serialized_qos_str.c_str()); - - reply_serialized_qos = new char[reply_serialized_qos_str.size() + 1]; - std::strcpy(reply_serialized_qos, reply_serialized_qos_str.c_str()); - return true; - } - std::cout << "ERROR DDSEnablerTester: fail to load service from file: " << service_file << std::endl; - } - return false; - } - int get_received_types() { if (current_test_instance_) From 9cb4203353a1ca1dc2f4e362e31dde283bdd7069 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 09:27:13 +0200 Subject: [PATCH 07/87] Fix docstring in CallbackSet Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/CallbackSet.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ddsenabler/include/ddsenabler/CallbackSet.hpp b/ddsenabler/include/ddsenabler/CallbackSet.hpp index a214e83e..07249640 100644 --- a/ddsenabler/include/ddsenabler/CallbackSet.hpp +++ b/ddsenabler/include/ddsenabler/CallbackSet.hpp @@ -67,13 +67,13 @@ struct ActionCallbacks //! Callback for notifying the reception of action goal requests participants::ActionGoalRequestNotification action_goal_request_notification{nullptr}; - //! Callback for notifying the reception of action goal responses + //! Callback for notifying the reception of action feedback participants::ActionFeedbackNotification action_feedback_notification{nullptr}; - //! Callback for notifying the reception of action goal results + //! Callback for notifying the reception of action cancel requests participants::ActionCancelRequestNotification action_cancel_request_notification{nullptr}; - //! Callback for notifying the reception of action goal results + //! Callback for notifying the reception of action results participants::ActionResultNotification action_result_notification{nullptr}; //! Callback for notifying the reception of action status notifications From 24a2a9cf57cb57f546be74ce3d35d8ef64a2c844 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 09:31:46 +0200 Subject: [PATCH 08/87] NIT: Request before reply Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/Callbacks.hpp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index de188d74..d6fc585a 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -154,22 +154,6 @@ typedef void (* ServiceNotification)( const char* request_serialized_qos, const char* reply_serialized_qos); -/** - * @brief Callback for reception of RPC reply data. - * - * This callback is used to notify the reception of a reply for a specific service. - * - * @param [in] service_name The name of the service for which the reply was received. - * @param [in] json The JSON data received in the reply. - * @param [in] request_id The unique identifier of the request for which this is a reply. - * @param [in] publish_time The time at which the reply was published. - */ -typedef void (* ServiceReplyNotification)( - const char* service_name, - const char* json, - uint64_t request_id, - int64_t publish_time); - /** * @brief Callback for reception of service request data. * @@ -188,6 +172,22 @@ typedef void (* ServiceRequestNotification)( uint64_t request_id, int64_t publish_time); +/** + * @brief Callback for reception of RPC reply data. + * + * This callback is used to notify the reception of a reply for a specific service. + * + * @param [in] service_name The name of the service for which the reply was received. + * @param [in] json The JSON data received in the reply. + * @param [in] request_id The unique identifier of the request for which this is a reply. + * @param [in] publish_time The time at which the reply was published. + */ +typedef void (* ServiceReplyNotification)( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time); + /** * @brief Callback requesting the type information of a given service's request and reply. * From 3a57d6982cde0d8ed524535b176d14068e90b3fd Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 09:44:26 +0200 Subject: [PATCH 09/87] Isolate RpcTypes from Callbacks Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/Callbacks.hpp | 25 +-------- .../ddsenabler_participants/RpcTypes.hpp | 54 +++++++++++++++++++ 2 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index d6fc585a..54cc6024 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -22,33 +22,12 @@ #include #include +#include "RpcTypes.hpp" + namespace eprosima { namespace ddsenabler { namespace participants { -using UUID = std::array; - -enum STATUS_CODE { - STATUS_UNKNOWN = 0, - STATUS_ACCEPTED, - STATUS_EXECUTING, - STATUS_CANCELING, - STATUS_SUCCEEDED, - STATUS_CANCELED, - STATUS_ABORTED, - STATUS_REJECTED, - STATUS_TIMEOUT, - STATUS_FAILED, - STATUS_CANCEL_REQUEST_FAILED - }; - -enum CANCEL_CODE { - ERROR_NONE = 0, - ERROR_REJECTED, - ERROR_UNKNOWN_GOAL_ID, - ERROR_GOAL_TERMINATED -}; - /** * DdsLogFunc - callback executed when consuming log messages * diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp new file mode 100644 index 00000000..9dead634 --- /dev/null +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -0,0 +1,54 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file RpcTypes.hpp + */ + +#include +#include +#include + +#pragma once + +namespace eprosima { +namespace ddsenabler { +namespace participants { + +using UUID = std::array; + +enum STATUS_CODE { + STATUS_UNKNOWN = 0, + STATUS_ACCEPTED, + STATUS_EXECUTING, + STATUS_CANCELING, + STATUS_SUCCEEDED, + STATUS_CANCELED, + STATUS_ABORTED, + STATUS_REJECTED, + STATUS_TIMEOUT, + STATUS_FAILED, + STATUS_CANCEL_REQUEST_FAILED + }; + +enum CANCEL_CODE { + ERROR_NONE = 0, + ERROR_REJECTED, + ERROR_UNKNOWN_GOAL_ID, + ERROR_GOAL_TERMINATED +}; + +} /* namespace participants */ +} /* namespace ddsenabler */ +} /* namespace eprosima */ From e4542b689667f4c7b2f40575bd4584088e8da61f Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 09:45:05 +0200 Subject: [PATCH 10/87] Trace in examples else notification Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 4 ++++ ddsenabler/examples/service/main.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 0229548d..912a687b 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -189,6 +189,10 @@ static void test_action_notification_callback( app_cv_.notify_all(); } } + else + { + std::cout << "Ignoring action callback for: " << action_name << std::endl; + } } // Static action query callback diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 9418ac45..984ee340 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -164,6 +164,10 @@ static void test_service_notification_callback( app_cv_.notify_all(); } } + else + { + std::cout << "Ignoring service callback for: " << service_name << std::endl; + } } // Static service query callback From 02dd67e1f39377f7b3a621c69e40fb7f36df8a90 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 10:14:52 +0200 Subject: [PATCH 11/87] General examples improvements Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 64 ++-------------- ddsenabler/examples/publish/main.cpp | 56 +------------- ddsenabler/examples/service/main.cpp | 107 +++++++++------------------ ddsenabler/examples/utils/Utils.cpp | 51 +++++++++++++ ddsenabler/examples/utils/Utils.hpp | 9 +++ 5 files changed, 104 insertions(+), 183 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 912a687b..ff2c3e6c 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -252,6 +252,10 @@ static bool test_action_query_callback( return true; } } + else + { + std::cout << "Ignoring action query callback for: " << action_name << std::endl; + } return false; } @@ -321,61 +325,6 @@ static void test_action_cancel_request_notification_callback( // NOT IMPLEMENTED } -void init_persistence( - const std::string& persistence_path) -{ - auto ensure_directory_exists = [](const std::filesystem::path& path) - { - if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) - { - std::cerr << "Failed to create directory: " << path << std::endl; - } - }; - - if (!persistence_path.empty()) - { - ensure_directory_exists(persistence_path); - std::vector subdirs = {TYPES_SUBDIR, ACTION_SUBDIR}; - if (config.announce_server) - { - subdirs.push_back(REQUESTS_SUBDIR); - } - for (const auto& sub : subdirs) - { - ensure_directory_exists(std::filesystem::path(persistence_path) / sub); - } - } -} - -void get_sorted_files( - const std::string& directory, - std::vector>& files) -{ - for (const auto& entry : std::filesystem::directory_iterator(directory)) - { - if (entry.is_regular_file()) - { - std::string filename = entry.path().filename().string(); - try - { - // assumes name is just a number - files.emplace_back(entry.path(), static_cast(std::stoll(filename))); - } - catch (const std::invalid_argument& e) - { - std::cerr << "Skipping non-numeric file: " << filename << std::endl; - } - } - } - - // Sort files by numeric value - std::sort(files.begin(), files.end(), - [](const auto& a, const auto& b) - { - return a.second < b.second; - }); -} - bool wait_for_action_discovery( uint32_t timeout, std::mutex& app_mutex, @@ -455,7 +404,7 @@ bool client_routine( // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) std::vector> sample_files; - get_sorted_files(goal_path, sample_files); + utils::get_sorted_files(goal_path, sample_files); uint32_t sent_requests = 0; for (const auto& [path, number] : sample_files) { @@ -637,7 +586,8 @@ int main( config = CLIParser::parse_cli_options(argc, argv); // Initialize persistence if required - init_persistence(config.persistence_path); + std::vector subdirs = {TYPES_SUBDIR, ACTION_SUBDIR}; + utils::init_persistence(config.persistence_path, subdirs); // Set up callbacks CallbackSet callbacks{ diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index 680c1aae..4ff1b79c 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -216,57 +216,6 @@ bool expected_received( return validate_received(config); } -void init_persistence( - const std::string& persistence_path) -{ - auto ensure_directory_exists = [](const std::filesystem::path& path) - { - if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) - { - std::cerr << "Failed to create directory: " << path << std::endl; - } - }; - - if (!persistence_path.empty()) - { - ensure_directory_exists(persistence_path); - std::vector subdirs = {SAMPLES_SUBDIR, TYPES_SUBDIR, TOPICS_SUBDIR}; - for (const auto& sub : subdirs) - { - ensure_directory_exists(std::filesystem::path(persistence_path) / sub); - } - } -} - -void get_sorted_files( - const std::string& directory, - std::vector>& files) -{ - for (const auto& entry : std::filesystem::directory_iterator(directory)) - { - if (entry.is_regular_file()) - { - std::string filename = entry.path().filename().string(); - try - { - // assumes name is just a number - files.emplace_back(entry.path(), static_cast(std::stoll(filename))); - } - catch (const std::invalid_argument& e) - { - std::cerr << "Skipping non-numeric file: " << filename << std::endl; - } - } - } - - // Sort files by numeric value - std::sort(files.begin(), files.end(), - [](const auto& a, const auto& b) - { - return a.second < b.second; - }); -} - void publish_routine( std::shared_ptr enabler, const std::string& publish_path, @@ -282,7 +231,7 @@ void publish_routine( // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) std::vector> sample_files; - get_sorted_files(publish_path, sample_files); + utils::get_sorted_files(publish_path, sample_files); for (const auto& [path, number] : sample_files) { @@ -342,7 +291,8 @@ int main( config = CLIParser::parse_cli_options(argc, argv); - init_persistence(config.persistence_path); + std::vector subdirs = {SAMPLES_SUBDIR, TYPES_SUBDIR, TOPICS_SUBDIR}; + utils::init_persistence(config.persistence_path, subdirs); CallbackSet callbacks{ test_log_callback, diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 984ee340..1056cb1c 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -178,26 +178,41 @@ static bool test_service_query_callback( std::string& reply_type_name, std::string& reply_serialized_qos) { - app_cv_.notify_all(); + std::lock_guard lock(app_mutex_); - std::cout << "Service type request callback received: " << service_name << std::endl; + if (config.persistence_path.empty()) + { + std::cerr << "Persistence path is not set, cannot query service: " << service_name << std::endl; + return false; + } - std::string service_file = (std::filesystem::path( - config.persistence_path) / - SERVICES_SUBDIR - ).string(); - if (utils::load_service_from_file( - service_file, - service_name, - request_type_name, - reply_type_name, - request_serialized_qos, - reply_serialized_qos)) + if (config.service_name == std::string(service_name)) { - return true; + std::cout << "Service type request callback received: " << service_name << std::endl; + + std::string service_file = (std::filesystem::path( + config.persistence_path) / + SERVICES_SUBDIR + ).string(); + if (utils::load_service_from_file( + service_file, + service_name, + request_type_name, + reply_type_name, + request_serialized_qos, + reply_serialized_qos)) + { + app_cv_.notify_all(); + return true; + } + std::cout << "ERROR: fail to load service from file: " << service_file << std::endl; + return false; + } + else + { + std::cout << "Ignoring service type request callback for: " << service_name << std::endl; + return false; } - std::cout << "ERROR Tester: fail to load service from file: " << service_file << std::endl; - return false; } // Static service reply notification callback @@ -229,61 +244,6 @@ static void test_service_request_notification_callback( app_cv_.notify_all(); } -void init_persistence( - const std::string& persistence_path) -{ - auto ensure_directory_exists = [](const std::filesystem::path& path) - { - if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) - { - std::cerr << "Failed to create directory: " << path << std::endl; - } - }; - - if (!persistence_path.empty()) - { - ensure_directory_exists(persistence_path); - std::vector subdirs = {TYPES_SUBDIR, SERVICES_SUBDIR}; - if (config.announce_server) - { - subdirs.push_back(REQUESTS_SUBDIR); - } - for (const auto& sub : subdirs) - { - ensure_directory_exists(std::filesystem::path(persistence_path) / sub); - } - } -} - -void get_sorted_files( - const std::string& directory, - std::vector>& files) -{ - for (const auto& entry : std::filesystem::directory_iterator(directory)) - { - if (entry.is_regular_file()) - { - std::string filename = entry.path().filename().string(); - try - { - // assumes name is just a number - files.emplace_back(entry.path(), static_cast(std::stoll(filename))); - } - catch (const std::invalid_argument& e) - { - std::cerr << "Skipping non-numeric file: " << filename << std::endl; - } - } - } - - // Sort files by numeric value - std::sort(files.begin(), files.end(), - [](const auto& a, const auto& b) - { - return a.second < b.second; - }); -} - bool wait_for_service_discovery( uint32_t timeout, std::mutex& app_mutex, @@ -362,7 +322,7 @@ bool client_routine( // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) std::vector> sample_files; - get_sorted_files(request_path, sample_files); + utils::get_sorted_files(request_path, sample_files); uint32_t sent_requests = 0; for (const auto& [path, number] : sample_files) { @@ -495,7 +455,8 @@ int main( config = CLIParser::parse_cli_options(argc, argv); // Initialize persistence if required - init_persistence(config.persistence_path); + std::vector subdirs = {TYPES_SUBDIR, SERVICES_SUBDIR}; + utils::init_persistence(config.persistence_path, subdirs); // Set up callbacks CallbackSet callbacks{ diff --git a/ddsenabler/examples/utils/Utils.cpp b/ddsenabler/examples/utils/Utils.cpp index 11ce7f7e..04bb66d0 100644 --- a/ddsenabler/examples/utils/Utils.cpp +++ b/ddsenabler/examples/utils/Utils.cpp @@ -596,5 +596,56 @@ bool load_action_from_file( return true; } +void init_persistence( + const std::string& persistence_path, + std::vector subdirs) +{ + auto ensure_directory_exists = [](const std::filesystem::path& path) + { + if (!std::filesystem::exists(path) && !std::filesystem::create_directories(path)) + { + std::cerr << "Failed to create directory: " << path << std::endl; + } + }; + + if (!persistence_path.empty()) + { + ensure_directory_exists(persistence_path); + for (const auto& sub : subdirs) + { + ensure_directory_exists(std::filesystem::path(persistence_path) / sub); + } + } +} + +void get_sorted_files( + const std::string& directory, + std::vector>& files) +{ + for (const auto& entry : std::filesystem::directory_iterator(directory)) + { + if (entry.is_regular_file()) + { + std::string filename = entry.path().filename().string(); + try + { + // assumes name is just a number + files.emplace_back(entry.path(), static_cast(std::stoll(filename))); + } + catch (const std::invalid_argument& e) + { + std::cerr << "Skipping non-numeric file: " << filename << std::endl; + } + } + } + + // Sort files by numeric value + std::sort(files.begin(), files.end(), + [](const auto& a, const auto& b) + { + return a.second < b.second; + }); +} + } // namespace utils \ No newline at end of file diff --git a/ddsenabler/examples/utils/Utils.hpp b/ddsenabler/examples/utils/Utils.hpp index ce6114dc..8755932d 100644 --- a/ddsenabler/examples/utils/Utils.hpp +++ b/ddsenabler/examples/utils/Utils.hpp @@ -15,6 +15,7 @@ #include #include #include +#include #pragma once @@ -109,4 +110,12 @@ bool load_action_from_file( std::string& feedback_action_serialized_qos, std::string& status_action_serialized_qos); +void init_persistence( + const std::string& persistence_path, + std::vector subdirs); + +void get_sorted_files( + const std::string& directory, + std::vector>& files); + } // namespace utils \ No newline at end of file From 101bbc5ac562a02a2d8524f6bc3a63741e4b9972 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 10:37:41 +0200 Subject: [PATCH 12/87] Example CLI option -server/-client Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 33 ++++++++++++++----- ddsenabler/examples/action/Readme.md | 4 +-- ddsenabler/examples/service/CLIParser.hpp | 33 ++++++++++++++----- ddsenabler/examples/service/Readme.md | 5 +-- .../actions/action_client/compose.yml | 2 +- .../actions/action_client_cancel/compose.yml | 2 +- .../actions/action_server/compose.yml | 2 +- .../services/service_client/compose.yml | 2 +- .../services/service_server/compose.yml | 2 +- 9 files changed, 58 insertions(+), 27 deletions(-) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 3e7d2643..1b208b62 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -55,8 +55,8 @@ class CLIParser std::cout << " (Default: '')" << std::endl; std::cout << "--action-name Name of the action to be registered" << std::endl; std::cout << " (Default: 'Fibonacci/_action/')" << std::endl; - std::cout << "--announce-server Whether to be server or client" << std::endl; - std::cout << " (Default: true)" << std::endl; + std::cout << "-client Run as a client (mutually exclusive with -server)" << std::endl; + std::cout << "-server Run as a server (mutually exclusive with -client)" << std::endl; std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; std::cout << " program if expectations are not met" << std::endl; std::cout << " (Default: 30)" << std::endl; @@ -94,6 +94,9 @@ class CLIParser print_help(EXIT_FAILURE); } + bool client_flag = false; + bool server_flag = false; + for (int i = 1; i < argc; ++i) { std::string arg = argv[i]; @@ -131,19 +134,25 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "--announce-server") + else if (arg == "-client") { - if (++i < argc) + if (server_flag) { - config.announce_server = (std::string(argv[i]) == "true") || - (std::string(argv[i]) == "True") || - (std::string(argv[i]) == "1"); + std::cerr << "Cannot specify both -client and -server flags" << std::endl; + print_help(EXIT_FAILURE); } - else + client_flag = true; + config.announce_server = false; + } + else if (arg == "-server") + { + if (client_flag) { - std::cerr << "Failed to parse --announce-server argument" << std::endl; + std::cerr << "Cannot specify both -client and -server flags" << std::endl; print_help(EXIT_FAILURE); } + server_flag = true; + config.announce_server = true; } else if (arg == "--timeout") { @@ -238,6 +247,12 @@ class CLIParser } } + if (!client_flag && !server_flag) + { + std::cerr << "Either -client or -server flag must be specified" << std::endl; + print_help(EXIT_FAILURE); + } + if (config.config_file_path.empty()) { std::cerr << "Configuration file path is required" << std::endl; diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index ffeea239..f02d194f 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -10,10 +10,10 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server false --persistence-path /DDS-Enabler/ddsenabler/examples/persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +./install/ddsenabler/bin/ddsenabler_example_action -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action --announce-server true --persistence-path /DDS-Enabler/ddsenabler/examples/persistence/ --config /DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_action -server --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index 7d913d3e..ff0d1537 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -54,8 +54,8 @@ class CLIParser std::cout << " (Default: '')" << std::endl; std::cout << "--service-name Name of the service to be registered" << std::endl; std::cout << " (Default: 'add_two_ints')" << std::endl; - std::cout << "--announce-server Whether to be server or client" << std::endl; - std::cout << " (Default: true)" << std::endl; + std::cout << "-client Run as a client (mutually exclusive with -server)" << std::endl; + std::cout << "-server Run as a server (mutually exclusive with -client)" << std::endl; std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; std::cout << " program if expectations are not met" << std::endl; std::cout << " (Default: 30)" << std::endl; @@ -91,6 +91,9 @@ class CLIParser print_help(EXIT_FAILURE); } + bool client_flag = false; + bool server_flag = false; + for (int i = 1; i < argc; ++i) { std::string arg = argv[i]; @@ -128,19 +131,25 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "--announce-server") + else if (arg == "-client") { - if (++i < argc) + if (server_flag) { - config.announce_server = (std::string(argv[i]) == "true") || - (std::string(argv[i]) == "True") || - (std::string(argv[i]) == "1"); + std::cerr << "Cannot specify both -client and -server flags" << std::endl; + print_help(EXIT_FAILURE); } - else + client_flag = true; + config.announce_server = false; + } + else if (arg == "-server") + { + if (client_flag) { - std::cerr << "Failed to parse --announce-server argument" << std::endl; + std::cerr << "Cannot specify both -client and -server flags" << std::endl; print_help(EXIT_FAILURE); } + server_flag = true; + config.announce_server = true; } else if (arg == "--timeout") { @@ -221,6 +230,12 @@ class CLIParser } } + if (!client_flag && !server_flag) + { + std::cerr << "Either -client or -server flag must be specified" << std::endl; + print_help(EXIT_FAILURE); + } + if (config.config_file_path.empty()) { std::cerr << "Configuration file path is required" << std::endl; diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 831811ed..8a04dbac 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,10 +10,11 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server false --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config +$PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service --announce-server true --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_service -server --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 ``` \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml index cbf35b34..ea9f7fc2 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + command: ./build/ddsenabler/examples/action/ddsenabler_example_action -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml index 21b3acdd..f4902ea5 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml @@ -12,7 +12,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 --cancel-requests true + command: ./build/ddsenabler/examples/action/ddsenabler_example_action -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 --cancel-requests true fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml index 04e59ffe..be913421 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action --announce-server true --persistence-path /persistence --config /config/config.yml --expected-requests 3 + command: ./build/ddsenabler/examples/action/ddsenabler_example_action -server --persistence-path /persistence --config /config/config.yml --expected-requests 3 fibonacci_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml index 12126a25..52d460d6 100644 --- a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service --announce-server false --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + command: ./build/ddsenabler/examples/service/ddsenabler_example_service -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 add_two_ints_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} container_name: add_two_ints_server diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index 07b17e47..a51e2e0a 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service --announce-server true --persistence-path /persistence --config /config/config.yml --expected-requests 3 + command: ./build/ddsenabler/examples/service/ddsenabler_example_service -server --persistence-path /persistence --config /config/config.yml --expected-requests 3 add_two_ints_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} From cd747522298a5a571d6b71af86c909b045f52ab9 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 10:37:57 +0200 Subject: [PATCH 13/87] Examples Thread Safe Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 16 ++++++++++------ ddsenabler/examples/service/main.cpp | 17 +++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index ff2c3e6c..03ad2e73 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -346,7 +346,9 @@ bool wait_for_action_discovery( bool wait_for_action_request( uint32_t timeout, std::mutex& app_mutex, - std::condition_variable& app_cv) + std::condition_variable& app_cv, + eprosima::ddsenabler::participants::UUID& request_id, + std::string& goal_json) { std::unique_lock lock(app_mutex); if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), @@ -358,6 +360,10 @@ bool wait_for_action_request( std::cerr << "Timeout waiting for service request." << std::endl; return false; } + + request_id = received_requests_.back().first; + goal_json = received_requests_.back().second; + received_requests_.pop_back(); return true; } @@ -518,17 +524,15 @@ bool server_routine( while (true) { - if (!wait_for_action_request(timeout, app_mutex, app_cv)) + eprosima::ddsenabler::participants::UUID request_id; + std::string goal_json; + if (!wait_for_action_request(timeout, app_mutex, app_cv, request_id, goal_json)) { std::cerr << "Timeout waiting for action request." << std::endl; return false; } - // Pop the last request from the received requests vector - eprosima::ddsenabler::participants::UUID request_id = received_requests_.back().first; - std::string goal_json = received_requests_.back().second; uint64_t fibonacci_number = 5; // Default Fibonacci number, can be parsed from json if needed - received_requests_.pop_back(); std::cout << "Received request for action: " << action_name << " with request ID: " << request_id << std::endl; std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 1056cb1c..67037876 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -265,7 +265,9 @@ bool wait_for_service_discovery( bool wait_for_service_request( uint32_t timeout, std::mutex& app_mutex, - std::condition_variable& app_cv) + std::condition_variable& app_cv, + uint64_t& request_id, + std::string& request) { std::unique_lock lock(app_mutex); if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), @@ -277,6 +279,11 @@ bool wait_for_service_request( std::cerr << "Timeout waiting for service request." << std::endl; return false; } + + // Pop the last request from the received requests vector + request_id = received_requests_.back().first; + request = received_requests_.back().second; + received_requests_.pop_back(); return true; } @@ -395,16 +402,14 @@ bool server_routine( while (true) { - if (!wait_for_service_request(timeout, app_mutex, app_cv)) + uint64_t request_id = 0; + std::string request; + if (!wait_for_service_request(timeout, app_mutex, app_cv, request_id, request)) { std::cerr << "Timeout waiting for service request." << std::endl; return false; } - // Pop the last request from the received requests vector - uint64_t request_id = received_requests_.back().first; - std::string request = received_requests_.back().second; - received_requests_.pop_back(); std::cout << "Received request for service: " << service_name << " with request ID: " << request_id << std::endl; // Example response From ac3adb5ef3839d3a0e0af14c3064ec6d0f9553de Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 22 Jul 2025 10:45:50 +0200 Subject: [PATCH 14/87] Examples parameters reduced Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 22 ++++++++-------------- ddsenabler/examples/service/main.cpp | 22 ++++++++-------------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 03ad2e73..1a9a8154 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -393,13 +393,10 @@ bool client_routine( const std::string& goal_path, uint32_t timeout, uint32_t request_initial_wait, - bool cancel_requests, - std::mutex& app_mutex, - std::condition_variable& app_cv, - bool& stop_app) + bool cancel_requests) { // Wait for service to be discovered - if (!wait_for_action_discovery(timeout, app_mutex, app_cv)) + if (!wait_for_action_discovery(timeout, app_mutex_, app_cv_)) { std::cerr << "Failed to discover service: " << action_name << std::endl; return false; @@ -449,7 +446,7 @@ bool client_routine( } // Wait publish period or until stop signal is received - else if (!wait_for_action_result(timeout, app_mutex, app_cv, sent_requests)) + else if (!wait_for_action_result(timeout, app_mutex_, app_cv_, sent_requests)) { std::cerr << "Failed to receive service reply." << std::endl; return false; @@ -508,10 +505,7 @@ bool server_routine( std::shared_ptr enabler, const std::string& action_name, uint32_t expected_requests, - uint32_t timeout, - std::mutex& app_mutex, - std::condition_variable& app_cv, - bool& stop_app) + uint32_t timeout) { // Announce action if (!enabler->announce_action(action_name)) @@ -526,7 +520,7 @@ bool server_routine( { eprosima::ddsenabler::participants::UUID request_id; std::string goal_json; - if (!wait_for_action_request(timeout, app_mutex, app_cv, request_id, goal_json)) + if (!wait_for_action_request(timeout, app_mutex_, app_cv_, request_id, goal_json)) { std::cerr << "Timeout waiting for action request." << std::endl; return false; @@ -549,7 +543,7 @@ bool server_routine( // Check if we have received the expected number of requests { - std::lock_guard lock(app_mutex); + std::lock_guard lock(app_mutex_); if (++received_results_ >= expected_requests) { break; @@ -629,12 +623,12 @@ int main( if (config.announce_server) { - ret = server_routine(enabler, config.action_name, config.expected_requests, config.timeout, app_mutex_, app_cv_, stop_app_); + ret = server_routine(enabler, config.action_name, config.expected_requests, config.timeout); } else { auto goal_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); - ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, config.cancel_requests, app_mutex_, app_cv_, stop_app_); + ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, config.cancel_requests); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 67037876..5875683b 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -312,13 +312,10 @@ bool client_routine( const std::string& service_name, const std::string& request_path, uint32_t timeout, - uint32_t request_initial_wait, - std::mutex& app_mutex, - std::condition_variable& app_cv, - bool& stop_app) + uint32_t request_initial_wait) { // Wait for service to be discovered - if (!wait_for_service_discovery(timeout, app_mutex, app_cv)) + if (!wait_for_service_discovery(timeout, app_mutex_, app_cv_)) { std::cerr << "Failed to discover service: " << service_name << std::endl; return false; @@ -357,7 +354,7 @@ bool client_routine( } // Wait publish period or until stop signal is received - if (!wait_for_service_reply(timeout, app_mutex, app_cv, sent_requests)) + if (!wait_for_service_reply(timeout, app_mutex_, app_cv_, sent_requests)) { std::cerr << "Failed to receive service reply." << std::endl; return false; @@ -386,10 +383,7 @@ bool server_routine( std::shared_ptr enabler, const std::string& service_name, uint32_t expected_requests, - uint32_t timeout, - std::mutex& app_mutex, - std::condition_variable& app_cv, - bool& stop_app) + uint32_t timeout) { // Announce service if (!enabler->announce_service(service_name)) @@ -404,7 +398,7 @@ bool server_routine( { uint64_t request_id = 0; std::string request; - if (!wait_for_service_request(timeout, app_mutex, app_cv, request_id, request)) + if (!wait_for_service_request(timeout, app_mutex_, app_cv_, request_id, request)) { std::cerr << "Timeout waiting for service request." << std::endl; return false; @@ -421,7 +415,7 @@ bool server_routine( // Check if we have received the expected number of requests { - std::lock_guard lock(app_mutex); + std::lock_guard lock(app_mutex_); if (++received_replies_ >= expected_requests) { return true; @@ -492,12 +486,12 @@ int main( // Service logic based on announce_server flag if (config.announce_server) { - ret = server_routine(enabler, config.service_name, config.expected_requests, config.timeout, app_mutex_, app_cv_, stop_app_); + ret = server_routine(enabler, config.service_name, config.expected_requests, config.timeout); } else { auto request_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); - ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait, app_mutex_, app_cv_, stop_app_); + ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; From e695e14daf3f9e44822b512b9501d60cfbc9be36 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 23 Jul 2025 13:21:14 +0200 Subject: [PATCH 15/87] Add missing EOL Signed-off-by: Eugenio Collado --- ddsenabler/examples/persistence/goals/1 | 2 +- ddsenabler/examples/persistence/goals/2 | 2 +- ddsenabler/examples/persistence/goals/3 | 2 +- ddsenabler/examples/persistence/requests/1 | 2 +- ddsenabler/examples/persistence/requests/2 | 2 +- ddsenabler/examples/persistence/requests/3 | 2 +- .../include/ddsenabler_participants/RpcUtils.hpp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ddsenabler/examples/persistence/goals/1 b/ddsenabler/examples/persistence/goals/1 index 8402bb25..53967fb0 100644 --- a/ddsenabler/examples/persistence/goals/1 +++ b/ddsenabler/examples/persistence/goals/1 @@ -1,3 +1,3 @@ { "order": 3 -} \ No newline at end of file +} diff --git a/ddsenabler/examples/persistence/goals/2 b/ddsenabler/examples/persistence/goals/2 index 461fa735..12762e95 100644 --- a/ddsenabler/examples/persistence/goals/2 +++ b/ddsenabler/examples/persistence/goals/2 @@ -1,3 +1,3 @@ { "order": 5 -} \ No newline at end of file +} diff --git a/ddsenabler/examples/persistence/goals/3 b/ddsenabler/examples/persistence/goals/3 index 853b8317..327d3eb8 100644 --- a/ddsenabler/examples/persistence/goals/3 +++ b/ddsenabler/examples/persistence/goals/3 @@ -1,3 +1,3 @@ { "order": 7 -} \ No newline at end of file +} diff --git a/ddsenabler/examples/persistence/requests/1 b/ddsenabler/examples/persistence/requests/1 index 0fbddba4..fa79c13a 100644 --- a/ddsenabler/examples/persistence/requests/1 +++ b/ddsenabler/examples/persistence/requests/1 @@ -1,4 +1,4 @@ { "a": 1, "b": 2 -} \ No newline at end of file +} diff --git a/ddsenabler/examples/persistence/requests/2 b/ddsenabler/examples/persistence/requests/2 index 9e5938e4..4f64570c 100644 --- a/ddsenabler/examples/persistence/requests/2 +++ b/ddsenabler/examples/persistence/requests/2 @@ -1,4 +1,4 @@ { "a": 2, "b": 3 -} \ No newline at end of file +} diff --git a/ddsenabler/examples/persistence/requests/3 b/ddsenabler/examples/persistence/requests/3 index fe99b20a..c5250e29 100644 --- a/ddsenabler/examples/persistence/requests/3 +++ b/ddsenabler/examples/persistence/requests/3 @@ -1,4 +1,4 @@ { "a": 3, "b": 4 -} \ No newline at end of file +} diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index d64c7df3..3966fb45 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -124,4 +124,4 @@ std::string make_send_goal_request_json(const std::string& goal_json, UUID& goal } // namespace ddsenabler } // namespace eprosima -std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid); \ No newline at end of file +std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid); From db7b56f131536e77f990989ec583a3fcf620811d Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 23 Jul 2025 14:18:51 +0200 Subject: [PATCH 16/87] DDSEnabler refactor request_id for thread safety Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 3 - ddsenabler/src/cpp/DDSEnabler.cpp | 66 +++++++++++-------- .../ddsenabler_participants/Handler.hpp | 11 +++- ddsenabler_participants/src/cpp/Handler.cpp | 28 ++++---- 4 files changed, 63 insertions(+), 45 deletions(-) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 68dda846..717e36ef 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -415,9 +415,6 @@ class DDSEnabler //! Mutex to protect class attributes mutable std::mutex mutex_; - - //! Request identifyer for sent requests (incremented by one after each request) - uint64_t sent_request_id_ = 0; }; } /* namespace ddsenabler */ diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index c21d221c..1f38578f 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -296,14 +296,13 @@ bool DDSEnabler::send_service_request( const std::string& json, uint64_t& request_id) { - sent_request_id_++; + request_id = handler_->get_new_request_id(); if (!enabler_participant_->publish_rpc( std::string(participants::REQUEST_PREFIX) + service_name + participants::REQUEST_SUFFIX, json, - sent_request_id_)) + request_id)) return false; - request_id = sent_request_id_; return true; } @@ -333,28 +332,32 @@ bool DDSEnabler::send_action_goal( UUID& action_id) { std::string goal_json = RpcUtils::make_send_goal_request_json(json, action_id); - uint64_t goal_request_id = 0; std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; + uint64_t goal_request_id = 0; - if (handler_->store_action_request( - action_name, - action_id, - sent_request_id_+1, - RpcUtils::ActionType::GOAL) - && - send_service_request( + if (!send_service_request( goal_request_topic, goal_json, goal_request_id)) { - return true; + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal request to action " << action_name); + return false; } - handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); + if (!handler_->store_action_request( + action_name, + action_id, + goal_request_id, + RpcUtils::ActionType::GOAL)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action goal request to action " << action_name); + handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); + return false; + } - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal to action " << action_name); - return false; + return true; } bool DDSEnabler::send_action_get_result_request( @@ -375,25 +378,30 @@ bool DDSEnabler::send_action_get_result_request( std::string get_result_request_topic = action_name + participants::ACTION_RESULT_SUFFIX; uint64_t get_result_request_id = 0; - if (handler_->store_action_request( - action_name, - action_id, - sent_request_id_+1, - RpcUtils::ActionType::RESULT) - && - send_service_request( + if (!send_service_request( get_result_request_topic, json, get_result_request_id)) { - return true; + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result request to action " << action_name); + return false; } - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action get result request to action " << action_name - << ": cancelling."); - cancel_action_goal(action_name, action_id, 0); - return false; + if (!handler_->store_action_request( + action_name, + action_id, + get_result_request_id, + RpcUtils::ActionType::RESULT)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action get result request to action " << action_name + << ": cancelling."); + cancel_action_goal(action_name, action_id, 0); + return false; + } + + return true; } bool DDSEnabler::cancel_action_goal( diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 5c7510a8..34192a32 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -389,6 +389,13 @@ class Handler : public ddspipe::participants::ISchemaHandler void set_send_action_get_result_reply_callback( std::function callback); + /** + * @brief Get a new request ID (incremented by one) for creating a service or action request. + * + * @return A new request ID. + */ + uint64_t get_new_request_id(); + protected: /** @@ -614,8 +621,8 @@ class Handler : public ddspipe::participants::ISchemaHandler //! Callback to request types from the user DdsTypeQuery type_query_callback_; - //! Counter of received requests - uint64_t received_requests_id_{0}; + //! Identifier for the received and sent requests + uint64_t requests_id_{0}; //! Map of all ActionRequestInfos to their UUIDs std::unordered_map action_request_id_to_uuid_; diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index b606be5f..9424f248 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -165,10 +165,10 @@ void Handler::add_data( // SERVICES case RpcUtils::RpcType::RPC_REQUEST: { - received_requests_id_++; + requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); - write_service_request_nts_(msg, dyn_type, received_requests_id_); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); + write_service_request_nts_(msg, dyn_type, requests_id_); break; } @@ -222,9 +222,9 @@ void Handler::add_data( case RpcUtils::RpcType::ACTION_GOAL_REQUEST: case RpcUtils::RpcType::ACTION_CANCEL_REQUEST: { - received_requests_id_++; + requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); UUID uuid; if (!writer_->uuid_from_request_json( msg, @@ -239,10 +239,10 @@ void Handler::add_data( if (store_action_request( rpc_name, uuid, - received_requests_id_, + requests_id_, RpcUtils::get_action_type(rpc_type))) { - write_action_request_nts_(msg, dyn_type, received_requests_id_); + write_action_request_nts_(msg, dyn_type, requests_id_); } break; @@ -261,13 +261,13 @@ void Handler::add_data( return; } - received_requests_id_++; + requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(received_requests_id_); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); if (!store_action_request( rpc_name, uuid, - received_requests_id_, + requests_id_, RpcUtils::ActionType::RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, @@ -284,7 +284,7 @@ void Handler::add_data( rpc_name, uuid, result, - received_requests_id_); + requests_id_); } } break; @@ -864,6 +864,12 @@ void Handler::set_send_action_get_result_reply_callback( send_action_get_result_reply_callback_ = callback; } +uint64_t Handler::get_new_request_id() +{ + std::lock_guard lock(mtx_); + return ++requests_id_; +} + } /* namespace participants */ } /* namespace ddsenabler */ } /* namespace eprosima */ From 02c0dbb3bc6a74bc2609d2b941422968b6a0d2d7 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 23 Jul 2025 15:37:02 +0200 Subject: [PATCH 17/87] DDSEnabler create json msgs refactor Signed-off-by: Eugenio Collado --- ddsenabler/src/cpp/DDSEnabler.cpp | 93 ++------------ .../ddsenabler_participants/Constants.hpp | 7 +- .../ddsenabler_participants/RpcUtils.hpp | 83 +++++++++++- .../src/cpp/EnablerParticipant.cpp | 4 +- ddsenabler_participants/src/cpp/RpcUtils.cpp | 119 ++++++++++++++++-- 5 files changed, 209 insertions(+), 97 deletions(-) diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 1f38578f..4e222be7 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -20,8 +20,6 @@ #include "ddsenabler/DDSEnabler.hpp" #include "ddsenabler_participants/RpcUtils.hpp" -#include - namespace eprosima { namespace ddsenabler { @@ -331,7 +329,7 @@ bool DDSEnabler::send_action_goal( const std::string& json, UUID& action_id) { - std::string goal_json = RpcUtils::make_send_goal_request_json(json, action_id); + std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; uint64_t goal_request_id = 0; @@ -364,16 +362,7 @@ bool DDSEnabler::send_action_get_result_request( const std::string& action_name, const UUID& action_id) { - std::string json = "{\"goal_id\": {\"uuid\": ["; - for (size_t i = 0; i < sizeof(action_id); ++i) - { - json += std::to_string(action_id[i]); - if (i != sizeof(action_id) - 1) - { - json += ", "; - } - } - json += "]}}"; + std::string json = participants::RpcUtils::create_result_request_msg(action_id); std::string get_result_request_topic = action_name + participants::ACTION_RESULT_SUFFIX; uint64_t get_result_request_id = 0; @@ -418,14 +407,7 @@ bool DDSEnabler::cancel_action_goal( return false; } - // Create JSON object - nlohmann::json j; - int64_t sec = timestamp / 1'000'000'000; - uint32_t nanosec = timestamp % 1'000'000'000; - j["goal_info"]["stamp"]["sec"] = static_cast(sec); - j["goal_info"]["stamp"]["nanosec"] = static_cast(nanosec); - j["goal_info"]["goal_id"]["uuid"] = goal_id; - std::string cancel_json = j.dump(4); + std::string cancel_json = participants::RpcUtils::create_cancel_request_msg(goal_id, timestamp); uint64_t cancel_request_id = 0; std::string cancel_request_topic = action_name + participants::ACTION_CANCEL_SUFFIX; @@ -460,18 +442,7 @@ void DDSEnabler::send_action_send_goal_reply( const uint64_t goal_id, bool accepted) { - // Get current time in seconds and nanoseconds - auto now = std::chrono::system_clock::now(); - auto duration_since_epoch = now.time_since_epoch(); - auto sec = std::chrono::duration_cast(duration_since_epoch).count(); - auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; - - // Create JSON object - nlohmann::json j; - j["accepted"] = accepted; - j["stamp"]["sec"] = static_cast(sec); - j["stamp"]["nanosec"] = static_cast(nanosec); - std::string reply_json = j.dump(4); + std::string reply_json = participants::RpcUtils::create_goal_reply_msg(accepted); if (!send_service_reply( action_name + participants::ACTION_GOAL_SUFFIX, @@ -491,31 +462,18 @@ bool DDSEnabler::send_action_cancel_goal_reply( const participants::CANCEL_CODE& cancel_code, const uint64_t request_id) { - // Create JSON object - nlohmann::json j; - j["return_code"] = cancel_code; - j["goals_canceling"] = nlohmann::json::array(); + std::vector> cancelling_goals; for (const auto& goal_id : goal_ids) { std::chrono::system_clock::time_point timestamp; if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) { - // EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - // "Not including goal " << goal_id << " in cancel reply for action " - // << action_name << ": goal id not found."); continue; } - nlohmann::json goal_json; - goal_json["goal_id"]["uuid"] = goal_id; - auto duration_since_epoch = timestamp.time_since_epoch(); - auto sec = std::chrono::duration_cast(duration_since_epoch).count(); - auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; - goal_json["stamp"]["sec"] = static_cast(sec); - goal_json["stamp"]["nanosec"] = static_cast(nanosec); - j["goals_canceling"].push_back(goal_json); + cancelling_goals.emplace_back(goal_id, timestamp); } - std::string reply_json = j.dump(4); + std::string reply_json = participants::RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); if (!send_service_reply( std::string(action_name) + participants::ACTION_CANCEL_SUFFIX, @@ -539,16 +497,12 @@ bool DDSEnabler::send_action_result( if (!handler_->is_UUID_active(action_name,goal_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action feedback to action " << action_name + "Failed to send action result to action " << action_name << ": goal id not found."); return false; } - // Create JSON object - nlohmann::json j; - j["status"] = status_code; - j["result"] = nlohmann::json::parse(json); - std::string reply_json = j.dump(4); + std::string reply_json = participants::RpcUtils::create_result_reply_msg(status_code, json); return handler_->handle_action_result(action_name, goal_id, reply_json); } @@ -586,12 +540,8 @@ bool DDSEnabler::send_action_feedback( return false; } - // Create JSON object - nlohmann::json j; - j["goal_id"]["uuid"] = goal_id; - j["feedback"] = nlohmann::json::parse(json); - std::string feedback_json = j.dump(4); - std::string feedback_topic = "rt/" + std::string(action_name) + "feedback"; + std::string feedback_json = participants::RpcUtils::create_feedback_msg(json, goal_id); + std::string feedback_topic = participants::TOPIC_PREFIX + std::string(action_name) + participants::ACTION_FEEDBACK_SUFFIX; return enabler_participant_->publish(feedback_topic, feedback_json); } @@ -610,25 +560,8 @@ bool DDSEnabler::update_action_status( return false; } - auto duration_since_epoch = goal_accepted_stamp.time_since_epoch(); - auto sec = std::chrono::duration_cast(duration_since_epoch).count(); - auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; - - nlohmann::json goal_info; - goal_info["goal_id"]["uuid"] = goal_id; - goal_info["stamp"]["sec"] = static_cast(sec); - goal_info["stamp"]["nanosec"] = static_cast(nanosec); - - - nlohmann::json goal_status; - goal_status["goal_info"] = goal_info; - goal_status["status"] = status_code; - - nlohmann::json j; - j["status_list"] = nlohmann::json::array({goal_status}); - - std::string status_json = j.dump(4); - std::string status_topic = "rt/" + action_name + "status"; + std::string status_json = participants::RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); + std::string status_topic = participants::TOPIC_PREFIX + action_name + participants::ACTION_STATUS_SUFFIX; return enabler_participant_->publish(status_topic, status_json); } diff --git a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp index 34ba2c43..119483c2 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp @@ -28,6 +28,9 @@ constexpr const char* QOS_SERIALIZATION_DURABILITY("durability"); constexpr const char* QOS_SERIALIZATION_OWNERSHIP("ownership"); constexpr const char* QOS_SERIALIZATION_KEYED("keyed"); +// Topic mangling +constexpr const char* TOPIC_PREFIX("rt/"); + // Service mangling constexpr const char* REQUEST_PREFIX("rq/"); constexpr const char* REQUEST_SUFFIX("Request"); @@ -38,8 +41,8 @@ constexpr const char* REPLY_SUFFIX("Reply"); constexpr const char* ACTION_GOAL_SUFFIX("send_goal"); constexpr const char* ACTION_RESULT_SUFFIX("get_result"); constexpr const char* ACTION_CANCEL_SUFFIX("cancel_goal"); -constexpr const char* ACTION_FEEDBACK_SUFFIX("/feedback"); -constexpr const char* ACTION_STATUS_SUFFIX("/status"); +constexpr const char* ACTION_FEEDBACK_SUFFIX("feedback"); +constexpr const char* ACTION_STATUS_SUFFIX("status"); } /* namespace participants */ } /* namespace ddsenabler */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index 3966fb45..5c0e9023 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -109,15 +109,96 @@ RpcType get_service_direction(RpcType rpc_type); */ ActionType get_action_type(RpcType rpc_type); +/** + * @brief Generates a UUID. + * + * @return A new UUID. + */ UUID generate_UUID(); +// ROS 2 ACTION MSGS /** * @brief Creates a JSON string for sending a goal request. * * @param goal_json The JSON string representing the goal (without the UUID part). * @return The JSON string for sending the goal request. */ -std::string make_send_goal_request_json(const std::string& goal_json, UUID& goal_id); +std::string create_goal_request_msg(const std::string& goal_json, UUID& goal_id); + +/** + * @brief Creates a JSON string for sending a goal reply. + * + * @param accepted Indicates whether the goal was accepted or not. + * @return A JSON string representing the goal reply. + */ +std::string create_goal_reply_msg( + bool accepted); + +/** + * @brief Creates a cancel message for an action. + * + * @param goal_id The UUID of the goal to cancel. + * @param timestamp The timestamp for canceling logic. + * @return A JSON string representing the cancel message. + */ +std::string create_cancel_request_msg( + const UUID& goal_id, + const int64_t timestamp); + +/** + * @brief Creates a cancel reply message for an action. + * + * @param cancelling_goals A vector of pairs containing the UUIDs of the goals to cancel and their timestamps. + * @param cancel_code The cancel code indicating the result of the cancellation. + * @return A JSON string representing the cancel reply message. + */ +std::string create_cancel_reply_msg( + std::vector> cancelling_goals, + const CANCEL_CODE& cancel_code); + +/** + * @brief Creates a result request message for an action. + * + * @param goal_id The UUID of the goal for which the result is being requested. + * @return A JSON string representing the result request message. + */ +std::string create_result_request_msg( + const UUID& goal_id); + +/** + * @brief Creates a result reply message for an action. + * + * @param status_code The status code of the action result. + * @param json The JSON string representing the result. + * @return A JSON string representing the result reply message. + */ +std::string create_result_reply_msg( + const STATUS_CODE& status_code, + const char* json); + +/** + * @brief Creates a feedback message for an action. + * + * @param json The JSON string representing the feedback. + * @param goal_id The UUID of the goal for which the feedback is being sent. + * @return A JSON string representing the feedback message. + */ +std::string create_feedback_msg( + const char* json, + const UUID& goal_id); + +/** + * @brief Creates a status message for an action. + * + * @param goal_id The UUID of the goal. + * @param status_code The status code of the action. + * @param goal_accepted_stamp The timestamp when the goal was accepted. + * @return A JSON string representing the status message. + */ +std::string create_status_msg( + const UUID& goal_id, + const STATUS_CODE& status_code, + std::chrono::system_clock::time_point goal_accepted_stamp); } // namespace RpcUtils } // namespace participants diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index d91ac73d..ae499e9f 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -729,7 +729,7 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(result_service_name, result_service); action.result = result_service; - std::string feedback_topic_name = "rt/" + action.action_name + "feedback"; + std::string feedback_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; DdsTopic feedback_topic; if(!fullfill_topic_type_nts_( feedback_topic_name, @@ -757,7 +757,7 @@ bool EnablerParticipant::query_action_nts_( action.feedback = feedback_topic; action.feedback_discovered = true; - std::string status_topic_name = "rt/" + action.action_name + "status"; + std::string status_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_STATUS_SUFFIX; DdsTopic status_topic; if(!fullfill_topic_type_nts_( status_topic_name, diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index df1810bf..6cb68b90 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -54,13 +54,13 @@ RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name) else { // Check for action feedback/status topics - if (rpc_name.size() >= 9 && rpc_name.substr(rpc_name.size() - 9) == ACTION_FEEDBACK_SUFFIX) + if (rpc_name.size() >= 9 && rpc_name.substr(rpc_name.size() - 9) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { rpc_name = rpc_name.substr(0, rpc_name.size() - 8); rpc_name = rpc_name.substr(3); return ACTION_FEEDBACK; } - else if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == ACTION_STATUS_SUFFIX) + else if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == (std::string("/") + ACTION_STATUS_SUFFIX)) { rpc_name = rpc_name.substr(0, rpc_name.size() - 6); rpc_name = rpc_name.substr(3); @@ -213,21 +213,116 @@ UUID generate_UUID() return uuid; } -std::string make_send_goal_request_json(const std::string& goal_json, UUID& goal_id) +std::string create_goal_request_msg(const std::string& goal_json, UUID& goal_id) { goal_id = generate_UUID(); - std::string json = "{\"goal_id\": {\"uuid\": ["; - for (size_t i = 0; i < sizeof(goal_id); ++i) + nlohmann::json j; + j["goal_id"]["uuid"] = goal_id; + j["goal"] = nlohmann::json::parse(goal_json); + return j.dump(4); +} + +std::string create_goal_reply_msg( + bool accepted) +{ + auto now = std::chrono::system_clock::now(); + auto duration_since_epoch = now.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + + nlohmann::json j; + j["accepted"] = accepted; + j["stamp"]["sec"] = static_cast(sec); + j["stamp"]["nanosec"] = static_cast(nanosec); + return j.dump(4); +} + +std::string create_cancel_request_msg( + const UUID& goal_id, + const int64_t timestamp) +{ + nlohmann::json j; + int64_t sec = timestamp / 1'000'000'000; + uint32_t nanosec = timestamp % 1'000'000'000; + j["goal_info"]["stamp"]["sec"] = static_cast(sec); + j["goal_info"]["stamp"]["nanosec"] = static_cast(nanosec); + j["goal_info"]["goal_id"]["uuid"] = goal_id; + return j.dump(4); +} + +std::string create_cancel_reply_msg( + std::vector> cancelling_goals, + const CANCEL_CODE& cancel_code) +{ + nlohmann::json j; + j["return_code"] = cancel_code; + j["goals_canceling"] = nlohmann::json::array(); + for (const auto& [goal_id, timestamp] : cancelling_goals) { - json += std::to_string(goal_id[i]); - if (i != sizeof(goal_id) - 1) - { - json += ", "; - } + nlohmann::json goal_json; + goal_json["goal_id"]["uuid"] = goal_id; + auto duration_since_epoch = timestamp.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + goal_json["stamp"]["sec"] = static_cast(sec); + goal_json["stamp"]["nanosec"] = static_cast(nanosec); + j["goals_canceling"].push_back(goal_json); } - json += "]}, \"goal\": " + goal_json + "}"; - return json; + return j.dump(4); +} + +std::string create_result_request_msg( + const UUID& goal_id) +{ + nlohmann::json j; + j["goal_id"]["uuid"] = goal_id; + return j.dump(4); +} + +std::string create_result_reply_msg( + const STATUS_CODE& status_code, + const char* json) +{ + nlohmann::json j; + j["status"] = status_code; + j["result"] = nlohmann::json::parse(json); + return j.dump(4); +} + +std::string create_status_msg( + const UUID& goal_id, + const STATUS_CODE& status_code, + std::chrono::system_clock::time_point goal_accepted_stamp) +{ + auto duration_since_epoch = goal_accepted_stamp.time_since_epoch(); + auto sec = std::chrono::duration_cast(duration_since_epoch).count(); + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + + nlohmann::json goal_info; + goal_info["goal_id"]["uuid"] = goal_id; + goal_info["stamp"]["sec"] = static_cast(sec); + goal_info["stamp"]["nanosec"] = static_cast(nanosec); + + + nlohmann::json goal_status; + goal_status["goal_info"] = goal_info; + goal_status["status"] = status_code; + + nlohmann::json j; + j["status_list"] = nlohmann::json::array({goal_status}); + + return j.dump(4); +} + +std::string create_feedback_msg( + const char* json, + const UUID& goal_id) +{ + nlohmann::json j; + j["goal_id"]["uuid"] = goal_id; + j["feedback"] = nlohmann::json::parse(json); + return j.dump(4); } } // namespace RpcUtils From 96a2e2cee53eeda8a65710b06184e6f7d8f2a4f6 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 23 Jul 2025 16:31:27 +0200 Subject: [PATCH 18/87] Enabler participants minor suggestions Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 6 ++--- .../src/cpp/EnablerParticipant.cpp | 27 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index a089b8d0..208a436c 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -64,9 +64,9 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool publish_rpc( - const std::string& topic_name, + const std::string& topic_name, const std::string& json, - const uint64_t request_id); + const uint64_t& request_id); DDSENABLER_PARTICIPANTS_DllAPI void set_topic_query_callback( @@ -128,7 +128,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant std::shared_ptr service, std::unique_lock& lck); - bool fullfill_topic_type_nts_( + bool fill_topic_struct_nts_( const std::string& topic_name, const std::string _type_name, const std::string serialized_qos_content, diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index ae499e9f..35a27785 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -182,11 +182,10 @@ bool EnablerParticipant::publish( std::unique_lock lck(mtx_); std::string type_name; - auto i_reader = std::dynamic_pointer_cast(lookup_reader_nts_(topic_name, type_name)); + auto i_reader = lookup_reader_nts_(topic_name, type_name); if (nullptr == i_reader) { - DdsTopic topic; if(!query_topic_nts_(topic_name, topic)) { @@ -229,7 +228,7 @@ bool EnablerParticipant::publish( bool EnablerParticipant::publish_rpc( const std::string& topic_name, const std::string& json, - const uint64_t request_id) + const uint64_t& request_id) { std::unique_lock lck(mtx_); @@ -306,7 +305,7 @@ bool EnablerParticipant::create_service_request_writer_nts_( std::unique_lock& lck) { std::string _; - auto reader = std::dynamic_pointer_cast(lookup_reader_nts_(service->topic_request.m_topic_name, _)); + auto reader = lookup_reader_nts_(service->topic_request.m_topic_name, _); if (nullptr == reader) { @@ -320,10 +319,11 @@ bool EnablerParticipant::create_service_request_writer_nts_( service->endpoint_request = request_edp; return true; } + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create service request writer for service " << service->service_name << "."); return false; } - // TODO What if there is a server already running in ROS2, currently the announce will fail EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to create server as it is already running in ROS2."); return false; @@ -480,7 +480,6 @@ bool EnablerParticipant::query_topic_nts_( const std::string& topic_name, DdsTopic& topic) { - if (!topic_query_callback_) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -497,10 +496,10 @@ bool EnablerParticipant::query_topic_nts_( return false; } - return fullfill_topic_type_nts_(topic_name, type_name, serialized_qos, topic); + return fill_topic_struct_nts_(topic_name, type_name, serialized_qos, topic); } -bool EnablerParticipant::fullfill_topic_type_nts_( +bool EnablerParticipant::fill_topic_struct_nts_( const std::string& topic_name, const std::string type_name, const std::string serialized_qos, @@ -549,13 +548,13 @@ bool EnablerParticipant::fullfill_service_type_nts_( DdsTopic topic_request; std::string topic_request_name = std::string(REQUEST_PREFIX) + service->service_name + REQUEST_SUFFIX; - if(!fullfill_topic_type_nts_(topic_request_name, _request_type_name, serialized_request_qos_content, topic_request)) + if(!fill_topic_struct_nts_(topic_request_name, _request_type_name, serialized_request_qos_content, topic_request)) return false; service->add_topic(topic_request, RpcUtils::RPC_REQUEST); DdsTopic topic_reply; std::string topic_reply_name = std::string(REPLY_PREFIX) + service->service_name + REPLY_SUFFIX; - if(!fullfill_topic_type_nts_(topic_reply_name, _reply_type_name, serialized_reply_qos_content, topic_reply)) + if(!fill_topic_struct_nts_(topic_reply_name, _reply_type_name, serialized_reply_qos_content, topic_reply)) return false; service->add_topic(topic_reply, RpcUtils::RPC_REPLY); @@ -731,7 +730,7 @@ bool EnablerParticipant::query_action_nts_( std::string feedback_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; DdsTopic feedback_topic; - if(!fullfill_topic_type_nts_( + if(!fill_topic_struct_nts_( feedback_topic_name, feedback_action_type, feedback_action_serialized_qos, @@ -743,7 +742,7 @@ bool EnablerParticipant::query_action_nts_( } { std::string _; - auto feedback_reader = std::dynamic_pointer_cast(lookup_reader_nts_(feedback_topic_name, _)); + auto feedback_reader = lookup_reader_nts_(feedback_topic_name, _); if (!feedback_reader) { ddspipe::core::types::Endpoint _; @@ -759,7 +758,7 @@ bool EnablerParticipant::query_action_nts_( std::string status_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_STATUS_SUFFIX; DdsTopic status_topic; - if(!fullfill_topic_type_nts_( + if(!fill_topic_struct_nts_( status_topic_name, status_action_type, status_action_serialized_qos, @@ -771,7 +770,7 @@ bool EnablerParticipant::query_action_nts_( } { std::string _; - auto status_reader = std::dynamic_pointer_cast(lookup_reader_nts_(action.status.m_topic_name, _)); + auto status_reader = lookup_reader_nts_(action.status.m_topic_name, _); if (!status_reader) { ddspipe::core::types::Endpoint _; From 575d7f5a33807d21135f0e90244a84c5203fbc53 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 28 Jul 2025 08:40:17 +0200 Subject: [PATCH 19/87] Namespace whitespace Signed-off-by: Eugenio Collado --- .../include/ddsenabler_participants/RpcUtils.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index 5c0e9023..acdabd55 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -25,11 +25,10 @@ #include #include - - namespace eprosima { - namespace ddsenabler { - namespace participants { - namespace RpcUtils { +namespace eprosima { +namespace ddsenabler { +namespace participants { +namespace RpcUtils { struct RpcAction { From 4770b707301bbfd00e265dccecc6223f9ac1ec82 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 28 Jul 2025 08:41:28 +0200 Subject: [PATCH 20/87] Query log msg Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 35a27785..2e7e4891 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -189,6 +189,8 @@ bool EnablerParticipant::publish( DdsTopic topic; if(!query_topic_nts_(topic_name, topic)) { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name); return false; } @@ -483,8 +485,8 @@ bool EnablerParticipant::query_topic_nts_( if (!topic_query_callback_) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << - " : topic is unknown and topic request callback not set."); + "Failed to query data from topic " << topic_name << + " : topic is unknown and topic query callback not set."); return false; } std::string type_name; @@ -492,7 +494,7 @@ bool EnablerParticipant::query_topic_nts_( if (!topic_query_callback_(topic_name.c_str(), type_name, serialized_qos)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name << " : topic query callback failed."); + "Failed to query data from topic " << topic_name << " : topic query callback failed."); return false; } From 658bcb204bfb551a27862e046f075bec09156aca Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 28 Jul 2025 09:41:43 +0200 Subject: [PATCH 21/87] Use lookup_reader_nts_ overloaded Signed-off-by: Eugenio Collado --- .../src/cpp/EnablerParticipant.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 2e7e4891..ddc22b3a 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -306,8 +306,7 @@ bool EnablerParticipant::create_service_request_writer_nts_( std::shared_ptr service, std::unique_lock& lck) { - std::string _; - auto reader = lookup_reader_nts_(service->topic_request.m_topic_name, _); + auto reader = lookup_reader_nts_(service->topic_request.m_topic_name); if (nullptr == reader) { @@ -743,8 +742,7 @@ bool EnablerParticipant::query_action_nts_( return false; } { - std::string _; - auto feedback_reader = lookup_reader_nts_(feedback_topic_name, _); + auto feedback_reader = lookup_reader_nts_(feedback_topic_name); if (!feedback_reader) { ddspipe::core::types::Endpoint _; @@ -770,9 +768,8 @@ bool EnablerParticipant::query_action_nts_( "Failed to announce action " << action.action_name << " : status topic type not found."); return false; } - { - std::string _; - auto status_reader = lookup_reader_nts_(action.status.m_topic_name, _); + { + auto status_reader = lookup_reader_nts_(action.status.m_topic_name); if (!status_reader) { ddspipe::core::types::Endpoint _; From 090b2ac0bc16662f510d1ed60587b7ba7dbb63c0 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 28 Jul 2025 10:15:58 +0200 Subject: [PATCH 22/87] Rpc name & Type name passed as argument to writer Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/Handler.hpp | 25 ++++-- .../ddsenabler_participants/Writer.hpp | 25 ++++-- ddsenabler_participants/src/cpp/Handler.cpp | 85 ++++++++++--------- ddsenabler_participants/src/cpp/Writer.cpp | 84 ++++++------------ 4 files changed, 105 insertions(+), 114 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 34192a32..533f5512 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -500,7 +500,8 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_service_reply_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& service_name); /** * @brief Write the service request to user's app. @@ -512,7 +513,8 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_service_request_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& service_name); /** * @brief Write the action result to user's app. @@ -524,7 +526,8 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_action_result_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id); + const UUID& action_id, + const std::string& action_name); /** * @brief Write the action feedback to user's app. @@ -534,7 +537,8 @@ class Handler : public ddspipe::participants::ISchemaHandler */ void write_action_feedback_nts_( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type); + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name); /** * @brief Write the action goal reply to user's app. @@ -546,7 +550,8 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_action_goal_reply_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id); + const UUID& action_id, + const std::string& action_name); /** * @brief Write the action cancel reply to user's app. @@ -558,7 +563,8 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_action_cancel_reply_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& action_name); /** * @brief Write the action status to user's app. @@ -568,7 +574,8 @@ class Handler : public ddspipe::participants::ISchemaHandler */ void write_action_status_nts_( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type); + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name); /** * @brief Write the action (goal or cancel) request to user's app. @@ -580,7 +587,9 @@ class Handler : public ddspipe::participants::ISchemaHandler void write_action_request_nts_( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& action_name, + const RpcUtils::RpcType& rpc_type); /** * @brief Register a type using the given serialized type data. diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index 1d2b6dd1..d77b80f0 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -177,13 +177,15 @@ class Writer void write_service_reply_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI void write_service_request_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_notification( @@ -193,35 +195,42 @@ class Writer void write_action_result_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id); + const UUID& action_id, + const std::string& action_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_feedback_notification( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type); + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_goal_reply_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id); + const UUID& action_id, + const std::string& action_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_cancel_reply_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& action_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_status_notification( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type); + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name); DDSENABLER_PARTICIPANTS_DllAPI void write_action_request_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id); + const uint64_t request_id, + const std::string& action_name, + const RpcUtils::RpcType& rpc_type); DDSENABLER_PARTICIPANTS_DllAPI void set_is_UUID_active_callback( diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 9424f248..9c58f752 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -168,14 +168,14 @@ void Handler::add_data( requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); - write_service_request_nts_(msg, dyn_type, requests_id_); + write_service_request_nts_(msg, dyn_type, requests_id_, rpc_name); break; } case RpcUtils::RpcType::RPC_REPLY: { auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - write_service_reply_nts_(msg, dyn_type, request_id); + write_service_reply_nts_(msg, dyn_type, request_id, rpc_name); break; } @@ -185,7 +185,7 @@ void Handler::add_data( auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; if (get_action_request_UUID(action_id, RpcUtils::ActionType::RESULT, action_id_uuid)) - write_action_result_nts_(msg, dyn_type, action_id_uuid); + write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_name); erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); break; } @@ -195,26 +195,26 @@ void Handler::add_data( auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; if (get_action_request_UUID(action_id, RpcUtils::ActionType::GOAL, action_id_uuid)) - write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid); + write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_name); break; } case RpcUtils::RpcType::ACTION_CANCEL_REPLY: { auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - write_action_cancel_reply_nts_(msg, dyn_type, request_id); + write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_name); break; } case RpcUtils::RpcType::ACTION_FEEDBACK: { - write_action_feedback_nts_(msg, dyn_type); + write_action_feedback_nts_(msg, dyn_type, rpc_name); break; } case RpcUtils::RpcType::ACTION_STATUS: { - write_action_status_nts_(msg, dyn_type); + write_action_status_nts_(msg, dyn_type, rpc_name); break; } @@ -242,7 +242,7 @@ void Handler::add_data( requests_id_, RpcUtils::get_action_type(rpc_type))) { - write_action_request_nts_(msg, dyn_type, requests_id_); + write_action_request_nts_(msg, dyn_type, requests_id_, rpc_name, rpc_type); } break; @@ -490,19 +490,21 @@ void Handler::write_service_nts_( } void Handler::write_service_reply_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id, + const std::string& service_name) { - writer_->write_service_reply_notification(msg, dyn_type, request_id); + writer_->write_service_reply_notification(msg, dyn_type, request_id, service_name); } void Handler::write_service_request_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id, + const std::string& service_name) { - writer_->write_service_request_notification(msg, dyn_type, request_id); + writer_->write_service_request_notification(msg, dyn_type, request_id, service_name); } void Handler::write_action_nts_( @@ -512,49 +514,56 @@ void Handler::write_action_nts_( } void Handler::write_action_result_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id, + const std::string& action_name) { - writer_->write_action_result_notification(msg, dyn_type, action_id); + writer_->write_action_result_notification(msg, dyn_type, action_id, action_name); } void Handler::write_action_feedback_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name) { - writer_->write_action_feedback_notification(msg, dyn_type); + writer_->write_action_feedback_notification(msg, dyn_type, action_name); } void Handler::write_action_goal_reply_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id, + const std::string& action_name) { - writer_->write_action_goal_reply_notification(msg, dyn_type, action_id); + writer_->write_action_goal_reply_notification(msg, dyn_type, action_id, action_name); } void Handler::write_action_cancel_reply_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id, + const std::string& action_name) { - writer_->write_action_cancel_reply_notification(msg, dyn_type, request_id); + writer_->write_action_cancel_reply_notification(msg, dyn_type, request_id, action_name); } void Handler::write_action_status_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name) { - writer_->write_action_status_notification(msg, dyn_type); + writer_->write_action_status_notification(msg, dyn_type, action_name); } void Handler::write_action_request_nts_( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id, + const std::string& action_name, + const RpcUtils::RpcType& rpc_type) { - writer_->write_action_request_notification(msg, dyn_type, request_id); + writer_->write_action_request_notification(msg, dyn_type, request_id, action_name, rpc_type); } bool Handler::register_type_nts_( diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index f7eb9b55..cb8c96ff 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include @@ -211,7 +210,8 @@ void Writer::write_service_notification( void Writer::write_service_reply_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const uint64_t request_id, + const std::string& service_name) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -219,15 +219,6 @@ void Writer::write_service_reply_notification( return; } - // Get the service name - std::string service_name; - if(RpcUtils::RpcType::RPC_REPLY != RpcUtils::get_rpc_name(msg.topic.topic_name(), service_name)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, - "Wrong topic name for service reply: " << msg.topic.topic_name() << "."); - return; - } - //STORE DATA if (service_reply_notification_callback_) { @@ -243,7 +234,8 @@ void Writer::write_service_reply_notification( void Writer::write_service_request_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const uint64_t request_id, + const std::string& service_name) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -251,15 +243,6 @@ void Writer::write_service_request_notification( return; } - // Get the service name - std::string service_name; - if(RpcUtils::RpcType::RPC_REQUEST != RpcUtils::get_rpc_name(msg.topic.topic_name(), service_name)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, - "Wrong topic name for service request: " << msg.topic.topic_name() << "."); - return; - } - //STORE DATA if (service_request_notification_callback_) { @@ -314,7 +297,8 @@ void Writer::write_action_notification( void Writer::write_action_result_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id) + const UUID& action_id, + const std::string& action_name) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -322,15 +306,6 @@ void Writer::write_action_result_notification( return; } - // Get the action name - std::string action_name; - if(RpcUtils::RpcType::ACTION_RESULT_REPLY != RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, - "Wrong topic name for action result: " << msg.topic.topic_name() << "."); - return; - } - //STORE DATA if (action_result_notification_callback_) { @@ -345,7 +320,8 @@ void Writer::write_action_result_notification( void Writer::write_action_feedback_notification( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type) + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -353,10 +329,6 @@ void Writer::write_action_feedback_notification( return; } - // Get the action name - std::string action_name; - RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); - std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; if (action_feedback_notification_callback_) @@ -371,13 +343,11 @@ void Writer::write_action_feedback_notification( } void Writer::write_action_goal_reply_notification( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const UUID& action_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const UUID& action_id, + const std::string& action_name) { - std::string action_name; - RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); - nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) { @@ -439,11 +409,10 @@ void Writer::write_action_goal_reply_notification( void Writer::write_action_cancel_reply_notification( const Message& msg, const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const uint64_t request_id, + const std::string& action_name) { ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCELED; - std::string action_name; - RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -521,7 +490,8 @@ void Writer::write_action_cancel_reply_notification( void Writer::write_action_status_notification( const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type) + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const std::string& action_name) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -529,10 +499,6 @@ void Writer::write_action_status_notification( return; } - // Get the action name - std::string action_name; - RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); - std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; @@ -613,9 +579,11 @@ void Writer::write_action_status_notification( } void Writer::write_action_request_notification( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - const uint64_t request_id) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + const uint64_t request_id, + const std::string& action_name, + const RpcUtils::RpcType& rpc_type) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -623,10 +591,6 @@ void Writer::write_action_request_notification( return; } - // Get the action name - std::string action_name; - RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(msg.topic.topic_name(), action_name); - std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; try @@ -677,9 +641,9 @@ void Writer::write_action_request_notification( } bool Writer::uuid_from_request_json( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - UUID& uuid) + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + UUID& uuid) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) From 5284a177f06336bc0528951d8874a347afecbabd Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 1 Aug 2025 17:23:58 +0200 Subject: [PATCH 23/87] Refactor API params grouped Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 104 ++++------- ddsenabler/examples/publish/main.cpp | 16 +- ddsenabler/examples/service/main.cpp | 32 ++-- ddsenabler/test/DDSEnablerTester.hpp | 6 +- .../test/ddsEnablerTests/ReloadConfig.cpp | 7 +- .../ddsenabler_participants/Callbacks.hpp | 171 +++++++++--------- .../EnablerParticipant.hpp | 8 +- .../src/cpp/EnablerParticipant.cpp | 89 +++------ ddsenabler_participants/src/cpp/Writer.cpp | 46 +++-- .../test/DdsEnablerParticipantsTest.cpp | 3 +- 10 files changed, 189 insertions(+), 293 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 1a9a8154..cc2d3b9d 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -120,16 +120,14 @@ static void test_data_notification_callback( // Static topic notification callback static void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { } // Static type query callback static bool test_topic_query_callback( const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + eprosima::ddsenabler::participants::TopicInfo& topic_info) { return false; } @@ -137,22 +135,7 @@ static bool test_topic_query_callback( // Static action notification callback static void test_action_notification_callback( const char* action_name, - const char* goal_request_action_type, - const char* goal_reply_action_type, - const char* cancel_request_action_type, - const char* cancel_reply_action_type, - const char* result_request_action_type, - const char* result_reply_action_type, - const char* feedback_action_type, - const char* status_action_type, - const char* goal_request_action_serialized_qos, - const char* goal_reply_action_serialized_qos, - const char* cancel_request_action_serialized_qos, - const char* cancel_reply_action_serialized_qos, - const char* result_request_action_serialized_qos, - const char* result_reply_action_serialized_qos, - const char* feedback_action_serialized_qos, - const char* status_action_serialized_qos) + const eprosima::ddsenabler::participants::ActionInfo& action_info) { std::lock_guard lock(app_mutex_); if (config.action_name == std::string(action_name)) @@ -168,22 +151,22 @@ static void test_action_notification_callback( utils::save_action_to_file( action_file, action_name, - goal_request_action_type, - goal_reply_action_type, - cancel_request_action_type, - cancel_reply_action_type, - result_request_action_type, - result_reply_action_type, - feedback_action_type, - status_action_type, - goal_request_action_serialized_qos, - goal_reply_action_serialized_qos, - cancel_request_action_serialized_qos, - cancel_reply_action_serialized_qos, - result_request_action_serialized_qos, - result_reply_action_serialized_qos, - feedback_action_serialized_qos, - status_action_serialized_qos); + action_info.goal.request.type_name.c_str(), + action_info.goal.reply.type_name.c_str(), + action_info.cancel.request.type_name.c_str(), + action_info.cancel.reply.type_name.c_str(), + action_info.result.request.type_name.c_str(), + action_info.result.reply.type_name.c_str(), + action_info.feedback.type_name.c_str(), + action_info.status.type_name.c_str(), + action_info.goal.request.serialized_qos.c_str(), + action_info.goal.reply.serialized_qos.c_str(), + action_info.cancel.request.serialized_qos.c_str(), + action_info.cancel.reply.serialized_qos.c_str(), + action_info.result.request.serialized_qos.c_str(), + action_info.result.reply.serialized_qos.c_str(), + action_info.feedback.serialized_qos.c_str(), + action_info.status.serialized_qos.c_str()); action_discovered_ = true; app_cv_.notify_all(); @@ -198,22 +181,7 @@ static void test_action_notification_callback( // Static action query callback static bool test_action_query_callback( const char* action_name, - std::string& goal_request_action_type, - std::string& goal_reply_action_type, - std::string& cancel_request_action_type, - std::string& cancel_reply_action_type, - std::string& result_request_action_type, - std::string& result_reply_action_type, - std::string& feedback_action_type, - std::string& status_action_type, - std::string& goal_request_action_serialized_qos, - std::string& goal_reply_action_serialized_qos, - std::string& cancel_request_action_serialized_qos, - std::string& cancel_reply_action_serialized_qos, - std::string& result_request_action_serialized_qos, - std::string& result_reply_action_serialized_qos, - std::string& feedback_action_serialized_qos, - std::string& status_action_serialized_qos) + eprosima::ddsenabler::participants::ActionInfo& action_info) { std::lock_guard lock(app_mutex_); if (config.action_name == std::string(action_name)) @@ -229,22 +197,22 @@ static bool test_action_query_callback( if (!utils::load_action_from_file( action_file, action_name, - goal_request_action_type, - goal_reply_action_type, - cancel_request_action_type, - cancel_reply_action_type, - result_request_action_type, - result_reply_action_type, - feedback_action_type, - status_action_type, - goal_request_action_serialized_qos, - goal_reply_action_serialized_qos, - cancel_request_action_serialized_qos, - cancel_reply_action_serialized_qos, - result_request_action_serialized_qos, - result_reply_action_serialized_qos, - feedback_action_serialized_qos, - status_action_serialized_qos)) + action_info.goal.request.type_name, + action_info.goal.reply.type_name, + action_info.cancel.request.type_name, + action_info.cancel.reply.type_name, + action_info.result.request.type_name, + action_info.result.reply.type_name, + action_info.feedback.type_name, + action_info.status.type_name, + action_info.goal.request.serialized_qos, + action_info.goal.reply.serialized_qos, + action_info.cancel.request.serialized_qos, + action_info.cancel.reply.serialized_qos, + action_info.result.request.serialized_qos, + action_info.result.reply.serialized_qos, + action_info.feedback.serialized_qos, + action_info.status.serialized_qos)) { std::cerr << "Failed to load action: " << action_name << std::endl; return false; diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index 4ff1b79c..0b17600b 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -125,19 +125,18 @@ static bool test_type_query_callback( // Static topic notification callback static void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { bool notify = false; { std::lock_guard lock(app_mutex_); notify = ++received_topics_ >= config.expected_topics; - std::cout << "Topic callback received: " << topic_name << " of type " << type_name << ", Total topics: " << - received_topics_ << std::endl << serialized_qos << std::endl << std::endl; + std::cout << "Topic callback received: " << topic_name << " of type " << topic_info.type_name << ", Total topics: " << + received_topics_ << std::endl << topic_info.serialized_qos << std::endl << std::endl; if (!config.persistence_path.empty() && !utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, - type_name, serialized_qos)) + topic_info.type_name.c_str(), topic_info.serialized_qos.c_str())) { std::cerr << "Failed to save topic: " << topic_name << std::endl; } @@ -151,8 +150,7 @@ static void test_topic_notification_callback( // Static type query callback static bool test_topic_query_callback( const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + eprosima::ddsenabler::participants::TopicInfo& topic_info) { if (config.persistence_path.empty()) { @@ -162,8 +160,8 @@ static bool test_topic_query_callback( // Load the topic from file if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, - type_name, - serialized_qos)) + topic_info.type_name, + topic_info.serialized_qos)) { std::cerr << "Failed to load topic: " << topic_name << std::endl; return false; diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 5875683b..5d729186 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -120,16 +120,14 @@ static void test_data_notification_callback( // Static topic notification callback static void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { } // Static type query callback static bool test_topic_query_callback( const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + eprosima::ddsenabler::participants::TopicInfo& topic_info) { return false; } @@ -137,10 +135,7 @@ static bool test_topic_query_callback( // Static service notification callback static void test_service_notification_callback( const char* service_name, - const char* request_type_name, - const char* reply_type_name, - const char* request_serialized_qos, - const char* reply_serialized_qos) + const eprosima::ddsenabler::participants::ServiceInfo& service_info) { std::lock_guard lock(app_mutex_); if (config.service_name == std::string(service_name)) @@ -155,10 +150,10 @@ static void test_service_notification_callback( utils::save_service_to_file( service_file, service_name, - request_type_name, - reply_type_name, - request_serialized_qos, - reply_serialized_qos); + service_info.request.type_name.c_str(), + service_info.reply.type_name.c_str(), + service_info.request.serialized_qos.c_str(), + service_info.reply.serialized_qos.c_str()); service_discovered_ = true; app_cv_.notify_all(); @@ -173,10 +168,7 @@ static void test_service_notification_callback( // Static service query callback static bool test_service_query_callback( const char* service_name, - std::string& request_type_name, - std::string& request_serialized_qos, - std::string& reply_type_name, - std::string& reply_serialized_qos) + eprosima::ddsenabler::participants::ServiceInfo& service_info) { std::lock_guard lock(app_mutex_); @@ -197,10 +189,10 @@ static bool test_service_query_callback( if (utils::load_service_from_file( service_file, service_name, - request_type_name, - reply_type_name, - request_serialized_qos, - reply_serialized_qos)) + service_info.request.type_name, + service_info.reply.type_name, + service_info.request.serialized_qos, + service_info.reply.serialized_qos)) { app_cv_.notify_all(); return true; diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 9b20fcd7..400a2003 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -299,8 +299,7 @@ class DDSEnablerTester : public ::testing::Test // eprosima::ddsenabler::participants::DdsTopicNotification topic_notification static void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { if (current_test_instance_) { @@ -315,8 +314,7 @@ class DDSEnablerTester : public ::testing::Test // eprosima::ddsenabler::participants::DdsTopicQuery topic_query; static bool test_topic_query_callback( const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + eprosima::ddsenabler::participants::TopicInfo& topic_info) { return false; } diff --git a/ddsenabler/test/ddsEnablerTests/ReloadConfig.cpp b/ddsenabler/test/ddsEnablerTests/ReloadConfig.cpp index e41581d9..1b6afb2e 100644 --- a/ddsenabler/test/ddsEnablerTests/ReloadConfig.cpp +++ b/ddsenabler/test/ddsEnablerTests/ReloadConfig.cpp @@ -16,6 +16,7 @@ #include #include "dds_enabler_runner.hpp" +#include "ddsenabler_participants/Callbacks.hpp" #include #include @@ -47,16 +48,14 @@ void test_type_notification_callback( // eprosima::ddsenabler::participants::DdsTopicNotification topic_notification; void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { } // eprosima::ddsenabler::participants::DdsTopicQuery topic_query; bool test_topic_query_callback( const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + eprosima::ddsenabler::participants::TopicInfo& topic_info) { return false; } diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index 54cc6024..bfa1b22f 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -28,6 +28,77 @@ namespace eprosima { namespace ddsenabler { namespace participants { +/** + * @brief Struct that contains information about a DDS topic. + * + * This struct is used to encapsulate the type name and serialized QoS of a DDS topic. + */ +struct TopicInfo +{ + TopicInfo() = default; + + TopicInfo ( + const std::string& _type_name, + const std::string& _serialized_qos) + : type_name(_type_name) + , serialized_qos(_serialized_qos) + { + } + + std::string type_name; + std::string serialized_qos; +}; + +/** + * @brief Struct that contains information about a DDS service. + * + * This struct is used to encapsulate the request and reply topics of a DDS service. + */ +struct ServiceInfo +{ + ServiceInfo() = default; + + ServiceInfo( + const TopicInfo& _request, + const TopicInfo& _reply) + : request(_request) + , reply(_reply) + { + } + TopicInfo request; + TopicInfo reply; +}; + +/** + * @brief Struct that contains information about a DDS action. + * + * This struct is used to encapsulate the goal, result and cancel services as well as the feedback and status topics of a DDS action. + */ +struct ActionInfo +{ + ActionInfo() = default; + + ActionInfo( + const ServiceInfo& _goal, + const ServiceInfo& _result, + const ServiceInfo& _cancel, + const TopicInfo& _feedback, + const TopicInfo& _status) + : goal(_goal) + , result(_result) + , cancel(_cancel) + , feedback(_feedback) + , status(_status) + { + } + + ServiceInfo goal; + ServiceInfo result; + ServiceInfo cancel; + TopicInfo feedback; + TopicInfo status; +}; + /** * DdsLogFunc - callback executed when consuming log messages * @@ -64,13 +135,11 @@ typedef void (* DdsTypeNotification)( * DdsTopicNotification - callback for notifying the reception of DDS topics * * @param [in] topic_name Name of the received topic - * @param [in] type_name Name of the type associated with the topic - * @param [in] serialized_qos Serialized Quality of Service (QoS) of the topic + * @param [in] topic_info Information about the topic, including type name and serialized QoS */ typedef void (* DdsTopicNotification)( const char* topic_name, - const char* type_name, - const char* serialized_qos); + const TopicInfo& topic_info); /** * DdsDataNotification - callback for notifying the reception of DDS data @@ -101,14 +170,12 @@ typedef bool (* DdsTypeQuery)( * DdsTopicQuery - callback for requesting information (type and QoS) of a DDS topic * * @param [in] topic_name Name of the topic to query - * @param [out] type_name Name of the type associated with the topic - * @param [out] serialized_qos Serialized Quality of Service (QoS) of the topic + * @param [out] topic_info Information about the topic, including type name and serialized QoS * @return \c true if the topic was found and the information was retrieved successfully, \c false otherwise */ typedef bool (* DdsTopicQuery)( const char* topic_name, - std::string& type_name, - std::string& serialized_qos); + TopicInfo& topic_info); /**********************/ /* SERVICES */ @@ -121,17 +188,11 @@ typedef bool (* DdsTopicQuery)( * This callback is used to notify the discovery of a service and its associated request and reply types. * * @param [in] service_name The name of the service that was discovered. - * @param [in] request_type_name The name of the request type associated with the service. - * @param [in] reply_type_name The name of the reply type associated with the service. - * @param [in] request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. - * @param [in] reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + * @param [in] service_info Information about the service, including request and reply types and their serialized QoS. */ typedef void (* ServiceNotification)( const char* service_name, - const char* request_type_name, - const char* reply_type_name, - const char* request_serialized_qos, - const char* reply_serialized_qos); + const ServiceInfo& service_info); /** * @brief Callback for reception of service request data. @@ -173,18 +234,12 @@ typedef void (* ServiceReplyNotification)( * This callback is used to request the type information for a service's request and reply. * * @param [in] service_name The name of the service for which the type information is requested. - * @param [out] request_type_name The name of the request type associated with the service. - * @param [out] request_serialized_qos The serialized Quality of Service (QoS) settings for the request type. - * @param [out] reply_type_name The name of the reply type associated with the service. - * @param [out] reply_serialized_qos The serialized Quality of Service (QoS) settings for the reply type. + * @param [out] service_info Information about the service, including request and reply types and their serialized QoS. * @return \c true if the service was found and the type information was retrieved successfully, \c false otherwise. */ typedef bool (* ServiceQuery)( const char* service_name, - std::string& request_type_name, - std::string& request_serialized_qos, - std::string& reply_type_name, - std::string& reply_serialized_qos); + ServiceInfo& service_info); /**********************/ @@ -198,41 +253,11 @@ typedef void (* ServiceReplyNotification)( * This callback is used to notify the discovery of an action and its associated types. * * @param [in] action_name The name of the action that was discovered. - * @param [in] goal_request_action_type The type of the goal request action. - * @param [in] goal_reply_action_type The type of the goal reply action. - * @param [in] cancel_request_action_type The type of the cancel request action. - * @param [in] cancel_reply_action_type The type of the cancel reply action. - * @param [in] result_request_action_type The type of the get result request action. - * @param [in] result_reply_action_type The type of the get result reply action. - * @param [in] feedback_action_type The type of the feedback action. - * @param [in] status_action_type The type of the status action. - * @param [in] goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. - * @param [in] goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. - * @param [in] cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. - * @param [in] cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. - * @param [in] result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. - * @param [in] result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. - * @param [in] feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. - * @param [in] status_action_serialized_qos The serialized Quality of Service (QoS) settings for the status action. + * @param [in] action_info Information about the action, including goal, result, cancel, feedback, and status types and their serialized QoS. */ typedef void (* ActionNotification)( const char* action_name, - const char* goal_request_action_type, - const char* goal_reply_action_type, - const char* cancel_request_action_type, - const char* cancel_reply_action_type, - const char* result_request_action_type, - const char* result_reply_action_type, - const char* feedback_action_type, - const char* status_action_type, - const char* goal_request_action_serialized_qos, - const char* goal_reply_action_serialized_qos, - const char* cancel_request_action_serialized_qos, - const char* cancel_reply_action_serialized_qos, - const char* result_request_action_serialized_qos, - const char* result_reply_action_serialized_qos, - const char* feedback_action_serialized_qos, - const char* status_action_serialized_qos); + const ActionInfo& action_info); /** * @brief Callback for notification of an action goal request. @@ -330,42 +355,12 @@ typedef void (* ActionResultNotification)( * This callback is used to request the action types for a specific action. * * @param [in] action_name The name of the action for which the types are being requested. - * @param [out] goal_request_action_type The type of the goal request action. - * @param [out] goal_reply_action_type The type of the goal reply action. - * @param [out] cancel_request_action_type The type of the cancel request action. - * @param [out] cancel_reply_action_type The type of the cancel reply action. - * @param [out] result_request_action_type The type of the get result request action. - * @param [out] result_reply_action_type The type of the get result reply action. - * @param [out] feedback_action_type The type of the feedback action. - * @param [out] status_action_type The type of the status action. - * @param [out] goal_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal request action. - * @param [out] goal_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the goal reply action. - * @param [out] cancel_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel request action. - * @param [out] cancel_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the cancel reply action. - * @param [out] result_request_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result request action. - * @param [out] result_reply_action_serialized_qos The serialized Quality of Service (QoS) settings for the get result reply action. - * @param [out] feedback_action_serialized_qos The serialized Quality of Service (QoS) settings for the feedback action. - * @param [out] status_action_serialized_qos The serialized Quality of Service (QoS) settings for the status action. + * @param [out] action_info Information about the action, including goal, result, cancel, feedback, and status types and their serialized QoS. * @return \c true if the action was found and the types were retrieved successfully, \c false otherwise. */ typedef bool (* ActionQuery)( const char* action_name, - std::string& goal_request_action_type, - std::string& goal_reply_action_type, - std::string& cancel_request_action_type, - std::string& cancel_reply_action_type, - std::string& result_request_action_type, - std::string& result_reply_action_type, - std::string& feedback_action_type, - std::string& status_action_type, - std::string& goal_request_action_serialized_qos, - std::string& goal_reply_action_serialized_qos, - std::string& cancel_request_action_serialized_qos, - std::string& cancel_reply_action_serialized_qos, - std::string& result_request_action_serialized_qos, - std::string& result_reply_action_serialized_qos, - std::string& feedback_action_serialized_qos, - std::string& status_action_serialized_qos); + ActionInfo& action_info); } /* namespace participants */ } /* namespace ddsenabler */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 208a436c..69468ade 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -130,15 +130,11 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool fill_topic_struct_nts_( const std::string& topic_name, - const std::string _type_name, - const std::string serialized_qos_content, + const TopicInfo& topic_info, ddspipe::core::types::DdsTopic& topic); bool fullfill_service_type_nts_( - const std::string _request_type_name, - const std::string serialized_request_qos_content, - const std::string _reply_type_name, - const std::string serialized_reply_qos_content, + const ServiceInfo& service_info, std::shared_ptr service); std::shared_ptr lookup_reader_nts_( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index ddc22b3a..04f2689f 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -488,32 +488,30 @@ bool EnablerParticipant::query_topic_nts_( " : topic is unknown and topic query callback not set."); return false; } - std::string type_name; - std::string serialized_qos; - if (!topic_query_callback_(topic_name.c_str(), type_name, serialized_qos)) + participants::TopicInfo topic_info; + if (!topic_query_callback_(topic_name.c_str(), topic_info)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to query data from topic " << topic_name << " : topic query callback failed."); return false; } - return fill_topic_struct_nts_(topic_name, type_name, serialized_qos, topic); + return fill_topic_struct_nts_(topic_name, topic_info, topic); } bool EnablerParticipant::fill_topic_struct_nts_( const std::string& topic_name, - const std::string type_name, - const std::string serialized_qos, + const TopicInfo& topic_info, DdsTopic& topic) { // Deserialize QoS if provided by the user (otherwise use default one) TopicQoS qos; - if (!serialized_qos.empty()) + if (!topic_info.serialized_qos.empty()) { try { - qos = serialization::deserialize_qos(serialized_qos); + qos = serialization::deserialize_qos(topic_info.serialized_qos); } catch (const std::exception& e) { @@ -524,7 +522,7 @@ bool EnablerParticipant::fill_topic_struct_nts_( } fastdds::dds::xtypes::TypeIdentifier type_identifier; - if (!std::static_pointer_cast(schema_handler_)->get_type_identifier(type_name, type_identifier)) + if (!std::static_pointer_cast(schema_handler_)->get_type_identifier(topic_info.type_name, type_identifier)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to create topic " << topic_name << " : type identifier not found."); @@ -532,7 +530,7 @@ bool EnablerParticipant::fill_topic_struct_nts_( } topic.m_topic_name = topic_name; - topic.type_name = type_name; + topic.type_name = topic_info.type_name; topic.topic_qos = qos; topic.type_identifiers.type_identifier1(type_identifier); @@ -540,22 +538,19 @@ bool EnablerParticipant::fill_topic_struct_nts_( } bool EnablerParticipant::fullfill_service_type_nts_( - const std::string _request_type_name, - const std::string serialized_request_qos_content, - const std::string _reply_type_name, - const std::string serialized_reply_qos_content, + const ServiceInfo& service_info, std::shared_ptr service) { DdsTopic topic_request; std::string topic_request_name = std::string(REQUEST_PREFIX) + service->service_name + REQUEST_SUFFIX; - if(!fill_topic_struct_nts_(topic_request_name, _request_type_name, serialized_request_qos_content, topic_request)) + if(!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) return false; service->add_topic(topic_request, RpcUtils::RPC_REQUEST); DdsTopic topic_reply; std::string topic_reply_name = std::string(REPLY_PREFIX) + service->service_name + REPLY_SUFFIX; - if(!fill_topic_struct_nts_(topic_reply_name, _reply_type_name, serialized_reply_qos_content, topic_reply)) + if(!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) return false; service->add_topic(topic_reply, RpcUtils::RPC_REPLY); @@ -583,16 +578,15 @@ bool EnablerParticipant::query_service_nts_( std::string serialized_reply_qos_content; - if (!service_query_callback_(service->service_name.c_str(), request_type_name, serialized_request_qos_content, - reply_type_name, serialized_reply_qos_content)) + ServiceInfo service_info; + if (!service_query_callback_(service->service_name.c_str(), service_info)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce service " << service->service_name << " : service type request failed."); return false; } - return fullfill_service_type_nts_(request_type_name, serialized_request_qos_content, - reply_type_name, serialized_reply_qos_content, service); + return fullfill_service_type_nts_(service_info, service); } bool EnablerParticipant::query_action_nts_( @@ -607,40 +601,10 @@ bool EnablerParticipant::query_action_nts_( return false; } - std::string goal_request_action_type; - std::string goal_reply_action_type; - std::string cancel_request_action_type; - std::string cancel_reply_action_type; - std::string result_request_action_type; - std::string result_reply_action_type; - std::string feedback_action_type; - std::string status_action_type; - std::string goal_request_action_serialized_qos; - std::string goal_reply_action_serialized_qos; - std::string cancel_request_action_serialized_qos; - std::string cancel_reply_action_serialized_qos; - std::string result_request_action_serialized_qos; - std::string result_reply_action_serialized_qos; - std::string feedback_action_serialized_qos; - std::string status_action_serialized_qos; + ActionInfo action_info; if (!action_query_callback_(action.action_name.c_str(), - goal_request_action_type, - goal_reply_action_type, - cancel_request_action_type, - cancel_reply_action_type, - result_request_action_type, - result_reply_action_type, - feedback_action_type, - status_action_type, - goal_request_action_serialized_qos, - goal_reply_action_serialized_qos, - cancel_request_action_serialized_qos, - cancel_reply_action_serialized_qos, - result_request_action_serialized_qos, - result_reply_action_serialized_qos, - feedback_action_serialized_qos, - status_action_serialized_qos)) + action_info)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : action type request failed."); @@ -668,10 +632,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr goal_service = std::make_shared(goal_service_name); if(!fullfill_service_type_nts_( - goal_request_action_type, - goal_request_action_serialized_qos, - goal_reply_action_type, - goal_reply_action_serialized_qos, + action_info.goal, goal_service)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -689,10 +650,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr cancel_service = std::make_shared(cancel_service_name); if(!fullfill_service_type_nts_( - cancel_request_action_type, - cancel_request_action_serialized_qos, - cancel_reply_action_type, - cancel_reply_action_serialized_qos, + action_info.cancel, cancel_service)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -710,10 +668,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr result_service = std::make_shared(result_service_name); if(!fullfill_service_type_nts_( - result_request_action_type, - result_request_action_serialized_qos, - result_reply_action_type, - result_reply_action_serialized_qos, + action_info.result, result_service)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -733,8 +688,7 @@ bool EnablerParticipant::query_action_nts_( DdsTopic feedback_topic; if(!fill_topic_struct_nts_( feedback_topic_name, - feedback_action_type, - feedback_action_serialized_qos, + action_info.feedback, feedback_topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -760,8 +714,7 @@ bool EnablerParticipant::query_action_nts_( DdsTopic status_topic; if(!fill_topic_struct_nts_( status_topic_name, - status_action_type, - status_action_serialized_qos, + action_info.status, status_topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index cb8c96ff..fbe39896 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -160,8 +160,7 @@ void Writer::write_topic( std::string serialized_qos = serialize_qos(topic.topic_qos); topic_notification_callback_( topic.topic_name().c_str(), - topic.type_name.c_str(), - serialized_qos.c_str() + TopicInfo(topic.type_name, serialized_qos) ); } } @@ -199,11 +198,11 @@ void Writer::write_service_notification( std::string reply_serialized_qos = serialize_qos(service.reply_topic().topic_qos); service_notification_callback_( service.service_name().c_str(), - service.request_topic().type_name.c_str(), - service.reply_topic().type_name.c_str(), - request_serialized_qos.c_str(), - reply_serialized_qos.c_str() - ); + ServiceInfo( + TopicInfo(service.request_topic().type_name, request_serialized_qos), + TopicInfo(service.reply_topic().type_name, reply_serialized_qos) + ) + ); } } @@ -274,23 +273,22 @@ void Writer::write_action_notification( action_notification_callback_( action.action_name.c_str(), - action.goal.request_topic().type_name.c_str(), - action.goal.reply_topic().type_name.c_str(), - action.cancel.request_topic().type_name.c_str(), - action.cancel.reply_topic().type_name.c_str(), - action.result.request_topic().type_name.c_str(), - action.result.reply_topic().type_name.c_str(), - action.feedback.type_name.c_str(), - action.status.type_name.c_str(), - goal_request_serialized_qos.c_str(), - goal_reply_serialized_qos.c_str(), - cancel_request_serialized_qos.c_str(), - cancel_reply_serialized_qos.c_str(), - result_request_serialized_qos.c_str(), - result_reply_serialized_qos.c_str(), - feedback_serialized_qos.c_str(), - status_serialized_qos.c_str() - ); + ActionInfo( + ServiceInfo( + TopicInfo(action.goal.request_topic().type_name, goal_request_serialized_qos), + TopicInfo(action.goal.reply_topic().type_name, goal_reply_serialized_qos) + ), + ServiceInfo( + TopicInfo(action.cancel.request_topic().type_name, cancel_request_serialized_qos), + TopicInfo(action.cancel.reply_topic().type_name, cancel_reply_serialized_qos) + ), + ServiceInfo( + TopicInfo(action.result.request_topic().type_name, result_request_serialized_qos), + TopicInfo(action.result.reply_topic().type_name, result_reply_serialized_qos) + ), + TopicInfo(action.feedback.type_name, feedback_serialized_qos), + TopicInfo(action.status.type_name, status_serialized_qos) + )); } } diff --git a/ddsenabler_participants/test/DdsEnablerParticipantsTest.cpp b/ddsenabler_participants/test/DdsEnablerParticipantsTest.cpp index d37ca79e..434c17b9 100644 --- a/ddsenabler_participants/test/DdsEnablerParticipantsTest.cpp +++ b/ddsenabler_participants/test/DdsEnablerParticipantsTest.cpp @@ -127,8 +127,7 @@ class HandlerTest : public participants::Handler // eprosima::ddsenabler::participants::DdsTopicNotification topic_notification; static void test_topic_notification_callback( const char* topic_name, - const char* type_name, - const char* serialized_qos) + const eprosima::ddsenabler::participants::TopicInfo& topic_info) { if (current_test_instance_ == nullptr) { From c35882767b9153d9e79ee0f8598642e5bf7d9705 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 1 Aug 2025 17:53:18 +0200 Subject: [PATCH 24/87] Refactor RPC ROS2 option Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 29 +++++++++++++++--- ddsenabler/src/cpp/DDSEnabler.cpp | 30 +++++++++++++++---- .../EnablerParticipant.hpp | 6 ++-- .../src/cpp/EnablerParticipant.cpp | 20 +++++++++++-- 4 files changed, 71 insertions(+), 14 deletions(-) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 717e36ef..73636897 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -116,10 +116,12 @@ class DDSEnabler * for the corresponding request and reply topics. * * @param service_name The name of the service to be announced. + * @param is_ros2 Indicates whether the service is a ROS2 service (default is true). * @return true if the service was successfully announced, false otherwise. */ bool announce_service( - const std::string& service_name); + const std::string& service_name, + bool is_ros2 = true); /** * @brief Stops the server for the given service. @@ -147,12 +149,14 @@ class DDSEnabler * @param service_name The target service name. * @param json The JSON-formatted request data. * @param request_id Reference to store the unique request identifier. + * @param is_ros2 Indicates whether the service is a ROS2 service (default is true). * @return true if the request was successfully sent, false otherwise. */ bool send_service_request( const std::string& service_name, const std::string& json, - uint64_t& request_id); + uint64_t& request_id, + bool is_ros2 = true); /** * @brief Sends a reply to the given service. @@ -185,11 +189,13 @@ class DDSEnabler * Failure may occur if there is an issue requesting the data types to user's app. * * @param action_name The name of the action to be announced. + * @param is_ros2 Indicates whether the action is a ROS2 action (default is true). * * @return true if the action was successfully announced, false otherwise. */ bool announce_action( - const std::string& action_name); + const std::string& action_name, + bool is_ros2 = true); /** * @brief Stops the server for the given action. @@ -241,6 +247,19 @@ class DDSEnabler const participants::STATUS_CODE& status_code, const char* json); + /* + * @brief Sends a cancel goal reply for the specified action. + * + * This function sends a reply for a cancel goal request for the specified action. + * It returns a boolean indicating whether the operation was successful. + * + * @param action_name The name of the action for which the cancel goal reply is being sent. + * @param goal_ids The unique identifiers of the action goals for which the cancel goal reply is being sent. + * @param cancel_code The cancel code representing the result of the cancel goal request. + * @param request_id The unique identifier of the cancel goal request. + * + * @return true if the cancel goal reply was successfully sent, false otherwise. + */ bool send_action_cancel_goal_reply( const char* action_name, const std::vector& goal_ids, @@ -283,12 +302,14 @@ class DDSEnabler * @param action_name The name of the action to send the goal to. * @param json The JSON data to be sent with the action goal. * @param goal_id Reference to store the unique identifier of the action goal. + * @param is_ros2 Indicates whether the action is a ROS2 action (default is true). * @return true if the action goal was successfully sent, false otherwise. */ bool send_action_goal( const std::string& action_name, const std::string& json, - participants::UUID& goal_id); + participants::UUID& goal_id, + bool is_ros2 = true); /** * @brief Cancels an action goal for the specified action. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 4e222be7..35f3e7bc 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -292,8 +292,16 @@ bool DDSEnabler::publish( bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, - uint64_t& request_id) + uint64_t& request_id, + bool is_ros2) { + if (!is_ros2) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service request to service " << service_name << ": only ROS2 services are currently supported."); + return false; + } + request_id = handler_->get_new_request_id(); if (!enabler_participant_->publish_rpc( std::string(participants::REQUEST_PREFIX) + service_name + participants::REQUEST_SUFFIX, @@ -305,9 +313,10 @@ bool DDSEnabler::send_service_request( } bool DDSEnabler::announce_service( - const std::string& service_name) + const std::string& service_name, + bool is_ros2) { - return enabler_participant_->announce_service(service_name); + return enabler_participant_->announce_service(service_name, is_ros2); } bool DDSEnabler::revoke_service( @@ -327,8 +336,16 @@ bool DDSEnabler::send_service_reply( bool DDSEnabler::send_action_goal( const std::string& action_name, const std::string& json, - UUID& action_id) + UUID& action_id, + bool is_ros2) { + if (!is_ros2) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal to action " << action_name << ": only ROS2 actions are currently supported."); + return false; + } + std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; uint64_t goal_request_id = 0; @@ -426,9 +443,10 @@ bool DDSEnabler::cancel_action_goal( } bool DDSEnabler::announce_action( - const std::string& action_name) + const std::string& action_name, + bool is_ros2) { - return enabler_participant_->announce_action(action_name); + return enabler_participant_->announce_action(action_name, is_ros2); } bool DDSEnabler::revoke_action( diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 69468ade..36d8f433 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -91,7 +91,8 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_service( - const std::string& service_name); + const std::string& service_name, + bool is_ros2 = true); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_service( @@ -99,7 +100,8 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( - const std::string& action_name); + const std::string& action_name, + bool is_ros2); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_action( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 04f2689f..d1a888b1 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -331,10 +331,18 @@ bool EnablerParticipant::create_service_request_writer_nts_( } bool EnablerParticipant::announce_service( - const std::string& service_name) + const std::string& service_name, + bool is_ros2) { std::unique_lock lck(mtx_); + if (!is_ros2) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service_name << " : only ROS2 services are currently supported."); + return false; + } + auto it = services_.find(service_name); if (it != services_.end()) { @@ -406,10 +414,18 @@ bool EnablerParticipant::revoke_service_nts_( } bool EnablerParticipant::announce_action( - const std::string& action_name) + const std::string& action_name, + bool is_ros2) { std::unique_lock lck(mtx_); + if (!is_ros2) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action_name << " : only ROS2 actions are currently supported."); + return false; + } + { auto it = actions_.find(action_name); if (it != actions_.end()) From 17f24cc2ef372092a22feba83c9992d9da29a1a9 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 25 Aug 2025 09:12:38 +0200 Subject: [PATCH 25/87] Extend is_ros2 to RPC protocol Signed-off-by: Eugenio Collado --- ddsenabler/examples/service/Readme.md | 3 +- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 48 +++++++++++-------- ddsenabler/src/cpp/DDSEnabler.cpp | 16 +++---- .../ddsenabler_participants/Callbacks.hpp | 1 + .../EnablerParticipant.hpp | 4 +- .../ddsenabler_participants/RpcTypes.hpp | 6 +++ .../src/cpp/EnablerParticipant.cpp | 10 ++-- 7 files changed, 50 insertions(+), 38 deletions(-) diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 8a04dbac..92832dab 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,8 +10,7 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config -$PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 ``` ### SERVER diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 73636897..89715a74 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -96,6 +97,7 @@ class DDSEnabler * * @param topic_name: The name of the topic to publish to. * @param json: The JSON message to publish. + * * @return \c true if the message was published successfully, \c false otherwise. */ DDSENABLER_DllAPI @@ -116,12 +118,13 @@ class DDSEnabler * for the corresponding request and reply topics. * * @param service_name The name of the service to be announced. - * @param is_ros2 Indicates whether the service is a ROS2 service (default is true). + * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * * @return true if the service was successfully announced, false otherwise. */ bool announce_service( const std::string& service_name, - bool is_ros2 = true); + participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); /** * @brief Stops the server for the given service. @@ -149,14 +152,15 @@ class DDSEnabler * @param service_name The target service name. * @param json The JSON-formatted request data. * @param request_id Reference to store the unique request identifier. - * @param is_ros2 Indicates whether the service is a ROS2 service (default is true). + * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * * @return true if the request was successfully sent, false otherwise. */ bool send_service_request( const std::string& service_name, const std::string& json, uint64_t& request_id, - bool is_ros2 = true); + participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); /** * @brief Sends a reply to the given service. @@ -168,6 +172,7 @@ class DDSEnabler * @param service_name The name of the service to send the reply to. * @param json The JSON data to be sent with the reply. * @param request_id The unique identifier of the request to which this reply corresponds. + * * @return true if the reply was successfully sent, false otherwise. * * @note The request_id must coincide with the one received in the request. @@ -189,13 +194,13 @@ class DDSEnabler * Failure may occur if there is an issue requesting the data types to user's app. * * @param action_name The name of the action to be announced. - * @param is_ros2 Indicates whether the action is a ROS2 action (default is true). + * @param rpc_protocol The RPC protocol to be used (default is ROS2). * * @return true if the action was successfully announced, false otherwise. */ bool announce_action( const std::string& action_name, - bool is_ros2 = true); + participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); /** * @brief Stops the server for the given action. @@ -247,19 +252,19 @@ class DDSEnabler const participants::STATUS_CODE& status_code, const char* json); - /* - * @brief Sends a cancel goal reply for the specified action. - * - * This function sends a reply for a cancel goal request for the specified action. - * It returns a boolean indicating whether the operation was successful. - * - * @param action_name The name of the action for which the cancel goal reply is being sent. - * @param goal_ids The unique identifiers of the action goals for which the cancel goal reply is being sent. - * @param cancel_code The cancel code representing the result of the cancel goal request. - * @param request_id The unique identifier of the cancel goal request. - * - * @return true if the cancel goal reply was successfully sent, false otherwise. - */ + /** + * @brief Sends a cancel goal reply for the specified action. + * + * This function sends a reply for a cancel goal request for the specified action. + * It returns a boolean indicating whether the operation was successful. + * + * @param action_name The name of the action for which the cancel goal reply is being sent. + * @param goal_ids The unique identifiers of the action goals for which the cancel goal reply is being sent. + * @param cancel_code The cancel code representing the result of the cancel goal request. + * @param request_id The unique identifier of the cancel goal request. + * + * @return true if the cancel goal reply was successfully sent, false otherwise. + */ bool send_action_cancel_goal_reply( const char* action_name, const std::vector& goal_ids, @@ -302,14 +307,15 @@ class DDSEnabler * @param action_name The name of the action to send the goal to. * @param json The JSON data to be sent with the action goal. * @param goal_id Reference to store the unique identifier of the action goal. - * @param is_ros2 Indicates whether the action is a ROS2 action (default is true). + * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * * @return true if the action goal was successfully sent, false otherwise. */ bool send_action_goal( const std::string& action_name, const std::string& json, participants::UUID& goal_id, - bool is_ros2 = true); + participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); /** * @brief Cancels an action goal for the specified action. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 35f3e7bc..d5f6095a 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -293,9 +293,9 @@ bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, uint64_t& request_id, - bool is_ros2) + participants::RPC_PROTOCOL rpc_protocol) { - if (!is_ros2) + if (rpc_protocol != participants::RPC_PROTOCOL::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send service request to service " << service_name << ": only ROS2 services are currently supported."); @@ -314,9 +314,9 @@ bool DDSEnabler::send_service_request( bool DDSEnabler::announce_service( const std::string& service_name, - bool is_ros2) + participants::RPC_PROTOCOL rpc_protocol) { - return enabler_participant_->announce_service(service_name, is_ros2); + return enabler_participant_->announce_service(service_name, rpc_protocol); } bool DDSEnabler::revoke_service( @@ -337,9 +337,9 @@ bool DDSEnabler::send_action_goal( const std::string& action_name, const std::string& json, UUID& action_id, - bool is_ros2) + participants::RPC_PROTOCOL rpc_protocol) { - if (!is_ros2) + if (rpc_protocol != participants::RPC_PROTOCOL::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal to action " << action_name << ": only ROS2 actions are currently supported."); @@ -444,9 +444,9 @@ bool DDSEnabler::cancel_action_goal( bool DDSEnabler::announce_action( const std::string& action_name, - bool is_ros2) + participants::RPC_PROTOCOL rpc_protocol) { - return enabler_participant_->announce_action(action_name, is_ros2); + return enabler_participant_->announce_action(action_name, rpc_protocol); } bool DDSEnabler::revoke_action( diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index bfa1b22f..6fcbd9dd 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -65,6 +65,7 @@ struct ServiceInfo , reply(_reply) { } + TopicInfo request; TopicInfo reply; }; diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 36d8f433..574c94a6 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -92,7 +92,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_service( const std::string& service_name, - bool is_ros2 = true); + RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_service( @@ -101,7 +101,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( const std::string& action_name, - bool is_ros2); + RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_action( diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp index 9dead634..88b0ad94 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -28,6 +28,12 @@ namespace participants { using UUID = std::array; +enum RPC_PROTOCOL { + ROS2 = 0, + FASTDDS, + UNKNOWN +}; + enum STATUS_CODE { STATUS_UNKNOWN = 0, STATUS_ACCEPTED, diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index d1a888b1..ad753cc9 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -326,17 +326,17 @@ bool EnablerParticipant::create_service_request_writer_nts_( } EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create server as it is already running in ROS2."); + "Failed to create server as there is already a server running for service " << service->service_name << "."); return false; } bool EnablerParticipant::announce_service( const std::string& service_name, - bool is_ros2) + RPC_PROTOCOL rpc_protocol) { std::unique_lock lck(mtx_); - if (!is_ros2) + if (rpc_protocol != RPC_PROTOCOL::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce service " << service_name << " : only ROS2 services are currently supported."); @@ -415,11 +415,11 @@ bool EnablerParticipant::revoke_service_nts_( bool EnablerParticipant::announce_action( const std::string& action_name, - bool is_ros2) + RPC_PROTOCOL rpc_protocol) { std::unique_lock lck(mtx_); - if (!is_ros2) + if (rpc_protocol != RPC_PROTOCOL::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action_name << " : only ROS2 actions are currently supported."); From a4b40977a4fd0525d4eaa571ab9e99b8c36664f6 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 26 Aug 2025 14:05:59 +0200 Subject: [PATCH 26/87] Implement fast rpc protocol Signed-off-by: Eugenio Collado --- ddsenabler/src/cpp/DDSEnabler.cpp | 98 +++++++++-- .../ddsenabler_participants/Constants.hpp | 16 +- .../EnablerParticipant.hpp | 17 +- .../ddsenabler_participants/Handler.hpp | 16 +- .../ddsenabler_participants/RpcStructs.hpp | 27 ++- .../ddsenabler_participants/RpcUtils.hpp | 6 +- .../src/cpp/EnablerParticipant.cpp | 118 +++++++++---- ddsenabler_participants/src/cpp/Handler.cpp | 21 ++- ddsenabler_participants/src/cpp/RpcUtils.cpp | 159 +++++++++++------- 9 files changed, 346 insertions(+), 132 deletions(-) diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index d5f6095a..85d3c4ab 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -295,16 +295,26 @@ bool DDSEnabler::send_service_request( uint64_t& request_id, participants::RPC_PROTOCOL rpc_protocol) { - if (rpc_protocol != participants::RPC_PROTOCOL::ROS2) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send service request to service " << service_name << ": only ROS2 services are currently supported."); - return false; + std::string prefix, suffix; + switch (rpc_protocol) + { + case participants::RPC_PROTOCOL::ROS2: + prefix = participants::ROS_REQUEST_PREFIX; + suffix = participants::ROS_REQUEST_SUFFIX; + break; + case participants::RPC_PROTOCOL::FASTDDS: + prefix = participants::FASTDDS_REQUEST_PREFIX; + suffix = participants::FASTDDS_REQUEST_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service request to service " << service_name << ": unknown RPC protocol."); + return false; } request_id = handler_->get_new_request_id(); if (!enabler_participant_->publish_rpc( - std::string(participants::REQUEST_PREFIX) + service_name + participants::REQUEST_SUFFIX, + prefix + service_name + suffix, json, request_id)) return false; @@ -330,7 +340,28 @@ bool DDSEnabler::send_service_reply( const std::string& json, const uint64_t request_id) { - return enabler_participant_->publish_rpc(std::string(participants::REPLY_PREFIX) + service_name + participants::REPLY_SUFFIX, json, request_id); + RPC_PROTOCOL rpc_protocol = enabler_participant_->get_service_rpc_protocol(service_name); + std::string prefix, suffix; + switch (rpc_protocol) + { + case participants::RPC_PROTOCOL::ROS2: + prefix = participants::ROS_REPLY_PREFIX; + suffix = participants::ROS_REPLY_SUFFIX; + break; + case participants::RPC_PROTOCOL::FASTDDS: + prefix = participants::FASTDDS_REPLY_PREFIX; + suffix = participants::FASTDDS_REPLY_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service reply to unknown service " << service_name); + return false; + } + + return enabler_participant_->publish_rpc( + prefix + service_name + suffix, + json, + request_id); } bool DDSEnabler::send_action_goal( @@ -339,13 +370,6 @@ bool DDSEnabler::send_action_goal( UUID& action_id, participants::RPC_PROTOCOL rpc_protocol) { - if (rpc_protocol != participants::RPC_PROTOCOL::ROS2) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal to action " << action_name << ": only ROS2 actions are currently supported."); - return false; - } - std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; uint64_t goal_request_id = 0; @@ -353,7 +377,8 @@ bool DDSEnabler::send_action_goal( if (!send_service_request( goal_request_topic, goal_json, - goal_request_id)) + goal_request_id, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal request to action " << action_name); @@ -364,7 +389,8 @@ bool DDSEnabler::send_action_goal( action_name, action_id, goal_request_id, - RpcUtils::ActionType::GOAL)) + RpcUtils::ActionType::GOAL, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action goal request to action " << action_name); @@ -558,8 +584,26 @@ bool DDSEnabler::send_action_feedback( return false; } + RPC_PROTOCOL protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) + { + case RPC_PROTOCOL::ROS2: + prefix = participants::ROS_TOPIC_PREFIX; + break; + case RPC_PROTOCOL::FASTDDS: + prefix = participants::FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send feedback to action " << action_name + << ": unsupported RPC protocol."); + return false; + } + std::string feedback_json = participants::RpcUtils::create_feedback_msg(json, goal_id); - std::string feedback_topic = participants::TOPIC_PREFIX + std::string(action_name) + participants::ACTION_FEEDBACK_SUFFIX; + std::string feedback_topic = prefix + std::string(action_name) + participants::ACTION_FEEDBACK_SUFFIX; return enabler_participant_->publish(feedback_topic, feedback_json); } @@ -578,8 +622,26 @@ bool DDSEnabler::update_action_status( return false; } + RPC_PROTOCOL protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) + { + case RPC_PROTOCOL::ROS2: + prefix = participants::ROS_TOPIC_PREFIX; + break; + case RPC_PROTOCOL::FASTDDS: + prefix = participants::FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send status to action " << action_name + << ": unsupported RPC protocol."); + return false; + } + std::string status_json = participants::RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); - std::string status_topic = participants::TOPIC_PREFIX + action_name + participants::ACTION_STATUS_SUFFIX; + std::string status_topic = prefix + action_name + participants::ACTION_STATUS_SUFFIX; return enabler_participant_->publish(status_topic, status_json); } diff --git a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp index 119483c2..efb4cfed 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp @@ -29,13 +29,19 @@ constexpr const char* QOS_SERIALIZATION_OWNERSHIP("ownership"); constexpr const char* QOS_SERIALIZATION_KEYED("keyed"); // Topic mangling -constexpr const char* TOPIC_PREFIX("rt/"); +constexpr const char* ROS_TOPIC_PREFIX("rt/"); +constexpr const char* FASTDDS_TOPIC_PREFIX(""); // Service mangling -constexpr const char* REQUEST_PREFIX("rq/"); -constexpr const char* REQUEST_SUFFIX("Request"); -constexpr const char* REPLY_PREFIX("rr/"); -constexpr const char* REPLY_SUFFIX("Reply"); +constexpr const char* ROS_REQUEST_PREFIX("rq/"); +constexpr const char* ROS_REQUEST_SUFFIX("Request"); +constexpr const char* ROS_REPLY_PREFIX("rr/"); +constexpr const char* ROS_REPLY_SUFFIX("Reply"); + +constexpr const char* FASTDDS_REQUEST_PREFIX(""); +constexpr const char* FASTDDS_REQUEST_SUFFIX("_Request"); +constexpr const char* FASTDDS_REPLY_PREFIX(""); +constexpr const char* FASTDDS_REPLY_SUFFIX("_Reply"); // Action mangling constexpr const char* ACTION_GOAL_SUFFIX("send_goal"); diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 574c94a6..02f56705 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -98,6 +98,10 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool revoke_service( const std::string& service_name); + DDSENABLER_PARTICIPANTS_DllAPI + RPC_PROTOCOL get_service_rpc_protocol( + const std::string& service_name); + DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( const std::string& action_name, @@ -114,10 +118,12 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant ddspipe::core::types::DdsTopic& topic); bool query_service_nts_( - std::shared_ptr service); + std::shared_ptr service, + RPC_PROTOCOL rpc_protocol); bool query_action_nts_( ActionDiscovered& action, + RPC_PROTOCOL rpc_protocol, std::unique_lock& lck); bool create_topic_writer_nts_( @@ -137,7 +143,8 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool fullfill_service_type_nts_( const ServiceInfo& service_info, - std::shared_ptr service); + std::shared_ptr service, + RPC_PROTOCOL rpc_protocol); std::shared_ptr lookup_reader_nts_( const std::string& topic_name, @@ -149,12 +156,14 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool service_discovered_nts_( const std::string& service_name, const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type); + RpcUtils::RpcType rpc_type, + RPC_PROTOCOL rpc_protocol); bool action_discovered_nts_( const std::string& action_name, const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type); + RpcUtils::RpcType rpc_type, + RPC_PROTOCOL rpc_protocol); bool revoke_service_nts_( const std::string& service_name); diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 533f5512..c10a9a10 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -191,6 +191,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * @param [in] action_id UUID of the action. * @param [in] request_id Request ID of the action request. * @param [in] action_type Type of the action (GOAL, RESULT, CANCEL). + * @param [in] rpc_protocol Protocol of the action, only used to create the ActionRequestInfo if action_type is GOAL. * @return \c true if the action request was successfully stored, \c false otherwise. */ DDSENABLER_PARTICIPANTS_DllAPI @@ -198,7 +199,8 @@ class Handler : public ddspipe::participants::ISchemaHandler const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const RpcUtils::ActionType action_type); + const RpcUtils::ActionType action_type, + const RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); /** * @brief Send the reply containing the result of an action or store it for a later reply. @@ -246,6 +248,18 @@ class Handler : public ddspipe::participants::ISchemaHandler const UUID& action_id, std::chrono::system_clock::time_point* goal_accepted_stamp = nullptr); + /** + * @brief Get the RPC protocol of an action represented by its UUID. + * + * @param [in] action_name Name of the action. + * @param [in] action_id UUID of the action to be checked. + * @return The RPC protocol of the action, or RPC_PROTOCOL::UNKNOWN if the action is not found. + */ + DDSENABLER_PARTICIPANTS_DllAPI + RPC_PROTOCOL get_action_rpc_protocol( + const std::string& action_name, + const UUID& action_id); + /** * @brief Set the data notification callback. * diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index 8a5d0ceb..66fb0c70 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -41,9 +41,11 @@ struct ActionRequestInfo ActionRequestInfo( const std::string& _action_name, RpcUtils::ActionType action_type, - uint64_t request_id) + uint64_t request_id, + RPC_PROTOCOL rpc_protocol) : action_name(_action_name) , goal_accepted_stamp(std::chrono::system_clock::now()) + , rpc_protocol(rpc_protocol) { set_request(request_id, action_type); } @@ -108,7 +110,13 @@ struct ActionRequestInfo return final_status_received && result_received; } + RPC_PROTOCOL get_rpc_protocol() const + { + return rpc_protocol; + } + std::string action_name; + RPC_PROTOCOL rpc_protocol; uint64_t goal_request_id = 0; uint64_t result_request_id = 0; std::chrono::system_clock::time_point goal_accepted_stamp; @@ -120,12 +128,16 @@ struct ActionRequestInfo struct ServiceDiscovered { - ServiceDiscovered(const std::string& service_name) + ServiceDiscovered( + const std::string& service_name, + RPC_PROTOCOL rpc_protocol) : service_name(service_name) + , rpc_protocol(rpc_protocol) { } std::string service_name; + RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::UNKNOWN}; ddspipe::core::types::DdsTopic topic_request; bool request_discovered{false}; @@ -221,16 +233,25 @@ struct ServiceDiscovered } return false; } + + RPC_PROTOCOL get_rpc_protocol() const + { + return rpc_protocol; + } }; struct ActionDiscovered { - ActionDiscovered(const std::string& action_name) + ActionDiscovered( + const std::string& action_name, + RPC_PROTOCOL rpc_protocol) : action_name(action_name) + , rpc_protocol(rpc_protocol) { } std::string action_name; + RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::UNKNOWN}; std::weak_ptr goal; std::weak_ptr result; std::weak_ptr cancel; diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index acdabd55..b1413557 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -88,7 +88,11 @@ enum ActionType * @param [in] topic_name Topic name to extract the service/action name from * @return Extracted service name */ -RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name); +RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL& rpc_protocol); + +RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name); + +RpcType remove_prefix_suffix(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL rpc_protocol); RpcType get_service_name(const std::string& topic_name, std::string& service_name); diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index ad753cc9..e8f6afe2 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -49,23 +49,25 @@ EnablerParticipant::EnablerParticipant( bool EnablerParticipant::service_discovered_nts_( const std::string& service_name, const DdsTopic& topic, - RpcUtils::RpcType rpc_type) + RpcUtils::RpcType rpc_type, + RPC_PROTOCOL rpc_protocol) { - auto [it, inserted] = services_.try_emplace(service_name, std::make_shared(service_name)); + auto [it, inserted] = services_.try_emplace(service_name, std::make_shared(service_name, rpc_protocol)); return it->second->add_topic(topic, rpc_type); } bool EnablerParticipant::action_discovered_nts_( const std::string& action_name, const DdsTopic& topic, - RpcUtils::RpcType rpc_type) + RpcUtils::RpcType rpc_type, + RPC_PROTOCOL rpc_protocol) { - auto [it, inserted] = actions_.try_emplace(action_name, ActionDiscovered(action_name)); + auto [it, inserted] = actions_.try_emplace(action_name, ActionDiscovered(action_name, rpc_protocol)); std::string service_name; RpcUtils::RpcType service_direction = RpcUtils::get_service_name(topic.m_topic_name, service_name); if (RpcUtils::RpcType::RPC_NONE != service_direction) { - service_discovered_nts_(service_name, topic, service_direction); + service_discovered_nts_(service_name, topic, service_direction, rpc_protocol); auto service_it = services_.find(service_name); if (services_.end() == service_it) { @@ -97,7 +99,8 @@ std::shared_ptr EnablerParticipant::create_reader( std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); std::string rpc_name; - RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(dds_topic.m_topic_name, rpc_name); + RPC_PROTOCOL rpc_protocol; + RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(dds_topic.m_topic_name, rpc_name, rpc_protocol); if (RpcUtils::RpcType::RPC_NONE != rpc_type) { RpcUtils::RpcType rpc_direction = RpcUtils::get_service_direction(rpc_type); @@ -111,7 +114,7 @@ std::shared_ptr EnablerParticipant::create_reader( { if (RpcUtils::ActionType::NONE == RpcUtils::get_action_type(rpc_type)) { - if (service_discovered_nts_(rpc_name, dds_topic, rpc_type)) + if (service_discovered_nts_(rpc_name, dds_topic, rpc_type, rpc_protocol)) { RpcTopic service = services_.find(rpc_name)->second->get_service(); std::static_pointer_cast(schema_handler_)->add_service(service); @@ -119,7 +122,7 @@ std::shared_ptr EnablerParticipant::create_reader( } else { - if (action_discovered_nts_(rpc_name, dds_topic, rpc_type)) + if (action_discovered_nts_(rpc_name, dds_topic, rpc_type, rpc_protocol)) { auto action = actions_.find(rpc_name)->second.get_action(rpc_name); std::static_pointer_cast(schema_handler_)->add_action(action); @@ -336,13 +339,6 @@ bool EnablerParticipant::announce_service( { std::unique_lock lck(mtx_); - if (rpc_protocol != RPC_PROTOCOL::ROS2) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to announce service " << service_name << " : only ROS2 services are currently supported."); - return false; - } - auto it = services_.find(service_name); if (it != services_.end()) { @@ -355,8 +351,8 @@ bool EnablerParticipant::announce_service( services_.erase(it); } - std::shared_ptr service = std::make_shared(service_name); - if(!query_service_nts_(service)) + std::shared_ptr service = std::make_shared(service_name, rpc_protocol); + if(!query_service_nts_(service, rpc_protocol)) { return false; } @@ -398,12 +394,12 @@ bool EnablerParticipant::revoke_service_nts_( return false; } + std::string request_name = it->second->topic_request.m_topic_name; + this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); it->second->endpoint_request.reset(); it->second->remove_topic(RpcUtils::RpcType::RPC_REQUEST); - std::string request_name = std::string(REQUEST_PREFIX) + service_name + REQUEST_SUFFIX; - auto reader = lookup_reader_nts_(request_name); if (nullptr != reader) { @@ -413,6 +409,19 @@ bool EnablerParticipant::revoke_service_nts_( return true; } +RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( + const std::string& service_name) +{ + std::unique_lock lck(mtx_); + auto it = services_.find(service_name); + if (it != services_.end()) + { + return it->second->get_rpc_protocol(); + } + + return RPC_PROTOCOL::UNKNOWN; +} + bool EnablerParticipant::announce_action( const std::string& action_name, RPC_PROTOCOL rpc_protocol) @@ -441,8 +450,8 @@ bool EnablerParticipant::announce_action( } } - ActionDiscovered action(action_name); - if(!query_action_nts_(action, lck)) + ActionDiscovered action(action_name, rpc_protocol); + if(!query_action_nts_(action, rpc_protocol, lck)) { return false; } @@ -555,17 +564,38 @@ bool EnablerParticipant::fill_topic_struct_nts_( bool EnablerParticipant::fullfill_service_type_nts_( const ServiceInfo& service_info, - std::shared_ptr service) + std::shared_ptr service, + RPC_PROTOCOL rpc_protocol) { + std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; + switch (rpc_protocol) + { + case RPC_PROTOCOL::ROS2: + rq_prefix = ROS_REQUEST_PREFIX; + rq_suffix = ROS_REQUEST_SUFFIX; + rp_prefix = ROS_REPLY_PREFIX; + rp_suffix = ROS_REPLY_SUFFIX; + break; + case RPC_PROTOCOL::FASTDDS: + rq_prefix = FASTDDS_REQUEST_PREFIX; + rq_suffix = FASTDDS_REQUEST_SUFFIX; + rp_prefix = FASTDDS_REPLY_PREFIX; + rp_suffix = FASTDDS_REPLY_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service->service_name << ": unknown RPC protocol."); + return false; + } DdsTopic topic_request; - std::string topic_request_name = std::string(REQUEST_PREFIX) + service->service_name + REQUEST_SUFFIX; + std::string topic_request_name = rq_prefix + service->service_name + rq_suffix; if(!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) return false; service->add_topic(topic_request, RpcUtils::RPC_REQUEST); DdsTopic topic_reply; - std::string topic_reply_name = std::string(REPLY_PREFIX) + service->service_name + REPLY_SUFFIX; + std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; if(!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) return false; service->add_topic(topic_reply, RpcUtils::RPC_REPLY); @@ -578,7 +608,8 @@ bool EnablerParticipant::fullfill_service_type_nts_( } bool EnablerParticipant::query_service_nts_( - std::shared_ptr service) + std::shared_ptr service, + RPC_PROTOCOL rpc_protocol) { if(!service_query_callback_) { @@ -602,11 +633,12 @@ bool EnablerParticipant::query_service_nts_( return false; } - return fullfill_service_type_nts_(service_info, service); + return fullfill_service_type_nts_(service_info, service, rpc_protocol); } bool EnablerParticipant::query_action_nts_( ActionDiscovered& action, + RPC_PROTOCOL rpc_protocol, std::unique_lock& lck) { if(!action_query_callback_) @@ -646,10 +678,11 @@ bool EnablerParticipant::query_action_nts_( } } - std::shared_ptr goal_service = std::make_shared(goal_service_name); + std::shared_ptr goal_service = std::make_shared(goal_service_name, rpc_protocol); if(!fullfill_service_type_nts_( action_info.goal, - goal_service)) + goal_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : goal service type not found."); @@ -664,10 +697,11 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(goal_service_name, goal_service); action.goal = goal_service; - std::shared_ptr cancel_service = std::make_shared(cancel_service_name); + std::shared_ptr cancel_service = std::make_shared(cancel_service_name, rpc_protocol); if(!fullfill_service_type_nts_( action_info.cancel, - cancel_service)) + cancel_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : cancel service type not found."); @@ -682,10 +716,11 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(cancel_service_name, cancel_service); action.cancel = cancel_service; - std::shared_ptr result_service = std::make_shared(result_service_name); + std::shared_ptr result_service = std::make_shared(result_service_name, rpc_protocol); if(!fullfill_service_type_nts_( action_info.result, - result_service)) + result_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : result service type not found."); @@ -700,7 +735,22 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(result_service_name, result_service); action.result = result_service; - std::string feedback_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; + std::string prefix; + switch (rpc_protocol) + { + case RPC_PROTOCOL::ROS2: + prefix = ROS_TOPIC_PREFIX; + break; + case RPC_PROTOCOL::FASTDDS: + prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : unsupported RPC protocol."); + return false; + } + + std::string feedback_topic_name = prefix + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; DdsTopic feedback_topic; if(!fill_topic_struct_nts_( feedback_topic_name, @@ -726,7 +776,7 @@ bool EnablerParticipant::query_action_nts_( action.feedback = feedback_topic; action.feedback_discovered = true; - std::string status_topic_name = participants::TOPIC_PREFIX + action.action_name + participants::ACTION_STATUS_SUFFIX; + std::string status_topic_name = prefix + action.action_name + participants::ACTION_STATUS_SUFFIX; DdsTopic status_topic; if(!fill_topic_struct_nts_( status_topic_name, diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 9c58f752..bd29f978 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -155,7 +155,8 @@ void Handler::add_data( } std::string rpc_name; - RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(topic.m_topic_name, rpc_name); + RPC_PROTOCOL rpc_protocol; + RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(topic.m_topic_name, rpc_name, rpc_protocol); switch (rpc_type) { case RpcUtils::RpcType::RPC_NONE: @@ -629,7 +630,8 @@ bool Handler::store_action_request( const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const RpcUtils::ActionType action_type) + const RpcUtils::ActionType action_type, + const RPC_PROTOCOL rpc_protocol) { std::lock_guard lock(mtx_); @@ -661,7 +663,7 @@ bool Handler::store_action_request( "Cannot store action request, action does not exist and request type is not GOAL."); return false; } - action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id); + action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id, rpc_protocol); } return true; @@ -741,6 +743,19 @@ bool Handler::is_UUID_active( return false; } +RPC_PROTOCOL Handler::get_action_rpc_protocol( + const std::string& action_name, + const UUID& action_id) +{ + std::lock_guard lock(mtx_); + auto it = action_request_id_to_uuid_.find(action_id); + if (it != action_request_id_to_uuid_.end() && action_name == it->second.action_name) + { + return it->second.rpc_protocol; + } + + return RPC_PROTOCOL::UNKNOWN; +} bool Handler::get_action_request_UUID( const uint64_t request_id, diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 6cb68b90..20e5e62e 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -34,86 +34,108 @@ namespace RpcUtils { * @param [in] topic_name Topic name to extract the service name from * @return Extracted service name */ -RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name) +RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL& rpc_protocol) { - std::string original_topic_name = topic_name; - rpc_name = topic_name; + rpc_protocol = detect_rpc_protocol(topic_name); - bool is_request = false; + return remove_prefix_suffix(topic_name, rpc_name, rpc_protocol); +} - // Detect and remove prefix - if (rpc_name.rfind(REQUEST_PREFIX, 0) == 0) +RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name) +{ + if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) { - is_request = true; - rpc_name = rpc_name.substr(3); + return RPC_PROTOCOL::ROS2; } - else if (rpc_name.rfind(REPLY_PREFIX, 0) == 0) + else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) { - rpc_name = rpc_name.substr(3); + return RPC_PROTOCOL::FASTDDS; } - else + return RPC_PROTOCOL::UNKNOWN; +} + +RpcType remove_prefix_suffix( + const std::string& topic_name, + std::string& rpc_name, + RPC_PROTOCOL rpc_protocol) +{ + std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; + switch (rpc_protocol) + { + case RPC_PROTOCOL::ROS2: + request_prefix = ROS_REQUEST_PREFIX; + request_suffix = ROS_REQUEST_SUFFIX; + reply_prefix = ROS_REPLY_PREFIX; + reply_suffix = ROS_REPLY_SUFFIX; + topic_prefix = ROS_TOPIC_PREFIX; + break; + case RPC_PROTOCOL::FASTDDS: + request_prefix = FASTDDS_REQUEST_PREFIX; + request_suffix = FASTDDS_REQUEST_SUFFIX; + reply_prefix = FASTDDS_REPLY_PREFIX; + reply_suffix = FASTDDS_REPLY_SUFFIX; + topic_prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, + "Invalid RPC protocol"); + return RPC_NONE; + } + + std::string original_topic_name = topic_name; + rpc_name = topic_name; + RpcType rpc_type = RPC_NONE; + + if ((rpc_name.rfind(request_prefix, 0) == 0) && + (rpc_name.size() >= request_suffix.length()) && + (rpc_name.substr(rpc_name.size() - request_suffix.length()) == request_suffix)) { - // Check for action feedback/status topics - if (rpc_name.size() >= 9 && rpc_name.substr(rpc_name.size() - 9) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + std::string base = rpc_name.substr(request_prefix.length()); + base = base.substr(0, base.size() - (request_suffix.length())); + + if (base.size() >= (sizeof(ACTION_GOAL_SUFFIX) -1) && base.substr(base.size() - (sizeof(ACTION_GOAL_SUFFIX) -1)) == ACTION_GOAL_SUFFIX) { - rpc_name = rpc_name.substr(0, rpc_name.size() - 8); - rpc_name = rpc_name.substr(3); - return ACTION_FEEDBACK; + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_GOAL_SUFFIX) -1)); + return ACTION_GOAL_REQUEST; } - else if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == (std::string("/") + ACTION_STATUS_SUFFIX)) + else if (base.size() >= (sizeof(ACTION_RESULT_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)) == ACTION_RESULT_SUFFIX) { - rpc_name = rpc_name.substr(0, rpc_name.size() - 6); - rpc_name = rpc_name.substr(3); - return ACTION_STATUS; + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)); + return ACTION_RESULT_REQUEST; } - - return RPC_NONE; - } - - // Check for action-related services - if (is_request) - { - if (rpc_name.size() >= 7 && rpc_name.substr(rpc_name.size() - 7) == REQUEST_SUFFIX) + else if (base.size() >= (sizeof(ACTION_CANCEL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)) == ACTION_CANCEL_SUFFIX) { - std::string base = rpc_name.substr(0, rpc_name.size() - 7); - - if (base.size() >= 9 && base.substr(base.size() - 9) == ACTION_GOAL_SUFFIX) - { - rpc_name = base.substr(0, base.size() - 9); - return ACTION_GOAL_REQUEST; - } - else if (base.size() >= 10 && base.substr(base.size() - 10) == ACTION_RESULT_SUFFIX) - { - rpc_name = base.substr(0, base.size() - 10); - return ACTION_RESULT_REQUEST; - } - else if (base.size() >= 11 && base.substr(base.size() - 11) == ACTION_CANCEL_SUFFIX) - { - rpc_name = base.substr(0, base.size() - 11); - return ACTION_CANCEL_REQUEST; - } - - rpc_name = base; - return RPC_REQUEST; + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)); + return ACTION_CANCEL_REQUEST; } + + rpc_name = base; + return RPC_REQUEST; } - else if (rpc_name.size() >= 5 && rpc_name.substr(rpc_name.size() - 5) == REPLY_SUFFIX) + if ((rpc_name.rfind(reply_prefix, 0) == 0) && + (rpc_name.size() >= reply_suffix.length()) && + (rpc_name.substr(rpc_name.size() - reply_suffix.length()) == reply_suffix)) { - std::string base = rpc_name.substr(0, rpc_name.size() - 5); + std::string base = rpc_name.substr(reply_prefix.length()); + base = base.substr(0, base.size() - (reply_suffix.length())); - if (base.size() >= 9 && base.substr(base.size() - 9) == ACTION_GOAL_SUFFIX) + if (base.size() >= (sizeof(ACTION_GOAL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_GOAL_SUFFIX) - 1)) == ACTION_GOAL_SUFFIX) { - rpc_name = base.substr(0, base.size() - 9); + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_GOAL_SUFFIX) - 1)); return ACTION_GOAL_REPLY; } - else if (base.size() >= 10 && base.substr(base.size() - 10) == ACTION_RESULT_SUFFIX) + else if (base.size() >= (sizeof(ACTION_RESULT_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)) == ACTION_RESULT_SUFFIX) { - rpc_name = base.substr(0, base.size() - 10); + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)); return ACTION_RESULT_REPLY; } - else if (base.size() >= 11 && base.substr(base.size() - 11) == ACTION_CANCEL_SUFFIX) + else if (base.size() >= (sizeof(ACTION_CANCEL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)) == ACTION_CANCEL_SUFFIX) { - rpc_name = base.substr(0, base.size() - 11); + rpc_name = base.substr(0, base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)); return ACTION_CANCEL_REPLY; } @@ -121,30 +143,41 @@ RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name) return RPC_REPLY; } - rpc_name = original_topic_name; // Restore original topic name if no suffix matched - EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, - "Invalid topic name for service: " << original_topic_name << ". Expected suffix 'Request' or 'Reply'."); + // Check for action feedback/status topics + rpc_name = rpc_name.substr(topic_prefix.length()); + if (rpc_name.size() >= (sizeof(ACTION_FEEDBACK_SUFFIX)) && rpc_name.substr(rpc_name.size() - (sizeof(ACTION_FEEDBACK_SUFFIX))) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + { + rpc_name = rpc_name.substr(0, rpc_name.size() - sizeof(ACTION_FEEDBACK_SUFFIX)); + return ACTION_FEEDBACK; + } + else if (rpc_name.size() >= (sizeof(ACTION_STATUS_SUFFIX)) && rpc_name.substr(rpc_name.size() - (sizeof(ACTION_STATUS_SUFFIX))) == (std::string("/") + ACTION_STATUS_SUFFIX)) + { + rpc_name = rpc_name.substr(0, rpc_name.size() - (sizeof(ACTION_STATUS_SUFFIX))); + return ACTION_STATUS; + } + return RPC_NONE; } +// TODO RpcType get_service_name(const std::string& topic_name, std::string& service_name) { service_name = topic_name; // Detect and remove prefix - if (service_name.rfind(REQUEST_PREFIX, 0) == 0) + if (service_name.rfind(ROS_REQUEST_PREFIX, 0) == 0) { service_name = service_name.substr(3); - if (service_name.size() >= 7 && service_name.substr(service_name.size() - 7) == REQUEST_SUFFIX) + if (service_name.size() >= 7 && service_name.substr(service_name.size() - 7) == ROS_REQUEST_SUFFIX) { service_name = service_name.substr(0, service_name.size() - 7); return RPC_REQUEST; } } - else if (service_name.rfind(REPLY_PREFIX, 0) == 0) + else if (service_name.rfind(ROS_REPLY_PREFIX, 0) == 0) { service_name = service_name.substr(3); - if (service_name.size() >= 5 && service_name.substr(service_name.size() - 5) == REPLY_SUFFIX) + if (service_name.size() >= 5 && service_name.substr(service_name.size() - 5) == ROS_REPLY_SUFFIX) { service_name = service_name.substr(0, service_name.size() - 5); return RPC_REPLY; From ef433b6fed820630b60f5bfb6e9cd8def69bb818 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 26 Aug 2025 14:24:05 +0200 Subject: [PATCH 27/87] Update docs Signed-off-by: Eugenio Collado --- ddsenabler_docs/docs/ddsenabler/installation/linux.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst index d8b7c2cd..975d8e3f 100644 --- a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst +++ b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst @@ -272,6 +272,10 @@ Run an example In this section, we will run a publish example mimicking the behavior of the classic *Hello World* ROS 2 talker in a specific domain. For simplicity, we will use the *eProsima DDS Enabler* example application with the already provided configuration file and sample data from a test case in the *dds_enabler_test* package. +.. note:: + + To run a service or action example, please refer to the corresponding readme in the examples folder. + To run this *eProsima DDS Enabler* example, source the installation path and execute the executable file that has been installed in :code:`/dds_enabler_tool/bin/dds_enabler`: .. code-block:: bash @@ -286,7 +290,7 @@ To run this *eProsima DDS Enabler* example, source the installation path and exe cd source install/setup.bash export TEST_PATH=$PWD/src/DDS-Enabler/ddsenabler_test/compose/test_cases/publish/discovered_type - ./build/ddsenabler/examples/ddsenabler_example --config $TEST_PATH/config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000 + ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config $TEST_PATH/config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000 .. important:: From b294b581d221fcd32dc93193dfcef965af0beabf Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 29 Aug 2025 11:50:14 +0200 Subject: [PATCH 28/87] Fix action identification Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/RpcUtils.cpp | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 20e5e62e..3fcdd324 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -97,19 +97,19 @@ RpcType remove_prefix_suffix( std::string base = rpc_name.substr(request_prefix.length()); base = base.substr(0, base.size() - (request_suffix.length())); - if (base.size() >= (sizeof(ACTION_GOAL_SUFFIX) -1) && base.substr(base.size() - (sizeof(ACTION_GOAL_SUFFIX) -1)) == ACTION_GOAL_SUFFIX) + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_GOAL_SUFFIX) -1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); return ACTION_GOAL_REQUEST; } - else if (base.size() >= (sizeof(ACTION_RESULT_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)) == ACTION_RESULT_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); return ACTION_RESULT_REQUEST; } - else if (base.size() >= (sizeof(ACTION_CANCEL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)) == ACTION_CANCEL_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); return ACTION_CANCEL_REQUEST; } @@ -123,19 +123,19 @@ RpcType remove_prefix_suffix( std::string base = rpc_name.substr(reply_prefix.length()); base = base.substr(0, base.size() - (reply_suffix.length())); - if (base.size() >= (sizeof(ACTION_GOAL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_GOAL_SUFFIX) - 1)) == ACTION_GOAL_SUFFIX) + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_GOAL_SUFFIX) - 1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); return ACTION_GOAL_REPLY; } - else if (base.size() >= (sizeof(ACTION_RESULT_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)) == ACTION_RESULT_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_RESULT_SUFFIX) - 1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); return ACTION_RESULT_REPLY; } - else if (base.size() >= (sizeof(ACTION_CANCEL_SUFFIX) - 1) && base.substr(base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)) == ACTION_CANCEL_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (sizeof(ACTION_CANCEL_SUFFIX) - 1)); + rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); return ACTION_CANCEL_REPLY; } @@ -145,14 +145,14 @@ RpcType remove_prefix_suffix( // Check for action feedback/status topics rpc_name = rpc_name.substr(topic_prefix.length()); - if (rpc_name.size() >= (sizeof(ACTION_FEEDBACK_SUFFIX)) && rpc_name.substr(rpc_name.size() - (sizeof(ACTION_FEEDBACK_SUFFIX))) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + if (rpc_name.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && rpc_name.substr(rpc_name.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { - rpc_name = rpc_name.substr(0, rpc_name.size() - sizeof(ACTION_FEEDBACK_SUFFIX)); + rpc_name = rpc_name.substr(0, rpc_name.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); return ACTION_FEEDBACK; } - else if (rpc_name.size() >= (sizeof(ACTION_STATUS_SUFFIX)) && rpc_name.substr(rpc_name.size() - (sizeof(ACTION_STATUS_SUFFIX))) == (std::string("/") + ACTION_STATUS_SUFFIX)) + else if (rpc_name.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && rpc_name.substr(rpc_name.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == (std::string("/") + ACTION_STATUS_SUFFIX)) { - rpc_name = rpc_name.substr(0, rpc_name.size() - (sizeof(ACTION_STATUS_SUFFIX))); + rpc_name = rpc_name.substr(0, rpc_name.size() - (std::strlen(ACTION_STATUS_SUFFIX))); return ACTION_STATUS; } From 6a0dfe4c51d7b97daa4875092dcf0c0d5e5837e4 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 29 Aug 2025 15:36:23 +0200 Subject: [PATCH 29/87] Refactor RPC utils types and structures Signed-off-by: Eugenio Collado --- ddsenabler/src/cpp/DDSEnabler.cpp | 4 +- .../EnablerParticipant.hpp | 12 +- .../ddsenabler_participants/Handler.hpp | 12 +- .../ddsenabler_participants/RpcStructs.hpp | 106 +++++-- .../ddsenabler_participants/RpcTypes.hpp | 31 +- .../ddsenabler_participants/RpcUtils.hpp | 78 +---- .../ddsenabler_participants/Writer.hpp | 4 +- .../src/cpp/EnablerParticipant.cpp | 75 +++-- ddsenabler_participants/src/cpp/Handler.cpp | 299 ++++++++++-------- ddsenabler_participants/src/cpp/RpcUtils.cpp | 178 ++++------- ddsenabler_participants/src/cpp/Writer.cpp | 8 +- 11 files changed, 394 insertions(+), 413 deletions(-) diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 85d3c4ab..cf288441 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -389,7 +389,7 @@ bool DDSEnabler::send_action_goal( action_name, action_id, goal_request_id, - RpcUtils::ActionType::GOAL, + ACTION_TYPE::ACTION_GOAL, rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, @@ -424,7 +424,7 @@ bool DDSEnabler::send_action_get_result_request( action_name, action_id, get_result_request_id, - RpcUtils::ActionType::RESULT)) + ACTION_TYPE::ACTION_RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action get result request to action " << action_name diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 02f56705..df80801b 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -154,16 +154,12 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& topic_name) const; bool service_discovered_nts_( - const std::string& service_name, - const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type, - RPC_PROTOCOL rpc_protocol); + const RpcInfo& rpc_info, + const ddspipe::core::types::DdsTopic& topic); bool action_discovered_nts_( - const std::string& action_name, - const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type, - RPC_PROTOCOL rpc_protocol); + const RpcInfo& rpc_info, + const ddspipe::core::types::DdsTopic& topic); bool revoke_service_nts_( const std::string& service_name); diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index c10a9a10..8766118d 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -141,7 +141,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ DDSENABLER_PARTICIPANTS_DllAPI void add_action( - const RpcUtils::RpcAction& action); + const RpcAction& action); /** * @brief Add a data sample, associated to the given \c topic. @@ -199,7 +199,7 @@ class Handler : public ddspipe::participants::ISchemaHandler const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const RpcUtils::ActionType action_type, + const ACTION_TYPE action_type, const RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); /** @@ -253,7 +253,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * * @param [in] action_name Name of the action. * @param [in] action_id UUID of the action to be checked. - * @return The RPC protocol of the action, or RPC_PROTOCOL::UNKNOWN if the action is not found. + * @return The RPC protocol of the action, or RPC_PROTOCOL::PROTOCOL_UNKNOWN if the action is not found. */ DDSENABLER_PARTICIPANTS_DllAPI RPC_PROTOCOL get_action_rpc_protocol( @@ -422,7 +422,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ bool get_action_request_UUID( const uint64_t request_id, - const RpcUtils::ActionType action_type, + const ACTION_TYPE action_type, UUID& action_id); /** @@ -493,7 +493,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * @param [in] action RPC action associated to this action. */ void write_action_nts_( - const RpcUtils::RpcAction& action); + const RpcAction& action); /** * @brief Write to user's app. * @@ -603,7 +603,7 @@ class Handler : public ddspipe::participants::ISchemaHandler const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const RpcUtils::RpcType& rpc_type); + const ACTION_TYPE action_type); /** * @brief Register a type using the given serialized type data. diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index 66fb0c70..9eb77b69 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -21,7 +21,7 @@ #include #include -#include +#include namespace eprosima { namespace ddsenabler { @@ -34,13 +34,60 @@ enum class ActionEraseReason FORCED // Force erase regardless of status/result }; +struct RpcAction +{ + RpcAction() = default; + RpcAction( + const std::string& action_name, + const ddspipe::core::types::RpcTopic& goal, + const ddspipe::core::types::RpcTopic& result, + const ddspipe::core::types::RpcTopic& cancel, + const ddspipe::core::types::DdsTopic& feedback, + const ddspipe::core::types::DdsTopic& status) + : action_name(action_name) + , goal(goal) + , result(result) + , cancel(cancel) + , feedback(feedback) + , status(status) + { + } + + std::string action_name; + ddspipe::core::types::RpcTopic goal; + ddspipe::core::types::RpcTopic result; + ddspipe::core::types::RpcTopic cancel; + ddspipe::core::types::DdsTopic feedback; + ddspipe::core::types::DdsTopic status; +}; + +struct RpcInfo +{ + RpcInfo(const std::string& dds_topic_name) + : topic_name(dds_topic_name) + , rpc_protocol(RPC_PROTOCOL::PROTOCOL_UNKNOWN) + , rpc_type(RPC_TYPE::RPC_NONE) + , service_type(SERVICE_TYPE::SERVICE_NONE) + , action_type(ACTION_TYPE::ACTION_NONE) + { + } + + std::string topic_name; + std::string service_name; + std::string action_name; + RPC_PROTOCOL rpc_protocol; + RPC_TYPE rpc_type; + SERVICE_TYPE service_type; + ACTION_TYPE action_type; +}; + struct ActionRequestInfo { ActionRequestInfo() = default; ActionRequestInfo( const std::string& _action_name, - RpcUtils::ActionType action_type, + ACTION_TYPE action_type, uint64_t request_id, RPC_PROTOCOL rpc_protocol) : action_name(_action_name) @@ -52,14 +99,14 @@ struct ActionRequestInfo void set_request( uint64_t request_id, - RpcUtils::ActionType action_type) + ACTION_TYPE action_type) { switch (action_type) { - case RpcUtils::ActionType::GOAL: + case ACTION_TYPE::ACTION_GOAL: goal_request_id = request_id; break; - case RpcUtils::ActionType::RESULT: + case ACTION_TYPE::ACTION_RESULT: result_request_id = request_id; break; default: @@ -69,13 +116,13 @@ struct ActionRequestInfo } uint64_t get_request( - RpcUtils::ActionType action_type) const + ACTION_TYPE action_type) const { switch (action_type) { - case RpcUtils::ActionType::GOAL: + case ACTION_TYPE::ACTION_GOAL: return goal_request_id; - case RpcUtils::ActionType::RESULT: + case ACTION_TYPE::ACTION_RESULT: return result_request_id; default: return 0; @@ -137,7 +184,7 @@ struct ServiceDiscovered } std::string service_name; - RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::UNKNOWN}; + RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::PROTOCOL_UNKNOWN}; ddspipe::core::types::DdsTopic topic_request; bool request_discovered{false}; @@ -153,9 +200,9 @@ struct ServiceDiscovered bool add_topic( const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type) + SERVICE_TYPE service_type) { - if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + if(service_type == SERVICE_TYPE::SERVICE_REQUEST) { if(request_discovered) return false; @@ -187,9 +234,9 @@ struct ServiceDiscovered return false; } - bool remove_topic(RpcUtils::RpcType rpc_type) + bool remove_topic(SERVICE_TYPE service_type) { - if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + if(service_type == SERVICE_TYPE::SERVICE_REQUEST) { request_discovered = false; topic_request = ddspipe::core::types::DdsTopic(); @@ -214,17 +261,17 @@ struct ServiceDiscovered } bool get_topic( - const RpcUtils::RpcType& rpc_type, + SERVICE_TYPE service_type, ddspipe::core::types::DdsTopic& topic) { - if(rpc_type == RpcUtils::RpcType::RPC_REQUEST) + if(service_type == SERVICE_TYPE::SERVICE_REQUEST) { if(!request_discovered) return false; topic = topic_request; return true; } - if (rpc_type == RpcUtils::RpcType::RPC_REPLY) + if (service_type == SERVICE_TYPE::SERVICE_REPLY) { if(!reply_discovered) return false; @@ -251,7 +298,7 @@ struct ActionDiscovered } std::string action_name; - RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::UNKNOWN}; + RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::PROTOCOL_UNKNOWN}; std::weak_ptr goal; std::weak_ptr result; std::weak_ptr cancel; @@ -281,20 +328,17 @@ struct ActionDiscovered bool add_service( std::shared_ptr service, - RpcUtils::RpcType rpc_type) + ACTION_TYPE action_type) { - switch (rpc_type) + switch (action_type) { - case RpcUtils::RpcType::ACTION_GOAL_REQUEST: - case RpcUtils::RpcType::ACTION_GOAL_REPLY: + case ACTION_TYPE::ACTION_GOAL: goal = service; break; - case RpcUtils::RpcType::ACTION_RESULT_REQUEST: - case RpcUtils::RpcType::ACTION_RESULT_REPLY: + case ACTION_TYPE::ACTION_RESULT: result = service; break; - case RpcUtils::RpcType::ACTION_CANCEL_REQUEST: - case RpcUtils::RpcType::ACTION_CANCEL_REPLY: + case ACTION_TYPE::ACTION_CANCEL: cancel = service; break; default: @@ -306,15 +350,15 @@ struct ActionDiscovered bool add_topic( const ddspipe::core::types::DdsTopic& topic, - RpcUtils::RpcType rpc_type) + ACTION_TYPE action_type) { - switch (rpc_type) + switch (action_type) { - case RpcUtils::RpcType::ACTION_FEEDBACK: + case ACTION_TYPE::ACTION_FEEDBACK: feedback = topic; feedback_discovered = true; break; - case RpcUtils::RpcType::ACTION_STATUS: + case ACTION_TYPE::ACTION_STATUS: status = topic; status_discovered = true; break; @@ -325,7 +369,7 @@ struct ActionDiscovered return true; } - RpcUtils::RpcAction get_action(const std::string& action_name) + RpcAction get_action() { auto g = goal.lock(); auto r = result.lock(); @@ -334,7 +378,7 @@ struct ActionDiscovered if (!fully_discovered || !g || !r || !c) throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); - return RpcUtils::RpcAction( + return RpcAction( action_name, g->get_service(), r->get_service(), diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp index 88b0ad94..0f1ca362 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -20,6 +20,9 @@ #include #include +#include +#include + #pragma once namespace eprosima { @@ -31,7 +34,31 @@ using UUID = std::array; enum RPC_PROTOCOL { ROS2 = 0, FASTDDS, - UNKNOWN + PROTOCOL_UNKNOWN +}; + +enum RPC_TYPE +{ + RPC_NONE = 0, + RPC_SERVICE, + RPC_ACTION +}; + +enum SERVICE_TYPE +{ + SERVICE_NONE = 0, + SERVICE_REQUEST, + SERVICE_REPLY +}; + +enum ACTION_TYPE +{ + ACTION_NONE = 0, + ACTION_GOAL, + ACTION_RESULT, + ACTION_CANCEL, + ACTION_FEEDBACK, + ACTION_STATUS }; enum STATUS_CODE { @@ -46,7 +73,7 @@ enum STATUS_CODE { STATUS_TIMEOUT, STATUS_FAILED, STATUS_CANCEL_REQUEST_FAILED - }; +}; enum CANCEL_CODE { ERROR_NONE = 0, diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index b1413557..bcdc40d0 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -20,97 +20,27 @@ #include -#include -#include #include #include +#include +#include namespace eprosima { namespace ddsenabler { namespace participants { namespace RpcUtils { -struct RpcAction -{ - RpcAction() = default; - RpcAction( - const std::string& action_name, - const ddspipe::core::types::RpcTopic& goal, - const ddspipe::core::types::RpcTopic& result, - const ddspipe::core::types::RpcTopic& cancel, - const ddspipe::core::types::DdsTopic& feedback, - const ddspipe::core::types::DdsTopic& status) - : action_name(action_name) - , goal(goal) - , result(result) - , cancel(cancel) - , feedback(feedback) - , status(status) - { - } - - std::string action_name; - ddspipe::core::types::RpcTopic goal; - ddspipe::core::types::RpcTopic result; - ddspipe::core::types::RpcTopic cancel; - ddspipe::core::types::DdsTopic feedback; - ddspipe::core::types::DdsTopic status; -}; - -enum RpcType -{ - RPC_NONE = 0, - RPC_REQUEST, - RPC_REPLY, - ACTION_GOAL_REQUEST, - ACTION_GOAL_REPLY, - ACTION_RESULT_REQUEST, - ACTION_RESULT_REPLY, - ACTION_CANCEL_REQUEST, - ACTION_CANCEL_REPLY, - ACTION_FEEDBACK, - ACTION_STATUS -}; - -enum ActionType -{ - NONE = 0, - GOAL, - RESULT, - CANCEL, - FEEDBACK, - STATUS -}; - /** * @brief Extracts the service/action name from a given topic name. * * @param [in] topic_name Topic name to extract the service/action name from * @return Extracted service name */ -RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL& rpc_protocol); +RpcInfo get_rpc_info(const std::string& topic_name); RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name); -RpcType remove_prefix_suffix(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL rpc_protocol); - -RpcType get_service_name(const std::string& topic_name, std::string& service_name); - -/** - * @brief Returns the service direction (request or reply) based on the RPC type. - * - * @param rpc_type The RPC type to check. - * @return The service direction (request or reply) or NONE if it is not a service. - */ -RpcType get_service_direction(RpcType rpc_type); - -/** - * @brief Returns the action type based on the RPC type. - * - * @param rpc_type The RPC type to check. - * @return The action type (goal, result, cancel, feedback, status). - */ -ActionType get_action_type(RpcType rpc_type); +RpcInfo remove_prefix_suffix(const std::string& topic_name, RPC_PROTOCOL rpc_protocol); /** * @brief Generates a UUID. diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index d77b80f0..5dc9d583 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -189,7 +189,7 @@ class Writer DDSENABLER_PARTICIPANTS_DllAPI void write_action_notification( - const RpcUtils::RpcAction& action); + const RpcAction& action); DDSENABLER_PARTICIPANTS_DllAPI void write_action_result_notification( @@ -230,7 +230,7 @@ class Writer const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const RpcUtils::RpcType& rpc_type); + const ACTION_TYPE action_type); DDSENABLER_PARTICIPANTS_DllAPI void set_is_UUID_active_callback( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index e8f6afe2..ea19f4f7 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -47,40 +47,34 @@ EnablerParticipant::EnablerParticipant( } bool EnablerParticipant::service_discovered_nts_( - const std::string& service_name, - const DdsTopic& topic, - RpcUtils::RpcType rpc_type, - RPC_PROTOCOL rpc_protocol) + const RpcInfo& rpc_info, + const DdsTopic& topic) { - auto [it, inserted] = services_.try_emplace(service_name, std::make_shared(service_name, rpc_protocol)); - return it->second->add_topic(topic, rpc_type); + auto [it, inserted] = services_.try_emplace(rpc_info.service_name, std::make_shared(rpc_info.service_name, rpc_info.rpc_protocol)); + return it->second->add_topic(topic, rpc_info.service_type); } bool EnablerParticipant::action_discovered_nts_( - const std::string& action_name, - const DdsTopic& topic, - RpcUtils::RpcType rpc_type, - RPC_PROTOCOL rpc_protocol) + const RpcInfo& rpc_info, + const DdsTopic& topic) { - auto [it, inserted] = actions_.try_emplace(action_name, ActionDiscovered(action_name, rpc_protocol)); - std::string service_name; - RpcUtils::RpcType service_direction = RpcUtils::get_service_name(topic.m_topic_name, service_name); - if (RpcUtils::RpcType::RPC_NONE != service_direction) + auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); + if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) { - service_discovered_nts_(service_name, topic, service_direction, rpc_protocol); - auto service_it = services_.find(service_name); + service_discovered_nts_(rpc_info, topic); + auto service_it = services_.find(rpc_info.service_name); if (services_.end() == service_it) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Service " << service_name << " not found in action " << action_name); + "Service " << rpc_info.service_name << " not found in action " << rpc_info.action_name); return false; } - it->second.add_service(service_it->second, rpc_type); + it->second.add_service(service_it->second, rpc_info.action_type); } else { - it->second.add_topic(topic, rpc_type); + it->second.add_topic(topic, rpc_info.action_type); } return it->second.check_fully_discovered(); @@ -98,13 +92,10 @@ std::shared_ptr EnablerParticipant::create_reader( { std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); - std::string rpc_name; - RPC_PROTOCOL rpc_protocol; - RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(dds_topic.m_topic_name, rpc_name, rpc_protocol); - if (RpcUtils::RpcType::RPC_NONE != rpc_type) + RpcInfo rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); + if (RPC_TYPE::RPC_NONE != rpc_info.rpc_type) { - RpcUtils::RpcType rpc_direction = RpcUtils::get_service_direction(rpc_type); - if (RpcUtils::RpcType::RPC_NONE != rpc_direction) + if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) reader = std::make_shared(id(), dds_topic); else reader = std::make_shared(id()); @@ -112,19 +103,19 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - if (RpcUtils::ActionType::NONE == RpcUtils::get_action_type(rpc_type)) + if (ACTION_TYPE::ACTION_NONE == rpc_info.action_type) { - if (service_discovered_nts_(rpc_name, dds_topic, rpc_type, rpc_protocol)) + if (service_discovered_nts_(rpc_info, dds_topic)) { - RpcTopic service = services_.find(rpc_name)->second->get_service(); + RpcTopic service = services_.find(rpc_info.service_name)->second->get_service(); std::static_pointer_cast(schema_handler_)->add_service(service); } } else { - if (action_discovered_nts_(rpc_name, dds_topic, rpc_type, rpc_protocol)) + if (action_discovered_nts_(rpc_info, dds_topic)) { - auto action = actions_.find(rpc_name)->second.get_action(rpc_name); + auto action = actions_.find(rpc_info.action_name)->second.get_action(); std::static_pointer_cast(schema_handler_)->add_action(action); } } @@ -238,14 +229,20 @@ bool EnablerParticipant::publish_rpc( std::unique_lock lck(mtx_); std::string service_name; - RpcUtils::RpcType rpc_type = RpcUtils::get_service_name(topic_name, service_name); + RpcInfo rpc_info = RpcUtils::get_rpc_info(topic_name); + if (SERVICE_TYPE::SERVICE_NONE == rpc_info.service_type) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << " : not a service topic."); + return false; + } - auto it = services_.find(service_name); + auto it = services_.find(rpc_info.service_name); if (it == services_.end()) { // There is no case where none of the service topics are discovered and yet the publish should be done EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << service_name << " : service does not exist."); + "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); return false; } @@ -255,12 +252,12 @@ bool EnablerParticipant::publish_rpc( if (nullptr == reader) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << service_name << " : service does not exist."); + "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); return false; } DdsTopic topic; - if (!it->second->get_topic(rpc_type, topic)) + if (!it->second->get_topic(rpc_info.service_type, topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in service " << service_name << " : topic not found."); @@ -398,7 +395,7 @@ bool EnablerParticipant::revoke_service_nts_( this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); it->second->endpoint_request.reset(); - it->second->remove_topic(RpcUtils::RpcType::RPC_REQUEST); + it->second->remove_topic(SERVICE_TYPE::SERVICE_REQUEST); auto reader = lookup_reader_nts_(request_name); if (nullptr != reader) @@ -419,7 +416,7 @@ RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( return it->second->get_rpc_protocol(); } - return RPC_PROTOCOL::UNKNOWN; + return RPC_PROTOCOL::PROTOCOL_UNKNOWN; } bool EnablerParticipant::announce_action( @@ -592,13 +589,13 @@ bool EnablerParticipant::fullfill_service_type_nts_( std::string topic_request_name = rq_prefix + service->service_name + rq_suffix; if(!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) return false; - service->add_topic(topic_request, RpcUtils::RPC_REQUEST); + service->add_topic(topic_request, SERVICE_TYPE::SERVICE_REQUEST); DdsTopic topic_reply; std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; if(!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) return false; - service->add_topic(topic_reply, RpcUtils::RPC_REPLY); + service->add_topic(topic_reply, SERVICE_TYPE::SERVICE_REPLY); if (!service->fully_discovered) return false; diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index bd29f978..56ac884e 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -98,7 +98,7 @@ void Handler::add_service( } void Handler::add_action( - const RpcUtils::RpcAction& action) + const RpcAction& action) { std::lock_guard lock(mtx_); @@ -154,147 +154,188 @@ void Handler::add_data( throw utils::InconsistencyException(STR_ENTRY << "Received sample with no payload."); } - std::string rpc_name; - RPC_PROTOCOL rpc_protocol; - RpcUtils::RpcType rpc_type = RpcUtils::get_rpc_name(topic.m_topic_name, rpc_name, rpc_protocol); - switch (rpc_type) + RpcInfo rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); + switch (rpc_info.rpc_type) { - case RpcUtils::RpcType::RPC_NONE: - write_sample_nts_(msg, dyn_type); - break; - - // SERVICES - case RpcUtils::RpcType::RPC_REQUEST: - { - requests_id_++; - RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); - write_service_request_nts_(msg, dyn_type, requests_id_, rpc_name); - break; - } - - case RpcUtils::RpcType::RPC_REPLY: - { - auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - write_service_reply_nts_(msg, dyn_type, request_id, rpc_name); - break; - } - - // ACTIONS CLIENT - case RpcUtils::RpcType::ACTION_RESULT_REPLY: - { - auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - UUID action_id_uuid; - if (get_action_request_UUID(action_id, RpcUtils::ActionType::RESULT, action_id_uuid)) - write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_name); - erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); - break; - } - - case RpcUtils::RpcType::ACTION_GOAL_REPLY: - { - auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - UUID action_id_uuid; - if (get_action_request_UUID(action_id, RpcUtils::ActionType::GOAL, action_id_uuid)) - write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_name); - break; - } - - case RpcUtils::RpcType::ACTION_CANCEL_REPLY: - { - auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); - write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_name); - break; - } - - case RpcUtils::RpcType::ACTION_FEEDBACK: - { - write_action_feedback_nts_(msg, dyn_type, rpc_name); - break; - } - - case RpcUtils::RpcType::ACTION_STATUS: + case RPC_TYPE::RPC_NONE: { - write_action_status_nts_(msg, dyn_type, rpc_name); + write_sample_nts_(msg, dyn_type); break; } - // ACTIONS SERVER - case RpcUtils::RpcType::ACTION_GOAL_REQUEST: - case RpcUtils::RpcType::ACTION_CANCEL_REQUEST: + // SERVICE + case RPC_TYPE::RPC_SERVICE: { - requests_id_++; - RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); - UUID uuid; - if (!writer_->uuid_from_request_json( - msg, - dyn_type, - uuid)) + if (rpc_info.service_type == SERVICE_TYPE::SERVICE_REQUEST) { - EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, - "Failed to extract UUID from send_goal_request JSON."); - return; + requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); + write_service_request_nts_(msg, dyn_type, requests_id_, rpc_info.service_name); } - - if (store_action_request( - rpc_name, - uuid, - requests_id_, - RpcUtils::get_action_type(rpc_type))) + else { - write_action_request_nts_(msg, dyn_type, requests_id_, rpc_name, rpc_type); + auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + write_service_reply_nts_(msg, dyn_type, request_id, rpc_info.service_name); } - break; } - case RpcUtils::RpcType::ACTION_RESULT_REQUEST: + // ACTIONS CLIENT + case RPC_TYPE::RPC_ACTION: { - UUID uuid; - if (!writer_->uuid_from_request_json( - msg, - dyn_type, - uuid)) + switch (rpc_info.service_type) { - EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, - "Failed to extract UUID from get_result_request JSON."); - return; - } + case SERVICE_TYPE::SERVICE_REPLY: + { + switch (rpc_info.action_type) + { + case ACTION_TYPE::ACTION_RESULT: + { + auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + UUID action_id_uuid; + if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_RESULT, action_id_uuid)) + write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); + break; + } + + case ACTION_TYPE::ACTION_GOAL: + { + auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + UUID action_id_uuid; + if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_GOAL, action_id_uuid)) + write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + break; + } + + case ACTION_TYPE::ACTION_CANCEL: + { + auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_info.action_name); + break; + } + + default: + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Unknown action type for topic " << topic.m_topic_name << "."); + break; + } + } + break; + } - requests_id_++; - RpcPayloadData& rpc_data = dynamic_cast(data); - rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); - if (!store_action_request( - rpc_name, - uuid, - requests_id_, - RpcUtils::ActionType::RESULT)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, - "Failed to store action request for get_result_request."); - return; - } + case SERVICE_TYPE::SERVICE_REQUEST: + { + switch (rpc_info.action_type) + { + case ACTION_TYPE::ACTION_GOAL: + case ACTION_TYPE::ACTION_CANCEL: + { + requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); + UUID uuid; + if (!writer_->uuid_from_request_json( + msg, + dyn_type, + uuid)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to extract UUID from send_goal_request JSON."); + return; + } + + if (store_action_request( + rpc_info.action_name, + uuid, + requests_id_, + rpc_info.action_type)) + { + write_action_request_nts_(msg, dyn_type, requests_id_, rpc_info.action_name, rpc_info.action_type); + } + + break; + } + + case ACTION_TYPE::ACTION_RESULT: + { + UUID uuid; + if (!writer_->uuid_from_request_json( + msg, + dyn_type, + uuid)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to extract UUID from get_result_request JSON."); + return; + } + + requests_id_++; + RpcPayloadData& rpc_data = dynamic_cast(data); + rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); + if (!store_action_request( + rpc_info.action_name, + uuid, + requests_id_, + ACTION_TYPE::ACTION_RESULT)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Failed to store action request for get_result_request."); + return; + } + + std::string result; + if (get_action_result(uuid, result)) + { + if (send_action_get_result_reply_callback_) + { + send_action_get_result_reply_callback_( + rpc_info.action_name, + uuid, + result, + requests_id_); + } + } + break; + } + + default: + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Unknown action type for topic " << topic.m_topic_name << "."); + break; + } + break; + } - std::string result; - if (get_action_result(uuid, result)) - { - if (send_action_get_result_reply_callback_) + case SERVICE_TYPE::SERVICE_NONE: { - send_action_get_result_reply_callback_( - rpc_name, - uuid, - result, - requests_id_); + switch (rpc_info.action_type) + { + case ACTION_TYPE::ACTION_FEEDBACK: + { + write_action_feedback_nts_(msg, dyn_type, rpc_info.action_name); + break; + } + + case ACTION_TYPE::ACTION_STATUS: + { + write_action_status_nts_(msg, dyn_type, rpc_info.action_name); + break; + } + + default: + { + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, + "Unknown RPC type for topic " << topic.m_topic_name << "."); + break; + } + } + break; } } - break; } - - default: - EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, - "Unknown RPC type for topic " << topic.m_topic_name << "."); - break; } } @@ -509,7 +550,7 @@ void Handler::write_service_request_nts_( } void Handler::write_action_nts_( - const RpcUtils::RpcAction& action) + const RpcAction& action) { writer_->write_action_notification(action); } @@ -562,9 +603,9 @@ void Handler::write_action_request_nts_( const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const RpcUtils::RpcType& rpc_type) + const ACTION_TYPE action_type) { - writer_->write_action_request_notification(msg, dyn_type, request_id, action_name, rpc_type); + writer_->write_action_request_notification(msg, dyn_type, request_id, action_name, action_type); } bool Handler::register_type_nts_( @@ -630,7 +671,7 @@ bool Handler::store_action_request( const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const RpcUtils::ActionType action_type, + const ACTION_TYPE action_type, const RPC_PROTOCOL rpc_protocol) { std::lock_guard lock(mtx_); @@ -645,7 +686,7 @@ bool Handler::store_action_request( << it->second.action_name << ", got " << action_name); return false; } - if (RpcUtils::ActionType::GOAL == action_type) + if (ACTION_TYPE::ACTION_GOAL == action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action goal request as action id already exists."); @@ -657,7 +698,7 @@ bool Handler::store_action_request( else { // If it does not exist, create a new entry only if the action type is goal request - if (RpcUtils::ActionType::GOAL != action_type) + if (ACTION_TYPE::ACTION_GOAL != action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action request, action does not exist and request type is not GOAL."); @@ -754,12 +795,12 @@ RPC_PROTOCOL Handler::get_action_rpc_protocol( return it->second.rpc_protocol; } - return RPC_PROTOCOL::UNKNOWN; + return RPC_PROTOCOL::PROTOCOL_UNKNOWN; } bool Handler::get_action_request_UUID( const uint64_t request_id, - const RpcUtils::ActionType action_type, + const ACTION_TYPE action_type, UUID& action_id) { std::lock_guard lock(mtx_); diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 3fcdd324..3009aab2 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -34,11 +34,11 @@ namespace RpcUtils { * @param [in] topic_name Topic name to extract the service name from * @return Extracted service name */ -RpcType get_rpc_name(const std::string& topic_name, std::string& rpc_name, RPC_PROTOCOL& rpc_protocol) +RpcInfo get_rpc_info(const std::string& topic_name) { - rpc_protocol = detect_rpc_protocol(topic_name); + RPC_PROTOCOL rpc_protocol = detect_rpc_protocol(topic_name); - return remove_prefix_suffix(topic_name, rpc_name, rpc_protocol); + return remove_prefix_suffix(topic_name, rpc_protocol); } RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name) @@ -55,14 +55,16 @@ RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name) { return RPC_PROTOCOL::FASTDDS; } - return RPC_PROTOCOL::UNKNOWN; + return RPC_PROTOCOL::PROTOCOL_UNKNOWN; } -RpcType remove_prefix_suffix( +RpcInfo remove_prefix_suffix( const std::string& topic_name, - std::string& rpc_name, RPC_PROTOCOL rpc_protocol) { + RpcInfo rpc_info(topic_name); + rpc_info.rpc_protocol = rpc_protocol; + std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; switch (rpc_protocol) { @@ -83,155 +85,99 @@ RpcType remove_prefix_suffix( default: EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, "Invalid RPC protocol"); - return RPC_NONE; + return rpc_info; } - std::string original_topic_name = topic_name; - rpc_name = topic_name; - RpcType rpc_type = RPC_NONE; - - if ((rpc_name.rfind(request_prefix, 0) == 0) && - (rpc_name.size() >= request_suffix.length()) && - (rpc_name.substr(rpc_name.size() - request_suffix.length()) == request_suffix)) + std::string base = topic_name; + if ((base.rfind(request_prefix, 0) == 0) && + (base.size() >= request_suffix.length()) && + (base.substr(base.size() - request_suffix.length()) == request_suffix)) { - std::string base = rpc_name.substr(request_prefix.length()); + base = base.substr(request_prefix.length()); base = base.substr(0, base.size() - (request_suffix.length())); + rpc_info.service_type = SERVICE_REQUEST; + rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - return ACTION_GOAL_REQUEST; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_GOAL; + return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - return ACTION_RESULT_REQUEST; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_RESULT; + return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - return ACTION_CANCEL_REQUEST; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_CANCEL; + return rpc_info; } - rpc_name = base; - return RPC_REQUEST; + rpc_info.rpc_type = RPC_SERVICE; + return rpc_info; } - if ((rpc_name.rfind(reply_prefix, 0) == 0) && - (rpc_name.size() >= reply_suffix.length()) && - (rpc_name.substr(rpc_name.size() - reply_suffix.length()) == reply_suffix)) + if ((base.rfind(reply_prefix, 0) == 0) && + (base.size() >= reply_suffix.length()) && + (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) { - std::string base = rpc_name.substr(reply_prefix.length()); + base = base.substr(reply_prefix.length()); base = base.substr(0, base.size() - (reply_suffix.length())); + rpc_info.service_type = SERVICE_REPLY; + rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - return ACTION_GOAL_REPLY; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_GOAL; + return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - return ACTION_RESULT_REPLY; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_RESULT; + return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { - rpc_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - return ACTION_CANCEL_REPLY; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_CANCEL; + return rpc_info; } - rpc_name = base; - return RPC_REPLY; + rpc_info.rpc_type = RPC_SERVICE; + return rpc_info; } // Check for action feedback/status topics - rpc_name = rpc_name.substr(topic_prefix.length()); - if (rpc_name.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && rpc_name.substr(rpc_name.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) - { - rpc_name = rpc_name.substr(0, rpc_name.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); - return ACTION_FEEDBACK; - } - else if (rpc_name.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && rpc_name.substr(rpc_name.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == (std::string("/") + ACTION_STATUS_SUFFIX)) - { - rpc_name = rpc_name.substr(0, rpc_name.size() - (std::strlen(ACTION_STATUS_SUFFIX))); - return ACTION_STATUS; - } - - return RPC_NONE; -} - -// TODO -RpcType get_service_name(const std::string& topic_name, std::string& service_name) -{ - service_name = topic_name; - - // Detect and remove prefix - if (service_name.rfind(ROS_REQUEST_PREFIX, 0) == 0) - { - service_name = service_name.substr(3); - if (service_name.size() >= 7 && service_name.substr(service_name.size() - 7) == ROS_REQUEST_SUFFIX) - { - service_name = service_name.substr(0, service_name.size() - 7); - return RPC_REQUEST; - } - } - else if (service_name.rfind(ROS_REPLY_PREFIX, 0) == 0) + base = base.substr(topic_prefix.length()); + if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { - service_name = service_name.substr(3); - if (service_name.size() >= 5 && service_name.substr(service_name.size() - 5) == ROS_REPLY_SUFFIX) - { - service_name = service_name.substr(0, service_name.size() - 5); - return RPC_REPLY; - } + rpc_info.action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_FEEDBACK; + return rpc_info; } - - return RPC_NONE; -} - -RpcType get_service_direction(RpcType rpc_type) -{ - switch (rpc_type) + if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == (std::string("/") + ACTION_STATUS_SUFFIX)) { - case RPC_REQUEST: - case RPC_REPLY: - return rpc_type; - case ACTION_GOAL_REQUEST: - case ACTION_CANCEL_REQUEST: - case ACTION_RESULT_REQUEST: - return RPC_REQUEST; - case ACTION_GOAL_REPLY: - case ACTION_CANCEL_REPLY: - case ACTION_RESULT_REPLY: - return RPC_REPLY; - default: - break; + rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); + rpc_info.rpc_type = RPC_ACTION; + rpc_info.action_type = ACTION_STATUS; + return rpc_info; } - return RPC_NONE; -} -ActionType get_action_type(RpcType rpc_type) -{ - switch (rpc_type) - { - case ACTION_GOAL_REQUEST: - case ACTION_GOAL_REPLY: - return GOAL; - case ACTION_RESULT_REQUEST: - case ACTION_RESULT_REPLY: - return RESULT; - case ACTION_CANCEL_REQUEST: - case ACTION_CANCEL_REPLY: - return CANCEL; - case ACTION_FEEDBACK: - return FEEDBACK; - case ACTION_STATUS: - return STATUS; - default: - break; - } - return NONE; + return rpc_info; } - UUID generate_UUID() { UUID uuid; diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index fbe39896..65905f1b 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -255,7 +255,7 @@ void Writer::write_service_request_notification( } void Writer::write_action_notification( - const RpcUtils::RpcAction& action) + const RpcAction& action) { EPROSIMA_LOG_INFO(DDSENABLER_WRITER, "Writting action: " << action.action_name << "."); @@ -581,7 +581,7 @@ void Writer::write_action_request_notification( const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const RpcUtils::RpcType& rpc_type) + const ACTION_TYPE action_type) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -593,7 +593,7 @@ void Writer::write_action_request_notification( instanceHandle << msg.instanceHandle; try { - if (RpcUtils::RpcType::ACTION_GOAL_REQUEST == rpc_type) + if (ACTION_TYPE::ACTION_GOAL == action_type) { bool accepted; if (action_goal_request_notification_callback_) @@ -611,7 +611,7 @@ void Writer::write_action_request_notification( return; } - if (RpcUtils::RpcType::ACTION_CANCEL_REQUEST == rpc_type) + if (ACTION_TYPE::ACTION_CANCEL == action_type) { if (action_cancel_request_notification_callback_) { From 6a3741663eff4914561a0d903f2409e9c74c86df Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 29 Sep 2025 15:36:48 +0200 Subject: [PATCH 30/87] CallbackSet doxygen Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/CallbackSet.hpp | 2 ++ .../docs/ddsenabler/api_reference/api_reference.rst | 2 ++ .../api_reference/dds_callbacks/action_callbacks.rst | 12 ++++++++++++ .../dds_callbacks/service_callbacks.rst | 12 ++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/action_callbacks.rst create mode 100644 ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/service_callbacks.rst diff --git a/ddsenabler/include/ddsenabler/CallbackSet.hpp b/ddsenabler/include/ddsenabler/CallbackSet.hpp index 07249640..1ede155d 100644 --- a/ddsenabler/include/ddsenabler/CallbackSet.hpp +++ b/ddsenabler/include/ddsenabler/CallbackSet.hpp @@ -93,7 +93,9 @@ struct CallbackSet //! DDS related callbacks DdsCallbacks dds; + //! Service related callbacks ServiceCallbacks service; + //! Action related callbacks ActionCallbacks action; }; diff --git a/ddsenabler_docs/docs/ddsenabler/api_reference/api_reference.rst b/ddsenabler_docs/docs/ddsenabler/api_reference/api_reference.rst index 1f991434..271ecaea 100644 --- a/ddsenabler_docs/docs/ddsenabler/api_reference/api_reference.rst +++ b/ddsenabler_docs/docs/ddsenabler/api_reference/api_reference.rst @@ -19,4 +19,6 @@ The following pages document the classes, functions, and types exposed by *DDS E /ddsenabler/api_reference/dds_enabler/dds_enabler /ddsenabler/api_reference/callback_set/callback_set /ddsenabler/api_reference/dds_callbacks/dds_callbacks + /ddsenabler/api_reference/dds_callbacks/service_callbacks + /ddsenabler/api_reference/dds_callbacks/action_callbacks /ddsenabler/api_reference/dds_callbacks/callbacks diff --git a/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/action_callbacks.rst b/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/action_callbacks.rst new file mode 100644 index 00000000..967fc5c8 --- /dev/null +++ b/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/action_callbacks.rst @@ -0,0 +1,12 @@ + +.. _api_pim_action_callbacks: + +.. rst-class:: api-ref + +Action Callbacks +---------------- + +.. doxygenstruct:: eprosima::ddsenabler::ActionCallbacks + :project: DDSEnabler + :members: + diff --git a/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/service_callbacks.rst b/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/service_callbacks.rst new file mode 100644 index 00000000..59ecd67f --- /dev/null +++ b/ddsenabler_docs/docs/ddsenabler/api_reference/dds_callbacks/service_callbacks.rst @@ -0,0 +1,12 @@ + +.. _api_pim_service_callbacks: + +.. rst-class:: api-ref + +Service Callbacks +----------------- + +.. doxygenstruct:: eprosima::ddsenabler::ServiceCallbacks + :project: DDSEnabler + :members: + From 81fecb845a3d27937f74eaa21bd9a35c7000f773 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 1 Oct 2025 10:10:45 +0200 Subject: [PATCH 31/87] Uncrustify Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 73 +- ddsenabler/examples/action/main.cpp | 75 +- ddsenabler/examples/publish/main.cpp | 9 +- ddsenabler/examples/service/CLIParser.hpp | 63 +- ddsenabler/examples/service/main.cpp | 17 +- ddsenabler/examples/utils/Utils.cpp | 93 +- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 78 +- ddsenabler/src/cpp/DDSEnabler.cpp | 188 +- .../types/DDSEnablerTestTypes.hpp | 24 +- .../ddsEnablerTypedTests/types/aliases.hpp | 150 +- .../types/annotations.hpp | 32 +- .../types/annotationsTypeObjectSupport.hpp | 52 +- .../ddsEnablerTypedTests/types/appendable.hpp | 130 +- .../ddsEnablerTypedTests/types/arrays.hpp | 1095 ++-- .../ddsEnablerTypedTests/types/bitsets.hpp | 70 +- .../ddsEnablerTypedTests/types/constants.hpp | 405 +- .../types/constantsPubSubTypes.hpp | 220 +- .../types/declarations.hpp | 431 +- .../types/declarationsPubSubTypes.hpp | 226 +- .../types/enumerations.hpp | 25 +- .../types/enumerationsPubSubTypes.hpp | 3 +- .../ddsEnablerTypedTests/types/external.hpp | 638 +- .../test/ddsEnablerTypedTests/types/final.hpp | 130 +- .../types/finalPubSubTypes.hpp | 9 +- .../types/helpers/basic_inner_types.hpp | 250 +- .../types/inheritance.hpp | 223 +- .../test/ddsEnablerTypedTests/types/key.hpp | 281 +- .../test/ddsEnablerTypedTests/types/maps.hpp | 2873 +++++---- .../types/mapsPubSubTypes.hpp | 12 +- .../ddsEnablerTypedTests/types/member_id.hpp | 372 +- .../ddsEnablerTypedTests/types/mutable.hpp | 130 +- .../ddsEnablerTypedTests/types/optional.hpp | 913 ++- .../ddsEnablerTypedTests/types/primitives.hpp | 126 +- .../ddsEnablerTypedTests/types/sequences.hpp | 182 +- .../ddsEnablerTypedTests/types/strings.hpp | 36 +- .../ddsEnablerTypedTests/types/structures.hpp | 410 +- .../types/structuresPubSubTypes.hpp | 218 +- .../ddsEnablerTypedTests/types/unions.hpp | 5295 ++++++++--------- .../ddsenabler_participants/Callbacks.hpp | 124 +- .../EnablerParticipant.hpp | 6 +- .../ddsenabler_participants/Handler.hpp | 20 +- .../InternalRpcReader.hpp | 99 +- .../ddsenabler_participants/RpcStructs.hpp | 87 +- .../ddsenabler_participants/RpcTypes.hpp | 69 +- .../ddsenabler_participants/RpcUtils.hpp | 18 +- .../ddsenabler_participants/Writer.hpp | 6 +- .../DynamicTypesCollection.hpp | 26 +- .../DynamicTypesCollectionPubSubTypes.hpp | 225 +- .../src/cpp/EnablerParticipant.cpp | 170 +- ddsenabler_participants/src/cpp/Handler.cpp | 78 +- ddsenabler_participants/src/cpp/RpcUtils.cpp | 61 +- ddsenabler_participants/src/cpp/Writer.cpp | 73 +- .../test/types/DDSEnablerTestTypes.hpp | 24 +- 53 files changed, 7808 insertions(+), 8835 deletions(-) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 1b208b62..26f698e7 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -49,27 +49,48 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_action [options]" << std::endl; - std::cout << "" << std::endl; - std::cout << "--config Path to the configuration file" << std::endl; - std::cout << " (Default: '')" << std::endl; - std::cout << "--action-name Name of the action to be registered" << std::endl; - std::cout << " (Default: 'Fibonacci/_action/')" << std::endl; - std::cout << "-client Run as a client (mutually exclusive with -server)" << std::endl; - std::cout << "-server Run as a server (mutually exclusive with -client)" << std::endl; - std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; - std::cout << " program if expectations are not met" << std::endl; - std::cout << " (Default: 30)" << std::endl; - std::cout << "--persistence-path Path to the persistence directory" << std::endl; - std::cout << " (Default: '')" << std::endl; - std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; - std::cout << "--expected-requests Number of requests expected to be received" << std::endl; - std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; - std::cout << "--request-initial-wait Time (seconds) to wait before starting" << std::endl; - std::cout << " requests publication since server matching" << std::endl; - std::cout << " (Default: 0)" << std::endl; - std::cout << "--cancel-requests Whether to cancel requests after sending them" << std::endl; - std::cout << " (Default: false)" << std::endl; + std::cout << "Usage: ddsenabler_example_action [options]" << + std::endl; + std::cout << "" << + std::endl; + std::cout << "--config Path to the configuration file" << + std::endl; + std::cout << " (Default: '')" << + std::endl; + std::cout << "--action-name Name of the action to be registered" << + std::endl; + std::cout << " (Default: 'Fibonacci/_action/')" << + std::endl; + std::cout << "-client Run as a client (mutually exclusive with -server)" << + std::endl; + std::cout << "-server Run as a server (mutually exclusive with -client)" << + std::endl; + std::cout << "--timeout Time (seconds) to wait before stopping the" << + std::endl; + std::cout << " program if expectations are not met" << + std::endl; + std::cout << " (Default: 30)" << + std::endl; + std::cout << "--persistence-path Path to the persistence directory" << + std::endl; + std::cout << " (Default: '')" << + std::endl; + std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << + std::endl; + std::cout << "--expected-requests Number of requests expected to be received" << + std::endl; + std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << + std::endl; + std::cout << "--request-initial-wait Time (seconds) to wait before starting" << + std::endl; + std::cout << " requests publication since server matching" << + std::endl; + std::cout << " (Default: 0)" << + std::endl; + std::cout << "--cancel-requests Whether to cancel requests after sending them" << + std::endl; + std::cout << " (Default: false)" << + std::endl; std::exit(return_code); } @@ -196,7 +217,8 @@ class CLIParser } catch (const std::exception& e) { - std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << std::endl; + std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << + std::endl; print_help(EXIT_FAILURE); } } @@ -216,7 +238,8 @@ class CLIParser } catch (const std::exception& e) { - std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << std::endl; + std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << + std::endl; print_help(EXIT_FAILURE); } } @@ -231,8 +254,8 @@ class CLIParser if (++i < argc) { config.cancel_requests = (std::string(argv[i]) == "true") || - (std::string(argv[i]) == "True") || - (std::string(argv[i]) == "1"); + (std::string(argv[i]) == "True") || + (std::string(argv[i]) == "1"); } else { diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index cc2d3b9d..2be9a094 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -80,7 +80,8 @@ static void test_type_notification_callback( std::lock_guard lock(app_mutex_); std::cout << "Type callback received: " << type_name << std::endl; if (!config.persistence_path.empty() && - !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), + type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -143,7 +144,7 @@ static void test_action_notification_callback( std::cout << "Action callback received: " << action_name << std::endl; std::string action_file = (std::filesystem::path( - config.persistence_path) / + config.persistence_path) / ACTION_SUBDIR ).string(); if (!config.persistence_path.empty()) @@ -191,28 +192,28 @@ static bool test_action_query_callback( if (!config.persistence_path.empty()) { std::string action_file = (std::filesystem::path( - config.persistence_path) / + config.persistence_path) / ACTION_SUBDIR ).string(); if (!utils::load_action_from_file( - action_file, - action_name, - action_info.goal.request.type_name, - action_info.goal.reply.type_name, - action_info.cancel.request.type_name, - action_info.cancel.reply.type_name, - action_info.result.request.type_name, - action_info.result.reply.type_name, - action_info.feedback.type_name, - action_info.status.type_name, - action_info.goal.request.serialized_qos, - action_info.goal.reply.serialized_qos, - action_info.cancel.request.serialized_qos, - action_info.cancel.reply.serialized_qos, - action_info.result.request.serialized_qos, - action_info.result.reply.serialized_qos, - action_info.feedback.serialized_qos, - action_info.status.serialized_qos)) + action_file, + action_name, + action_info.goal.request.type_name, + action_info.goal.reply.type_name, + action_info.cancel.request.type_name, + action_info.cancel.reply.type_name, + action_info.result.request.type_name, + action_info.result.reply.type_name, + action_info.feedback.type_name, + action_info.status.type_name, + action_info.goal.request.serialized_qos, + action_info.goal.reply.serialized_qos, + action_info.cancel.request.serialized_qos, + action_info.cancel.reply.serialized_qos, + action_info.result.request.serialized_qos, + action_info.result.reply.serialized_qos, + action_info.feedback.serialized_qos, + action_info.status.serialized_qos)) { std::cerr << "Failed to load action: " << action_name << std::endl; return false; @@ -354,7 +355,6 @@ bool wait_for_action_result( return true; } - bool client_routine( std::shared_ptr enabler, const std::string& action_name, @@ -440,9 +440,9 @@ bool server_specific_logic( std::string feedback_tmp = feedback_json; feedback_tmp += "]}"; if (!enabler->send_action_feedback( - action_name.c_str(), - feedback_tmp.c_str(), - request_id)) + action_name.c_str(), + feedback_tmp.c_str(), + request_id)) { std::cerr << "Failed to send action feedback" << std::endl; return false; @@ -457,10 +457,10 @@ bool server_specific_logic( json += "]}"; if (!enabler->send_action_result( - action_name.c_str(), - request_id, - eprosima::ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED, - json.c_str())) + action_name.c_str(), + request_id, + eprosima::ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED, + json.c_str())) { std::cerr << "Failed to send action result" << std::endl; return false; @@ -499,11 +499,11 @@ bool server_routine( std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time // Send Feedback & Result - if(!server_specific_logic( - enabler, - action_name, - fibonacci_number, - request_id)) + if (!server_specific_logic( + enabler, + action_name, + fibonacci_number, + request_id)) { std::cerr << "Failed to process action: " << action_name << " with request ID: " << request_id << std::endl; return false; @@ -595,8 +595,11 @@ int main( } else { - auto goal_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); - ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, config.cancel_requests); + auto goal_path = + config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / + REQUESTS_SUBDIR).string(); + ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, + config.cancel_requests); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index 0b17600b..aeddb24a 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -88,7 +88,8 @@ static void test_type_notification_callback( std::cout << "Type callback received: " << type_name << ", Total types: " << received_types_ << std::endl << serialized_type << std::endl << std::endl; if (!config.persistence_path.empty() && - !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), + type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -131,7 +132,8 @@ static void test_topic_notification_callback( { std::lock_guard lock(app_mutex_); notify = ++received_topics_ >= config.expected_topics; - std::cout << "Topic callback received: " << topic_name << " of type " << topic_info.type_name << ", Total topics: " << + std::cout << "Topic callback received: " << topic_name << " of type " << topic_info.type_name << + ", Total topics: " << received_topics_ << std::endl << topic_info.serialized_qos << std::endl << std::endl; if (!config.persistence_path.empty() && !utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), @@ -159,7 +161,8 @@ static bool test_topic_query_callback( } // Load the topic from file - if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, + if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), + topic_name, topic_info.type_name, topic_info.serialized_qos)) { diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index ff0d1537..83e0938b 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -48,25 +48,44 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_service [options]" << std::endl; - std::cout << "" << std::endl; - std::cout << "--config Path to the configuration file" << std::endl; - std::cout << " (Default: '')" << std::endl; - std::cout << "--service-name Name of the service to be registered" << std::endl; - std::cout << " (Default: 'add_two_ints')" << std::endl; - std::cout << "-client Run as a client (mutually exclusive with -server)" << std::endl; - std::cout << "-server Run as a server (mutually exclusive with -client)" << std::endl; - std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; - std::cout << " program if expectations are not met" << std::endl; - std::cout << " (Default: 30)" << std::endl; - std::cout << "--persistence-path Path to the persistence directory" << std::endl; - std::cout << " (Default: '')" << std::endl; - std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; - std::cout << "--expected-requests Number of requests expected to be received" << std::endl; - std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; - std::cout << "--request-initial-wait Time (seconds) to wait before starting" << std::endl; - std::cout << " requests publication since server matching" << std::endl; - std::cout << " (Default: 0)" << std::endl; + std::cout << "Usage: ddsenabler_example_service [options]" << + std::endl; + std::cout << "" << + std::endl; + std::cout << "--config Path to the configuration file" << + std::endl; + std::cout << " (Default: '')" << + std::endl; + std::cout << "--service-name Name of the service to be registered" << + std::endl; + std::cout << " (Default: 'add_two_ints')" << + std::endl; + std::cout << "-client Run as a client (mutually exclusive with -server)" << + std::endl; + std::cout << "-server Run as a server (mutually exclusive with -client)" << + std::endl; + std::cout << "--timeout Time (seconds) to wait before stopping the" << + std::endl; + std::cout << " program if expectations are not met" << + std::endl; + std::cout << " (Default: 30)" << + std::endl; + std::cout << "--persistence-path Path to the persistence directory" << + std::endl; + std::cout << " (Default: '')" << + std::endl; + std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << + std::endl; + std::cout << "--expected-requests Number of requests expected to be received" << + std::endl; + std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << + std::endl; + std::cout << "--request-initial-wait Time (seconds) to wait before starting" << + std::endl; + std::cout << " requests publication since server matching" << + std::endl; + std::cout << " (Default: 0)" << + std::endl; std::exit(return_code); } @@ -193,7 +212,8 @@ class CLIParser } catch (const std::exception& e) { - std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << std::endl; + std::cerr << "Invalid --expected-requests argument " << argv[i] << ": " << e.what() << + std::endl; print_help(EXIT_FAILURE); } } @@ -213,7 +233,8 @@ class CLIParser } catch (const std::exception& e) { - std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << std::endl; + std::cerr << "Invalid --request-initial-wait argument " << argv[i] << ": " << e.what() << + std::endl; print_help(EXIT_FAILURE); } } diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 5d729186..b5a1b882 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -80,7 +80,8 @@ static void test_type_notification_callback( std::lock_guard lock(app_mutex_); std::cout << "Type callback received: " << type_name << std::endl; if (!config.persistence_path.empty() && - !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), type_name, + !utils::save_type_to_file((std::filesystem::path(config.persistence_path) / TYPES_SUBDIR).string(), + type_name, serialized_type_internal, serialized_type_internal_size)) { std::cerr << "Failed to save type: " << type_name << std::endl; @@ -143,7 +144,7 @@ static void test_service_notification_callback( std::cout << "Service callback received: " << service_name << std::endl; std::string service_file = (std::filesystem::path( - config.persistence_path) / SERVICES_SUBDIR + config.persistence_path) / SERVICES_SUBDIR ).string(); if (!config.persistence_path.empty()) { @@ -183,7 +184,7 @@ static bool test_service_query_callback( std::cout << "Service type request callback received: " << service_name << std::endl; std::string service_file = (std::filesystem::path( - config.persistence_path) / + config.persistence_path) / SERVICES_SUBDIR ).string(); if (utils::load_service_from_file( @@ -298,7 +299,6 @@ bool wait_for_service_reply( return true; } - bool client_routine( std::shared_ptr enabler, const std::string& service_name, @@ -388,7 +388,7 @@ bool server_routine( while (true) { - uint64_t request_id = 0; + uint64_t request_id = 0; std::string request; if (!wait_for_service_request(timeout, app_mutex_, app_cv_, request_id, request)) { @@ -396,7 +396,8 @@ bool server_routine( return false; } - std::cout << "Received request for service: " << service_name << " with request ID: " << request_id << std::endl; + std::cout << "Received request for service: " << service_name << " with request ID: " << request_id << + std::endl; // Example response server_specific_logic( @@ -482,7 +483,9 @@ int main( } else { - auto request_path = config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); + auto request_path = + config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / + REQUESTS_SUBDIR).string(); ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait); } diff --git a/ddsenabler/examples/utils/Utils.cpp b/ddsenabler/examples/utils/Utils.cpp index 04bb66d0..5c65e5f6 100644 --- a/ddsenabler/examples/utils/Utils.cpp +++ b/ddsenabler/examples/utils/Utils.cpp @@ -402,8 +402,9 @@ void save_service_to_file( j["reply_serialized_qos"] = reply_serialized_qos; std::ofstream ofs(file_path); - if (ofs.is_open()) { - ofs << j.dump(4); + if (ofs.is_open()) + { + ofs << j.dump(4); } } @@ -436,7 +437,8 @@ bool load_service_from_file( } std::ifstream ifs(file_path); - if (!ifs.is_open()) { + if (!ifs.is_open()) + { return false; } @@ -444,7 +446,8 @@ bool load_service_from_file( ifs >> j; std::string file_service_name = j["service_name"].get(); - if (file_service_name != std::string(service_name)) { + if (file_service_name != std::string(service_name)) + { return false; // Service name does not match } @@ -458,24 +461,24 @@ bool load_service_from_file( } void save_action_to_file( - const std::string& directory, - const char* action_name, - const char* goal_request_action_type, - const char* goal_reply_action_type, - const char* cancel_request_action_type, - const char* cancel_reply_action_type, - const char* result_request_action_type, - const char* result_reply_action_type, - const char* feedback_action_type, - const char* status_action_type, - const char* goal_request_action_serialized_qos, - const char* goal_reply_action_serialized_qos, - const char* cancel_request_action_serialized_qos, - const char* cancel_reply_action_serialized_qos, - const char* result_request_action_serialized_qos, - const char* result_reply_action_serialized_qos, - const char* feedback_action_serialized_qos, - const char* status_action_serialized_qos) + const std::string& directory, + const char* action_name, + const char* goal_request_action_type, + const char* goal_reply_action_type, + const char* cancel_request_action_type, + const char* cancel_reply_action_type, + const char* result_request_action_type, + const char* result_reply_action_type, + const char* feedback_action_type, + const char* status_action_type, + const char* goal_request_action_serialized_qos, + const char* goal_reply_action_serialized_qos, + const char* cancel_request_action_serialized_qos, + const char* cancel_reply_action_serialized_qos, + const char* result_request_action_serialized_qos, + const char* result_reply_action_serialized_qos, + const char* feedback_action_serialized_qos, + const char* status_action_serialized_qos) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -517,31 +520,32 @@ void save_action_to_file( j["status_action_serialized_qos"] = status_action_serialized_qos; std::ofstream ofs(file_path); - if (ofs.is_open()) { + if (ofs.is_open()) + { ofs << j.dump(4); ofs.close(); } } bool load_action_from_file( - const std::string& directory, - const char* action_name, - std::string& goal_request_action_type, - std::string& goal_reply_action_type, - std::string& cancel_request_action_type, - std::string& cancel_reply_action_type, - std::string& result_request_action_type, - std::string& result_reply_action_type, - std::string& feedback_action_type, - std::string& status_action_type, - std::string& goal_request_action_serialized_qos, - std::string& goal_reply_action_serialized_qos, - std::string& cancel_request_action_serialized_qos, - std::string& cancel_reply_action_serialized_qos, - std::string& result_request_action_serialized_qos, - std::string& result_reply_action_serialized_qos, - std::string& feedback_action_serialized_qos, - std::string& status_action_serialized_qos) + const std::string& directory, + const char* action_name, + std::string& goal_request_action_type, + std::string& goal_reply_action_type, + std::string& cancel_request_action_type, + std::string& cancel_reply_action_type, + std::string& result_request_action_type, + std::string& result_reply_action_type, + std::string& feedback_action_type, + std::string& status_action_type, + std::string& goal_request_action_serialized_qos, + std::string& goal_reply_action_serialized_qos, + std::string& cancel_request_action_serialized_qos, + std::string& cancel_reply_action_serialized_qos, + std::string& result_request_action_serialized_qos, + std::string& result_reply_action_serialized_qos, + std::string& feedback_action_serialized_qos, + std::string& status_action_serialized_qos) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -564,7 +568,8 @@ bool load_action_from_file( } std::ifstream ifs(file_path); - if (!ifs.is_open()) { + if (!ifs.is_open()) + { return false; } @@ -572,7 +577,8 @@ bool load_action_from_file( ifs >> j; std::string file_action_name = j["action_name"].get(); - if (file_action_name != std::string(action_name)) { + if (file_action_name != std::string(action_name)) + { return false; // Action name does not match } goal_request_action_type = j["goal_request_action_type"].get(); @@ -647,5 +653,4 @@ void get_sorted_files( }); } - } // namespace utils \ No newline at end of file diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 89715a74..ad2ae7ac 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -229,9 +229,9 @@ class DDSEnabler * @return true if the feedback was successfully sent, false otherwise. */ bool send_action_feedback( - const char* action_name, - const char* json, - const participants::UUID& goal_id); + const char* action_name, + const char* json, + const participants::UUID& goal_id); /** * @brief Send result for the specified goal_id action. @@ -247,10 +247,10 @@ class DDSEnabler * @return true if the result was successfully sent, false otherwise. */ bool send_action_result( - const char* action_name, - const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code, - const char* json); + const char* action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code, + const char* json); /** * @brief Sends a cancel goal reply for the specified action. @@ -266,29 +266,29 @@ class DDSEnabler * @return true if the cancel goal reply was successfully sent, false otherwise. */ bool send_action_cancel_goal_reply( - const char* action_name, - const std::vector& goal_ids, - const participants::CANCEL_CODE& cancel_code, - const uint64_t request_id); - - /** - * @brief Publishes an update for the status of an action. - * - * This function publishes a msg update for the status of an action. - * It returns a boolean indicating whether the operation was successful. - * Failure may occur if the action was not previously announced or if the goal ID is not currently active. - * - * @param action_name The name of the action for which the status is being updated. - * @param goal_id The unique identifier of the action goal for which the status is being updated. - * @param status_code The status code representing the current state of the action. - * - * @return true if the status update was successfully sent, false otherwise. - * + const char* action_name, + const std::vector& goal_ids, + const participants::CANCEL_CODE& cancel_code, + const uint64_t request_id); + + /** + * @brief Publishes an update for the status of an action. + * + * This function publishes a msg update for the status of an action. + * It returns a boolean indicating whether the operation was successful. + * Failure may occur if the action was not previously announced or if the goal ID is not currently active. + * + * @param action_name The name of the action for which the status is being updated. + * @param goal_id The unique identifier of the action goal for which the status is being updated. + * @param status_code The status code representing the current state of the action. + * + * @return true if the status update was successfully sent, false otherwise. + * */ bool update_action_status( - const std::string& action_name, - const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code); + const std::string& action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code); /*****************************************/ /* ACTION CLIENT */ @@ -312,8 +312,8 @@ class DDSEnabler * @return true if the action goal was successfully sent, false otherwise. */ bool send_action_goal( - const std::string& action_name, - const std::string& json, + const std::string& action_name, + const std::string& json, participants::UUID& goal_id, participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); @@ -355,8 +355,8 @@ class DDSEnabler * @return true if the request to get the result was successfully sent, false otherwise. */ bool send_action_get_result_request( - const std::string& action_name, - const participants::UUID& goal_id); + const std::string& action_name, + const participants::UUID& goal_id); /** * @brief Sends a reply to an action goal request. @@ -370,9 +370,9 @@ class DDSEnabler * @param accepted A boolean indicating whether the goal was accepted (true) or rejected (false). */ void send_action_send_goal_reply( - const std::string& action_name, - const uint64_t goal_id, - bool accepted); + const std::string& action_name, + const uint64_t goal_id, + bool accepted); /** * @brief Actually sends the result reply for an action. @@ -385,10 +385,10 @@ class DDSEnabler * @param request_id The unique identifier of the request to which this reply corresponds. */ bool send_action_get_result_reply( - const std::string& action_name, - const participants::UUID& goal_id, - const std::string& reply_json, - const uint64_t request_id); + const std::string& action_name, + const participants::UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id); /** * Load the Enabler's internal topics into a configuration object. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index cf288441..d84f141c 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -66,7 +66,9 @@ DDSEnabler::DDSEnabler( [this](const std::string& action_name, const UUID& action_id) { if (this->send_action_get_result_request(action_name, action_id)) + { return true; + } this->cancel_action_goal(action_name, action_id, 0); return false; }); @@ -78,7 +80,8 @@ DDSEnabler::DDSEnabler( }); handler_->set_send_action_get_result_reply_callback( - [this](const std::string& action_name, const UUID& goal_id, const std::string& reply_json, const uint64_t request_id) + [this](const std::string& action_name, const UUID& goal_id, const std::string& reply_json, + const uint64_t request_id) { return this->send_action_get_result_reply(action_name, goal_id, reply_json, request_id); }); @@ -290,10 +293,10 @@ bool DDSEnabler::publish( } bool DDSEnabler::send_service_request( - const std::string& service_name, - const std::string& json, - uint64_t& request_id, - participants::RPC_PROTOCOL rpc_protocol) + const std::string& service_name, + const std::string& json, + uint64_t& request_id, + participants::RPC_PROTOCOL rpc_protocol) { std::string prefix, suffix; switch (rpc_protocol) @@ -314,31 +317,33 @@ bool DDSEnabler::send_service_request( request_id = handler_->get_new_request_id(); if (!enabler_participant_->publish_rpc( - prefix + service_name + suffix, - json, - request_id)) + prefix + service_name + suffix, + json, + request_id)) + { return false; + } return true; } bool DDSEnabler::announce_service( - const std::string& service_name, - participants::RPC_PROTOCOL rpc_protocol) + const std::string& service_name, + participants::RPC_PROTOCOL rpc_protocol) { return enabler_participant_->announce_service(service_name, rpc_protocol); } bool DDSEnabler::revoke_service( - const std::string& service_name) + const std::string& service_name) { return enabler_participant_->revoke_service(service_name); } bool DDSEnabler::send_service_reply( - const std::string& service_name, - const std::string& json, - const uint64_t request_id) + const std::string& service_name, + const std::string& json, + const uint64_t request_id) { RPC_PROTOCOL rpc_protocol = enabler_participant_->get_service_rpc_protocol(service_name); std::string prefix, suffix; @@ -359,26 +364,26 @@ bool DDSEnabler::send_service_reply( } return enabler_participant_->publish_rpc( - prefix + service_name + suffix, - json, - request_id); + prefix + service_name + suffix, + json, + request_id); } bool DDSEnabler::send_action_goal( - const std::string& action_name, - const std::string& json, - UUID& action_id, - participants::RPC_PROTOCOL rpc_protocol) + const std::string& action_name, + const std::string& json, + UUID& action_id, + participants::RPC_PROTOCOL rpc_protocol) { std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; uint64_t goal_request_id = 0; if (!send_service_request( - goal_request_topic, - goal_json, - goal_request_id, - rpc_protocol)) + goal_request_topic, + goal_json, + goal_request_id, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal request to action " << action_name); @@ -386,11 +391,11 @@ bool DDSEnabler::send_action_goal( } if (!handler_->store_action_request( - action_name, - action_id, - goal_request_id, - ACTION_TYPE::ACTION_GOAL, - rpc_protocol)) + action_name, + action_id, + goal_request_id, + ACTION_TYPE::ACTION_GOAL, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action goal request to action " << action_name); @@ -402,8 +407,8 @@ bool DDSEnabler::send_action_goal( } bool DDSEnabler::send_action_get_result_request( - const std::string& action_name, - const UUID& action_id) + const std::string& action_name, + const UUID& action_id) { std::string json = participants::RpcUtils::create_result_request_msg(action_id); @@ -411,9 +416,9 @@ bool DDSEnabler::send_action_get_result_request( uint64_t get_result_request_id = 0; if (!send_service_request( - get_result_request_topic, - json, - get_result_request_id)) + get_result_request_topic, + json, + get_result_request_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action get result request to action " << action_name); @@ -421,14 +426,14 @@ bool DDSEnabler::send_action_get_result_request( } if (!handler_->store_action_request( - action_name, - action_id, - get_result_request_id, - ACTION_TYPE::ACTION_RESULT)) + action_name, + action_id, + get_result_request_id, + ACTION_TYPE::ACTION_RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action get result request to action " << action_name - << ": cancelling."); + << ": cancelling."); cancel_action_goal(action_name, action_id, 0); return false; } @@ -437,16 +442,16 @@ bool DDSEnabler::send_action_get_result_request( } bool DDSEnabler::cancel_action_goal( - const std::string& action_name, - const participants::UUID& goal_id, - const int64_t timestamp) + const std::string& action_name, + const participants::UUID& goal_id, + const int64_t timestamp) { if (goal_id != participants::UUID() && - !handler_->is_UUID_active(action_name, goal_id)) + !handler_->is_UUID_active(action_name, goal_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to cancel action goal for action " << action_name - << ": goal id not found."); + << ": goal id not found."); return false; } @@ -456,9 +461,9 @@ bool DDSEnabler::cancel_action_goal( std::string cancel_request_topic = action_name + participants::ACTION_CANCEL_SUFFIX; if (send_service_request( - cancel_request_topic, - cancel_json, - cancel_request_id)) + cancel_request_topic, + cancel_json, + cancel_request_id)) { return true; } @@ -469,42 +474,42 @@ bool DDSEnabler::cancel_action_goal( } bool DDSEnabler::announce_action( - const std::string& action_name, - participants::RPC_PROTOCOL rpc_protocol) + const std::string& action_name, + participants::RPC_PROTOCOL rpc_protocol) { return enabler_participant_->announce_action(action_name, rpc_protocol); } bool DDSEnabler::revoke_action( - const std::string& action_name) + const std::string& action_name) { return enabler_participant_->revoke_action(action_name); } void DDSEnabler::send_action_send_goal_reply( - const std::string& action_name, - const uint64_t goal_id, - bool accepted) + const std::string& action_name, + const uint64_t goal_id, + bool accepted) { std::string reply_json = participants::RpcUtils::create_goal_reply_msg(accepted); if (!send_service_reply( - action_name + participants::ACTION_GOAL_SUFFIX, - reply_json, - goal_id)) + action_name + participants::ACTION_GOAL_SUFFIX, + reply_json, + goal_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal reply to action " << action_name - << ": goal id not found."); + << ": goal id not found."); } return; } bool DDSEnabler::send_action_cancel_goal_reply( - const char* action_name, - const std::vector& goal_ids, - const participants::CANCEL_CODE& cancel_code, - const uint64_t request_id) + const char* action_name, + const std::vector& goal_ids, + const participants::CANCEL_CODE& cancel_code, + const uint64_t request_id) { std::vector> cancelling_goals; for (const auto& goal_id : goal_ids) @@ -520,29 +525,29 @@ bool DDSEnabler::send_action_cancel_goal_reply( std::string reply_json = participants::RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); if (!send_service_reply( - std::string(action_name) + participants::ACTION_CANCEL_SUFFIX, - reply_json, - request_id)) + std::string(action_name) + participants::ACTION_CANCEL_SUFFIX, + reply_json, + request_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action cancel reply to action " << action_name - << ": request id not found."); + << ": request id not found."); return false; } return true; } bool DDSEnabler::send_action_result( - const char* action_name, - const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code, - const char* json) + const char* action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code, + const char* json) { - if (!handler_->is_UUID_active(action_name,goal_id)) + if (!handler_->is_UUID_active(action_name, goal_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action result to action " << action_name - << ": goal id not found."); + << ": goal id not found."); return false; } @@ -552,17 +557,17 @@ bool DDSEnabler::send_action_result( } bool DDSEnabler::send_action_get_result_reply( - const std::string& action_name, - const participants::UUID& goal_id, - const std::string& reply_json, - const uint64_t request_id) + const std::string& action_name, + const participants::UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id) { std::string result_topic = action_name + participants::ACTION_RESULT_SUFFIX; if (send_service_reply( - result_topic, - reply_json, - request_id)) + result_topic, + reply_json, + request_id)) { handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); return true; @@ -572,15 +577,15 @@ bool DDSEnabler::send_action_get_result_reply( } bool DDSEnabler::send_action_feedback( - const char* action_name, - const char* json, - const participants::UUID& goal_id) + const char* action_name, + const char* json, + const participants::UUID& goal_id) { - if (!handler_->is_UUID_active(action_name,goal_id)) + if (!handler_->is_UUID_active(action_name, goal_id)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action feedback to action " << action_name - << ": goal id not found."); + << ": goal id not found."); return false; } @@ -598,7 +603,7 @@ bool DDSEnabler::send_action_feedback( default: EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send feedback to action " << action_name - << ": unsupported RPC protocol."); + << ": unsupported RPC protocol."); return false; } @@ -609,16 +614,16 @@ bool DDSEnabler::send_action_feedback( } bool DDSEnabler::update_action_status( - const std::string& action_name, - const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code) + const std::string& action_name, + const participants::UUID& goal_id, + const participants::STATUS_CODE& status_code) { std::chrono::system_clock::time_point goal_accepted_stamp; - if (!handler_->is_UUID_active(action_name,goal_id, &goal_accepted_stamp)) + if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to update action status to action " << action_name - << ": goal id not found."); + << ": goal id not found."); return false; } @@ -636,7 +641,7 @@ bool DDSEnabler::update_action_status( default: EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send status to action " << action_name - << ": unsupported RPC protocol."); + << ": unsupported RPC protocol."); return false; } @@ -645,6 +650,5 @@ bool DDSEnabler::update_action_status( return enabler_participant_->publish(status_topic, status_json); } - } /* namespace ddsenabler */ } /* namespace eprosima */ diff --git a/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp b/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp index 840fc12b..5d7eeef5 100644 --- a/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp +++ b/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp @@ -81,7 +81,7 @@ class DDSEnablerTestType1 eProsima_user_DllExport DDSEnablerTestType1( const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -103,7 +103,7 @@ class DDSEnablerTestType1 const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -168,8 +168,6 @@ class DDSEnablerTestType1 return m_value; } - - private: int16_t m_value{0}; @@ -204,7 +202,7 @@ class DDSEnablerTestType2 eProsima_user_DllExport DDSEnablerTestType2( const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -226,7 +224,7 @@ class DDSEnablerTestType2 const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -301,8 +299,6 @@ class DDSEnablerTestType2 return m_value; } - - private: std::string m_value; @@ -337,7 +333,7 @@ class DDSEnablerTestType3 eProsima_user_DllExport DDSEnablerTestType3( const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -359,7 +355,7 @@ class DDSEnablerTestType3 const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -434,8 +430,6 @@ class DDSEnablerTestType3 return m_value; } - - private: std::array m_value{0}; @@ -470,7 +464,7 @@ class DDSEnablerTestType4 eProsima_user_DllExport DDSEnablerTestType4( const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -492,7 +486,7 @@ class DDSEnablerTestType4 const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -567,8 +561,6 @@ class DDSEnablerTestType4 return m_value; } - - private: DDSEnablerTestType1 m_value; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp index 0494aa8d..80edd2ac 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp @@ -135,7 +135,7 @@ class AliasInt16 eProsima_user_DllExport AliasInt16( const AliasInt16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -157,7 +157,7 @@ class AliasInt16 const AliasInt16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -222,8 +222,6 @@ class AliasInt16 return m_value; } - - private: alias_int16 m_value{0}; @@ -258,7 +256,7 @@ class AliasUint16 eProsima_user_DllExport AliasUint16( const AliasUint16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -280,7 +278,7 @@ class AliasUint16 const AliasUint16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -345,8 +343,6 @@ class AliasUint16 return m_value; } - - private: alias_uint16 m_value{0}; @@ -381,7 +377,7 @@ class AliasInt32 eProsima_user_DllExport AliasInt32( const AliasInt32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -403,7 +399,7 @@ class AliasInt32 const AliasInt32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -468,8 +464,6 @@ class AliasInt32 return m_value; } - - private: alias_int32 m_value{0}; @@ -504,7 +498,7 @@ class AliasUInt32 eProsima_user_DllExport AliasUInt32( const AliasUInt32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -526,7 +520,7 @@ class AliasUInt32 const AliasUInt32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -591,8 +585,6 @@ class AliasUInt32 return m_value; } - - private: alias_uint32 m_value{0}; @@ -627,7 +619,7 @@ class AliasInt64 eProsima_user_DllExport AliasInt64( const AliasInt64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -649,7 +641,7 @@ class AliasInt64 const AliasInt64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -714,8 +706,6 @@ class AliasInt64 return m_value; } - - private: alias_int64 m_value{0}; @@ -750,7 +740,7 @@ class AliasUInt64 eProsima_user_DllExport AliasUInt64( const AliasUInt64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -772,7 +762,7 @@ class AliasUInt64 const AliasUInt64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -837,8 +827,6 @@ class AliasUInt64 return m_value; } - - private: alias_uint64 m_value{0}; @@ -873,7 +861,7 @@ class AliasFloat32 eProsima_user_DllExport AliasFloat32( const AliasFloat32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -895,7 +883,7 @@ class AliasFloat32 const AliasFloat32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -960,8 +948,6 @@ class AliasFloat32 return m_value; } - - private: alias_float32 m_value{0.0}; @@ -996,7 +982,7 @@ class AliasFloat64 eProsima_user_DllExport AliasFloat64( const AliasFloat64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1018,7 +1004,7 @@ class AliasFloat64 const AliasFloat64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1083,8 +1069,6 @@ class AliasFloat64 return m_value; } - - private: alias_float64 m_value{0.0}; @@ -1119,7 +1103,7 @@ class AliasFloat128 eProsima_user_DllExport AliasFloat128( const AliasFloat128& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1141,7 +1125,7 @@ class AliasFloat128 const AliasFloat128& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1206,8 +1190,6 @@ class AliasFloat128 return m_value; } - - private: alias_float128 m_value{0.0}; @@ -1242,7 +1224,7 @@ class AliasBool eProsima_user_DllExport AliasBool( const AliasBool& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1264,7 +1246,7 @@ class AliasBool const AliasBool& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1329,8 +1311,6 @@ class AliasBool return m_value; } - - private: alias_bool m_value{false}; @@ -1365,7 +1345,7 @@ class AliasOctet eProsima_user_DllExport AliasOctet( const AliasOctet& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1387,7 +1367,7 @@ class AliasOctet const AliasOctet& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1452,8 +1432,6 @@ class AliasOctet return m_value; } - - private: alias_octet m_value{0}; @@ -1488,7 +1466,7 @@ class AliasChar8 eProsima_user_DllExport AliasChar8( const AliasChar8& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1510,7 +1488,7 @@ class AliasChar8 const AliasChar8& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1575,8 +1553,6 @@ class AliasChar8 return m_value; } - - private: alias_char8 m_value{0}; @@ -1611,7 +1587,7 @@ class AliasChar16 eProsima_user_DllExport AliasChar16( const AliasChar16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1633,7 +1609,7 @@ class AliasChar16 const AliasChar16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1698,8 +1674,6 @@ class AliasChar16 return m_value; } - - private: alias_char16 m_value{0}; @@ -1734,7 +1708,7 @@ class AliasString8 eProsima_user_DllExport AliasString8( const AliasString8& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1756,7 +1730,7 @@ class AliasString8 const AliasString8& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1831,8 +1805,6 @@ class AliasString8 return m_value; } - - private: alias_string8 m_value; @@ -1867,7 +1839,7 @@ class AliasString16 eProsima_user_DllExport AliasString16( const AliasString16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1889,7 +1861,7 @@ class AliasString16 const AliasString16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1964,8 +1936,6 @@ class AliasString16 return m_value; } - - private: alias_string16 m_value; @@ -2000,7 +1970,7 @@ class AliasEnum eProsima_user_DllExport AliasEnum( const AliasEnum& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2022,7 +1992,7 @@ class AliasEnum const AliasEnum& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2087,8 +2057,6 @@ class AliasEnum return m_value; } - - private: alias_enum m_value{InnerEnumHelper::ENUM_VALUE_1}; @@ -2123,7 +2091,7 @@ class AliasBitmask eProsima_user_DllExport AliasBitmask( const AliasBitmask& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2145,7 +2113,7 @@ class AliasBitmask const AliasBitmask& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2220,8 +2188,6 @@ class AliasBitmask return m_value; } - - private: alias_bitmask m_value{0}; @@ -2256,7 +2222,7 @@ class AliasAlias eProsima_user_DllExport AliasAlias( const AliasAlias& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2278,7 +2244,7 @@ class AliasAlias const AliasAlias& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2343,8 +2309,6 @@ class AliasAlias return m_value; } - - private: alias_alias m_value{0}; @@ -2379,7 +2343,7 @@ class AliasArray eProsima_user_DllExport AliasArray( const AliasArray& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2401,7 +2365,7 @@ class AliasArray const AliasArray& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2476,8 +2440,6 @@ class AliasArray return m_value; } - - private: alias_array m_value{0}; @@ -2512,7 +2474,7 @@ class AliasMultiArray eProsima_user_DllExport AliasMultiArray( const AliasMultiArray& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2534,7 +2496,7 @@ class AliasMultiArray const AliasMultiArray& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2609,8 +2571,6 @@ class AliasMultiArray return m_value; } - - private: alias_multiarray m_value{ {{0}} }; @@ -2645,7 +2605,7 @@ class AliasSequence eProsima_user_DllExport AliasSequence( const AliasSequence& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2667,7 +2627,7 @@ class AliasSequence const AliasSequence& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2742,8 +2702,6 @@ class AliasSequence return m_value; } - - private: alias_sequence m_value; @@ -2778,7 +2736,7 @@ class AliasMap eProsima_user_DllExport AliasMap( const AliasMap& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2800,7 +2758,7 @@ class AliasMap const AliasMap& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2875,8 +2833,6 @@ class AliasMap return m_value; } - - private: alias_map m_value; @@ -2911,7 +2867,7 @@ class AliasUnion eProsima_user_DllExport AliasUnion( const AliasUnion& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2933,7 +2889,7 @@ class AliasUnion const AliasUnion& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3008,8 +2964,6 @@ class AliasUnion return m_value; } - - private: alias_union m_value; @@ -3044,7 +2998,7 @@ class AliasStruct eProsima_user_DllExport AliasStruct( const AliasStruct& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3066,7 +3020,7 @@ class AliasStruct const AliasStruct& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3141,8 +3095,6 @@ class AliasStruct return m_value; } - - private: alias_structure m_value; @@ -3177,7 +3129,7 @@ class AliasBitset eProsima_user_DllExport AliasBitset( const AliasBitset& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3199,7 +3151,7 @@ class AliasBitset const AliasBitset& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3274,8 +3226,6 @@ class AliasBitset return m_value; } - - private: alias_bitset m_value; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp index bd172e1d..69f143da 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp @@ -53,20 +53,20 @@ #endif // _WIN32 namespace AnnotationTest { - /*! - * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file. - * @ingroup annotations - */ - enum class InnerEnumHelper : int32_t - { - ONE, - TWO - }; +/*! + * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file. + * @ingroup annotations + */ +enum class InnerEnumHelper : int32_t +{ + ONE, + TWO +}; - typedef eprosima::fastcdr::fixed_string Inner_alias_bounded_string_helper; +typedef eprosima::fastcdr::fixed_string Inner_alias_bounded_string_helper; - const int16_t inner_const_helper = 10; +const int16_t inner_const_helper = 10; } // namespace AnnotationTest @@ -160,8 +160,6 @@ class AnnotatedStruct return !(*this == x); } - - private: @@ -255,8 +253,6 @@ class EmptyAnnotatedStruct return !(*this == x); } - - private: @@ -291,7 +287,7 @@ class BasicAnnotationsStruct eProsima_user_DllExport BasicAnnotationsStruct( const BasicAnnotationsStruct& x) { - m_basic_annotations_member = x.m_basic_annotations_member; + m_basic_annotations_member = x.m_basic_annotations_member; } @@ -313,7 +309,7 @@ class BasicAnnotationsStruct const BasicAnnotationsStruct& x) { - m_basic_annotations_member = x.m_basic_annotations_member; + m_basic_annotations_member = x.m_basic_annotations_member; return *this; } @@ -378,8 +374,6 @@ class BasicAnnotationsStruct return m_basic_annotations_member; } - - private: int16_t m_basic_annotations_member{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp index 9d914aac..7318169a 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp @@ -40,32 +40,32 @@ namespace AnnotationTest { - /** - * @brief Register InnerEnumHelper related TypeIdentifier. - * Fully-descriptive TypeIdentifiers are directly registered. - * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is - * indirectly registered as well. - * - * @param[out] TypeIdentifier of the registered type. - * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. - * Invalid TypeIdentifier is returned in case of error. - */ - eProsima_user_DllExport void register_InnerEnumHelper_type_identifier( - eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); - - - /** - * @brief Register Inner_alias_bounded_string_helper related TypeIdentifier. - * Fully-descriptive TypeIdentifiers are directly registered. - * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is - * indirectly registered as well. - * - * @param[out] TypeIdentifier of the registered type. - * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. - * Invalid TypeIdentifier is returned in case of error. - */ - eProsima_user_DllExport void register_Inner_alias_bounded_string_helper_type_identifier( - eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); +/** + * @brief Register InnerEnumHelper related TypeIdentifier. + * Fully-descriptive TypeIdentifiers are directly registered. + * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is + * indirectly registered as well. + * + * @param[out] TypeIdentifier of the registered type. + * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. + * Invalid TypeIdentifier is returned in case of error. + */ +eProsima_user_DllExport void register_InnerEnumHelper_type_identifier( + eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); + + +/** + * @brief Register Inner_alias_bounded_string_helper related TypeIdentifier. + * Fully-descriptive TypeIdentifiers are directly registered. + * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is + * indirectly registered as well. + * + * @param[out] TypeIdentifier of the registered type. + * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. + * Invalid TypeIdentifier is returned in case of error. + */ +eProsima_user_DllExport void register_Inner_alias_bounded_string_helper_type_identifier( + eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp index ae7149d1..33829e77 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp @@ -81,7 +81,7 @@ class AppendableShortStruct eProsima_user_DllExport AppendableShortStruct( const AppendableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class AppendableShortStruct const AppendableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,8 +168,6 @@ class AppendableShortStruct return m_var_short; } - - private: int16_t m_var_short{0}; @@ -204,7 +202,7 @@ class AppendableUShortStruct eProsima_user_DllExport AppendableUShortStruct( const AppendableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -226,7 +224,7 @@ class AppendableUShortStruct const AppendableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -291,8 +289,6 @@ class AppendableUShortStruct return m_var_ushort; } - - private: uint16_t m_var_ushort{0}; @@ -327,7 +323,7 @@ class AppendableLongStruct eProsima_user_DllExport AppendableLongStruct( const AppendableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -349,7 +345,7 @@ class AppendableLongStruct const AppendableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -414,8 +410,6 @@ class AppendableLongStruct return m_var_long; } - - private: int32_t m_var_long{0}; @@ -450,7 +444,7 @@ class AppendableULongStruct eProsima_user_DllExport AppendableULongStruct( const AppendableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -472,7 +466,7 @@ class AppendableULongStruct const AppendableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -537,8 +531,6 @@ class AppendableULongStruct return m_var_ulong; } - - private: uint32_t m_var_ulong{0}; @@ -573,7 +565,7 @@ class AppendableLongLongStruct eProsima_user_DllExport AppendableLongLongStruct( const AppendableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -595,7 +587,7 @@ class AppendableLongLongStruct const AppendableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -660,8 +652,6 @@ class AppendableLongLongStruct return m_var_longlong; } - - private: int64_t m_var_longlong{0}; @@ -696,7 +686,7 @@ class AppendableULongLongStruct eProsima_user_DllExport AppendableULongLongStruct( const AppendableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -718,7 +708,7 @@ class AppendableULongLongStruct const AppendableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -783,8 +773,6 @@ class AppendableULongLongStruct return m_var_ulonglong; } - - private: uint64_t m_var_ulonglong{0}; @@ -819,7 +807,7 @@ class AppendableFloatStruct eProsima_user_DllExport AppendableFloatStruct( const AppendableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -841,7 +829,7 @@ class AppendableFloatStruct const AppendableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -906,8 +894,6 @@ class AppendableFloatStruct return m_var_float; } - - private: float m_var_float{0.0}; @@ -942,7 +928,7 @@ class AppendableDoubleStruct eProsima_user_DllExport AppendableDoubleStruct( const AppendableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -964,7 +950,7 @@ class AppendableDoubleStruct const AppendableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1029,8 +1015,6 @@ class AppendableDoubleStruct return m_var_double; } - - private: double m_var_double{0.0}; @@ -1065,7 +1049,7 @@ class AppendableLongDoubleStruct eProsima_user_DllExport AppendableLongDoubleStruct( const AppendableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1087,7 +1071,7 @@ class AppendableLongDoubleStruct const AppendableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1152,8 +1136,6 @@ class AppendableLongDoubleStruct return m_var_longdouble; } - - private: long double m_var_longdouble{0.0}; @@ -1188,7 +1170,7 @@ class AppendableBooleanStruct eProsima_user_DllExport AppendableBooleanStruct( const AppendableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1210,7 +1192,7 @@ class AppendableBooleanStruct const AppendableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1275,8 +1257,6 @@ class AppendableBooleanStruct return m_var_boolean; } - - private: bool m_var_boolean{false}; @@ -1311,7 +1291,7 @@ class AppendableOctetStruct eProsima_user_DllExport AppendableOctetStruct( const AppendableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1333,7 +1313,7 @@ class AppendableOctetStruct const AppendableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1398,8 +1378,6 @@ class AppendableOctetStruct return m_var_octet; } - - private: uint8_t m_var_octet{0}; @@ -1434,7 +1412,7 @@ class AppendableCharStruct eProsima_user_DllExport AppendableCharStruct( const AppendableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1456,7 +1434,7 @@ class AppendableCharStruct const AppendableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1521,8 +1499,6 @@ class AppendableCharStruct return m_var_char8; } - - private: char m_var_char8{0}; @@ -1557,7 +1533,7 @@ class AppendableWCharStruct eProsima_user_DllExport AppendableWCharStruct( const AppendableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1579,7 +1555,7 @@ class AppendableWCharStruct const AppendableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1644,8 +1620,6 @@ class AppendableWCharStruct return m_var_char16; } - - private: wchar_t m_var_char16{0}; @@ -1680,7 +1654,7 @@ class AppendableUnionStruct eProsima_user_DllExport AppendableUnionStruct( const AppendableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1702,7 +1676,7 @@ class AppendableUnionStruct const AppendableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1777,8 +1751,6 @@ class AppendableUnionStruct return m_var_union; } - - private: InnerUnionHelper m_var_union; @@ -1873,8 +1845,6 @@ class AppendableEmptyStruct return !(*this == x); } - - private: @@ -1910,7 +1880,7 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct const AppendableEmptyInheritanceStruct& x) : AppendableEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1935,7 +1905,7 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct { AppendableEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1961,9 +1931,9 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct const AppendableEmptyInheritanceStruct& x) const { if (AppendableEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2015,8 +1985,6 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct return m_var_str; } - - private: std::string m_var_str; @@ -2053,7 +2021,7 @@ class AppendableInheritanceStruct : public AppendableShortStruct const AppendableInheritanceStruct& x) : AppendableShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2078,7 +2046,7 @@ class AppendableInheritanceStruct : public AppendableShortStruct { AppendableShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2104,9 +2072,9 @@ class AppendableInheritanceStruct : public AppendableShortStruct const AppendableInheritanceStruct& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2158,8 +2126,6 @@ class AppendableInheritanceStruct : public AppendableShortStruct return m_var_str; } - - private: std::string m_var_str; @@ -2247,9 +2213,9 @@ class AppendableInheritanceEmptyStruct : public AppendableShortStruct const AppendableInheritanceEmptyStruct& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2264,8 +2230,6 @@ class AppendableInheritanceEmptyStruct : public AppendableShortStruct return !(*this == x); } - - private: @@ -2301,7 +2265,7 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct const AppendableExtensibilityInheritance& x) : AppendableShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2326,7 +2290,7 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct { AppendableShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2352,9 +2316,9 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct const AppendableExtensibilityInheritance& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2396,8 +2360,6 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct return m_var_long; } - - private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp index 283108b3..8dffa29b 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp @@ -85,7 +85,7 @@ class ArrayShort eProsima_user_DllExport ArrayShort( const ArrayShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -107,7 +107,7 @@ class ArrayShort const ArrayShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -182,8 +182,6 @@ class ArrayShort return m_var_array_short; } - - private: std::array m_var_array_short{0}; @@ -218,7 +216,7 @@ class ArrayUShort eProsima_user_DllExport ArrayUShort( const ArrayUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -240,7 +238,7 @@ class ArrayUShort const ArrayUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -315,8 +313,6 @@ class ArrayUShort return m_var_array_ushort; } - - private: std::array m_var_array_ushort{0}; @@ -351,7 +347,7 @@ class ArrayLong eProsima_user_DllExport ArrayLong( const ArrayLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -373,7 +369,7 @@ class ArrayLong const ArrayLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -448,8 +444,6 @@ class ArrayLong return m_var_array_long; } - - private: std::array m_var_array_long{0}; @@ -484,7 +478,7 @@ class ArrayULong eProsima_user_DllExport ArrayULong( const ArrayULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -506,7 +500,7 @@ class ArrayULong const ArrayULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -581,8 +575,6 @@ class ArrayULong return m_var_array_ulong; } - - private: std::array m_var_array_ulong{0}; @@ -617,7 +609,7 @@ class ArrayLongLong eProsima_user_DllExport ArrayLongLong( const ArrayLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -639,7 +631,7 @@ class ArrayLongLong const ArrayLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -714,8 +706,6 @@ class ArrayLongLong return m_var_array_longlong; } - - private: std::array m_var_array_longlong{0}; @@ -750,7 +740,7 @@ class ArrayULongLong eProsima_user_DllExport ArrayULongLong( const ArrayULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -772,7 +762,7 @@ class ArrayULongLong const ArrayULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -847,8 +837,6 @@ class ArrayULongLong return m_var_array_ulonglong; } - - private: std::array m_var_array_ulonglong{0}; @@ -883,7 +871,7 @@ class ArrayFloat eProsima_user_DllExport ArrayFloat( const ArrayFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -905,7 +893,7 @@ class ArrayFloat const ArrayFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -980,8 +968,6 @@ class ArrayFloat return m_var_array_float; } - - private: std::array m_var_array_float{0.0}; @@ -1016,7 +1002,7 @@ class ArrayDouble eProsima_user_DllExport ArrayDouble( const ArrayDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -1038,7 +1024,7 @@ class ArrayDouble const ArrayDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -1113,8 +1099,6 @@ class ArrayDouble return m_var_array_double; } - - private: std::array m_var_array_double{0.0}; @@ -1149,7 +1133,7 @@ class ArrayLongDouble eProsima_user_DllExport ArrayLongDouble( const ArrayLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -1171,7 +1155,7 @@ class ArrayLongDouble const ArrayLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -1246,8 +1230,6 @@ class ArrayLongDouble return m_var_array_longdouble; } - - private: std::array m_var_array_longdouble{0.0}; @@ -1282,7 +1264,7 @@ class ArrayBoolean eProsima_user_DllExport ArrayBoolean( const ArrayBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -1304,7 +1286,7 @@ class ArrayBoolean const ArrayBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -1379,8 +1361,6 @@ class ArrayBoolean return m_var_array_boolean; } - - private: std::array m_var_array_boolean{false}; @@ -1415,7 +1395,7 @@ class ArrayOctet eProsima_user_DllExport ArrayOctet( const ArrayOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -1437,7 +1417,7 @@ class ArrayOctet const ArrayOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -1512,8 +1492,6 @@ class ArrayOctet return m_var_array_octet; } - - private: std::array m_var_array_octet{0}; @@ -1548,7 +1526,7 @@ class ArrayUInt8 eProsima_user_DllExport ArrayUInt8( const ArrayUInt8& x) { - m_var_array_uint8 = x.m_var_array_uint8; + m_var_array_uint8 = x.m_var_array_uint8; } @@ -1570,7 +1548,7 @@ class ArrayUInt8 const ArrayUInt8& x) { - m_var_array_uint8 = x.m_var_array_uint8; + m_var_array_uint8 = x.m_var_array_uint8; return *this; } @@ -1645,8 +1623,6 @@ class ArrayUInt8 return m_var_array_uint8; } - - private: std::array m_var_array_uint8{0}; @@ -1681,7 +1657,7 @@ class ArrayChar eProsima_user_DllExport ArrayChar( const ArrayChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -1703,7 +1679,7 @@ class ArrayChar const ArrayChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -1778,8 +1754,6 @@ class ArrayChar return m_var_array_char; } - - private: std::array m_var_array_char{0}; @@ -1814,7 +1788,7 @@ class ArrayWChar eProsima_user_DllExport ArrayWChar( const ArrayWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -1836,7 +1810,7 @@ class ArrayWChar const ArrayWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -1911,8 +1885,6 @@ class ArrayWChar return m_var_array_wchar; } - - private: std::array m_var_array_wchar{0}; @@ -1947,7 +1919,7 @@ class ArrayString eProsima_user_DllExport ArrayString( const ArrayString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -1969,7 +1941,7 @@ class ArrayString const ArrayString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -2044,8 +2016,6 @@ class ArrayString return m_var_array_string; } - - private: std::array m_var_array_string; @@ -2080,7 +2050,7 @@ class ArrayWString eProsima_user_DllExport ArrayWString( const ArrayWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -2102,7 +2072,7 @@ class ArrayWString const ArrayWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -2177,8 +2147,6 @@ class ArrayWString return m_var_array_wstring; } - - private: std::array m_var_array_wstring; @@ -2213,7 +2181,7 @@ class ArrayBoundedString eProsima_user_DllExport ArrayBoundedString( const ArrayBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -2235,7 +2203,7 @@ class ArrayBoundedString const ArrayBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -2310,8 +2278,6 @@ class ArrayBoundedString return m_var_array_bounded_string; } - - private: std::array m_var_array_bounded_string; @@ -2346,7 +2312,7 @@ class ArrayBoundedWString eProsima_user_DllExport ArrayBoundedWString( const ArrayBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -2368,7 +2334,7 @@ class ArrayBoundedWString const ArrayBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -2443,8 +2409,6 @@ class ArrayBoundedWString return m_var_array_bounded_wstring; } - - private: std::array m_var_array_bounded_wstring; @@ -2479,7 +2443,7 @@ class ArrayEnum eProsima_user_DllExport ArrayEnum( const ArrayEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -2501,7 +2465,7 @@ class ArrayEnum const ArrayEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -2576,8 +2540,6 @@ class ArrayEnum return m_var_array_enum; } - - private: std::array m_var_array_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -2612,7 +2574,7 @@ class ArrayBitMask eProsima_user_DllExport ArrayBitMask( const ArrayBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -2634,7 +2596,7 @@ class ArrayBitMask const ArrayBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -2709,8 +2671,6 @@ class ArrayBitMask return m_var_array_bitmask; } - - private: std::array m_var_array_bitmask{0}; @@ -2745,7 +2705,7 @@ class ArrayAlias eProsima_user_DllExport ArrayAlias( const ArrayAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -2767,7 +2727,7 @@ class ArrayAlias const ArrayAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -2842,8 +2802,6 @@ class ArrayAlias return m_var_array_alias; } - - private: std::array m_var_array_alias{0}; @@ -2878,7 +2836,7 @@ class ArrayShortArray eProsima_user_DllExport ArrayShortArray( const ArrayShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; } @@ -2900,7 +2858,7 @@ class ArrayShortArray const ArrayShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; return *this; } @@ -2975,8 +2933,6 @@ class ArrayShortArray return m_var_array_short_array; } - - private: std::array, 10> m_var_array_short_array{ {{0}} }; @@ -3011,7 +2967,7 @@ class ArraySequence eProsima_user_DllExport ArraySequence( const ArraySequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -3033,7 +2989,7 @@ class ArraySequence const ArraySequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -3108,8 +3064,6 @@ class ArraySequence return m_var_array_sequence; } - - private: std::array, 10> m_var_array_sequence; @@ -3144,7 +3098,7 @@ class ArrayMap eProsima_user_DllExport ArrayMap( const ArrayMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -3166,7 +3120,7 @@ class ArrayMap const ArrayMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -3241,8 +3195,6 @@ class ArrayMap return m_var_array_map; } - - private: std::array, 10> m_var_array_map; @@ -3277,7 +3229,7 @@ class ArrayUnion eProsima_user_DllExport ArrayUnion( const ArrayUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -3299,7 +3251,7 @@ class ArrayUnion const ArrayUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -3374,8 +3326,6 @@ class ArrayUnion return m_var_array_union; } - - private: std::array m_var_array_union; @@ -3410,7 +3360,7 @@ class ArrayStructure eProsima_user_DllExport ArrayStructure( const ArrayStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -3432,7 +3382,7 @@ class ArrayStructure const ArrayStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -3507,8 +3457,6 @@ class ArrayStructure return m_var_array_structure; } - - private: std::array m_var_array_structure; @@ -3543,7 +3491,7 @@ class ArrayBitset eProsima_user_DllExport ArrayBitset( const ArrayBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -3565,7 +3513,7 @@ class ArrayBitset const ArrayBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -3640,8 +3588,6 @@ class ArrayBitset return m_var_array_bitset; } - - private: std::array m_var_array_bitset; @@ -3676,7 +3622,7 @@ class ArrayMultiDimensionShort eProsima_user_DllExport ArrayMultiDimensionShort( const ArrayMultiDimensionShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -3698,7 +3644,7 @@ class ArrayMultiDimensionShort const ArrayMultiDimensionShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -3773,8 +3719,6 @@ class ArrayMultiDimensionShort return m_var_array_short; } - - private: std::array, 10>, 10> m_var_array_short{ {{ {{0}} }} }; @@ -3809,7 +3753,7 @@ class ArrayMultiDimensionUShort eProsima_user_DllExport ArrayMultiDimensionUShort( const ArrayMultiDimensionUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -3831,7 +3775,7 @@ class ArrayMultiDimensionUShort const ArrayMultiDimensionUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -3906,8 +3850,6 @@ class ArrayMultiDimensionUShort return m_var_array_ushort; } - - private: std::array, 10>, 10> m_var_array_ushort{ {{ {{0}} }} }; @@ -3942,7 +3884,7 @@ class ArrayMultiDimensionLong eProsima_user_DllExport ArrayMultiDimensionLong( const ArrayMultiDimensionLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -3964,7 +3906,7 @@ class ArrayMultiDimensionLong const ArrayMultiDimensionLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -4039,8 +3981,6 @@ class ArrayMultiDimensionLong return m_var_array_long; } - - private: std::array, 10>, 10> m_var_array_long{ {{ {{0}} }} }; @@ -4075,7 +4015,7 @@ class ArrayMultiDimensionULong eProsima_user_DllExport ArrayMultiDimensionULong( const ArrayMultiDimensionULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -4097,7 +4037,7 @@ class ArrayMultiDimensionULong const ArrayMultiDimensionULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -4172,8 +4112,6 @@ class ArrayMultiDimensionULong return m_var_array_ulong; } - - private: std::array, 10>, 10> m_var_array_ulong{ {{ {{0}} }} }; @@ -4208,7 +4146,7 @@ class ArrayMultiDimensionLongLong eProsima_user_DllExport ArrayMultiDimensionLongLong( const ArrayMultiDimensionLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -4230,7 +4168,7 @@ class ArrayMultiDimensionLongLong const ArrayMultiDimensionLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -4305,8 +4243,6 @@ class ArrayMultiDimensionLongLong return m_var_array_longlong; } - - private: std::array, 10>, 10> m_var_array_longlong{ {{ {{0}} }} }; @@ -4341,7 +4277,7 @@ class ArrayMultiDimensionULongLong eProsima_user_DllExport ArrayMultiDimensionULongLong( const ArrayMultiDimensionULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -4363,7 +4299,7 @@ class ArrayMultiDimensionULongLong const ArrayMultiDimensionULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -4438,8 +4374,6 @@ class ArrayMultiDimensionULongLong return m_var_array_ulonglong; } - - private: std::array, 10>, 10> m_var_array_ulonglong{ {{ {{0}} }} }; @@ -4474,7 +4408,7 @@ class ArrayMultiDimensionFloat eProsima_user_DllExport ArrayMultiDimensionFloat( const ArrayMultiDimensionFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -4496,7 +4430,7 @@ class ArrayMultiDimensionFloat const ArrayMultiDimensionFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -4571,8 +4505,6 @@ class ArrayMultiDimensionFloat return m_var_array_float; } - - private: std::array, 10>, 10> m_var_array_float{ {{ {{0.0}} }} }; @@ -4607,7 +4539,7 @@ class ArrayMultiDimensionDouble eProsima_user_DllExport ArrayMultiDimensionDouble( const ArrayMultiDimensionDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -4629,7 +4561,7 @@ class ArrayMultiDimensionDouble const ArrayMultiDimensionDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -4704,8 +4636,6 @@ class ArrayMultiDimensionDouble return m_var_array_double; } - - private: std::array, 10>, 10> m_var_array_double{ {{ {{0.0}} }} }; @@ -4740,7 +4670,7 @@ class ArrayMultiDimensionLongDouble eProsima_user_DllExport ArrayMultiDimensionLongDouble( const ArrayMultiDimensionLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -4762,7 +4692,7 @@ class ArrayMultiDimensionLongDouble const ArrayMultiDimensionLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -4823,7 +4753,8 @@ class ArrayMultiDimensionLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_longdouble() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_longdouble() const { return m_var_array_longdouble; } @@ -4837,8 +4768,6 @@ class ArrayMultiDimensionLongDouble return m_var_array_longdouble; } - - private: std::array, 10>, 10> m_var_array_longdouble{ {{ {{0.0}} }} }; @@ -4873,7 +4802,7 @@ class ArrayMultiDimensionBoolean eProsima_user_DllExport ArrayMultiDimensionBoolean( const ArrayMultiDimensionBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -4895,7 +4824,7 @@ class ArrayMultiDimensionBoolean const ArrayMultiDimensionBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -4970,8 +4899,6 @@ class ArrayMultiDimensionBoolean return m_var_array_boolean; } - - private: std::array, 10>, 10> m_var_array_boolean{ {{ {{false}} }} }; @@ -5006,7 +4933,7 @@ class ArrayMultiDimensionOctet eProsima_user_DllExport ArrayMultiDimensionOctet( const ArrayMultiDimensionOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -5028,7 +4955,7 @@ class ArrayMultiDimensionOctet const ArrayMultiDimensionOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -5103,8 +5030,6 @@ class ArrayMultiDimensionOctet return m_var_array_octet; } - - private: std::array, 10>, 10> m_var_array_octet{ {{ {{0}} }} }; @@ -5139,7 +5064,7 @@ class ArrayMultiDimensionChar eProsima_user_DllExport ArrayMultiDimensionChar( const ArrayMultiDimensionChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -5161,7 +5086,7 @@ class ArrayMultiDimensionChar const ArrayMultiDimensionChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -5236,8 +5161,6 @@ class ArrayMultiDimensionChar return m_var_array_char; } - - private: std::array, 10>, 10> m_var_array_char{ {{ {{0}} }} }; @@ -5272,7 +5195,7 @@ class ArrayMultiDimensionWChar eProsima_user_DllExport ArrayMultiDimensionWChar( const ArrayMultiDimensionWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -5294,7 +5217,7 @@ class ArrayMultiDimensionWChar const ArrayMultiDimensionWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -5369,8 +5292,6 @@ class ArrayMultiDimensionWChar return m_var_array_wchar; } - - private: std::array, 10>, 10> m_var_array_wchar{ {{ {{0}} }} }; @@ -5405,7 +5326,7 @@ class ArrayMultiDimensionString eProsima_user_DllExport ArrayMultiDimensionString( const ArrayMultiDimensionString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -5427,7 +5348,7 @@ class ArrayMultiDimensionString const ArrayMultiDimensionString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -5502,8 +5423,6 @@ class ArrayMultiDimensionString return m_var_array_string; } - - private: std::array, 10>, 10> m_var_array_string; @@ -5538,7 +5457,7 @@ class ArrayMultiDimensionWString eProsima_user_DllExport ArrayMultiDimensionWString( const ArrayMultiDimensionWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -5560,7 +5479,7 @@ class ArrayMultiDimensionWString const ArrayMultiDimensionWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -5621,7 +5540,8 @@ class ArrayMultiDimensionWString * @brief This function returns a constant reference to member var_array_wstring * @return Constant reference to member var_array_wstring */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_wstring() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_wstring() const { return m_var_array_wstring; } @@ -5635,8 +5555,6 @@ class ArrayMultiDimensionWString return m_var_array_wstring; } - - private: std::array, 10>, 10> m_var_array_wstring; @@ -5671,7 +5589,7 @@ class ArrayMultiDimensionBoundedString eProsima_user_DllExport ArrayMultiDimensionBoundedString( const ArrayMultiDimensionBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -5693,7 +5611,7 @@ class ArrayMultiDimensionBoundedString const ArrayMultiDimensionBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -5735,7 +5653,8 @@ class ArrayMultiDimensionBoundedString * @param _var_array_bounded_string New value to be copied in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - const std::array, 10>, 10>& _var_array_bounded_string) + const std::array, 10>, + 10>& _var_array_bounded_string) { m_var_array_bounded_string = _var_array_bounded_string; } @@ -5745,7 +5664,8 @@ class ArrayMultiDimensionBoundedString * @param _var_array_bounded_string New value to be moved in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - std::array, 10>, 10>&& _var_array_bounded_string) + std::array, 10>, + 10>&& _var_array_bounded_string) { m_var_array_bounded_string = std::move(_var_array_bounded_string); } @@ -5754,7 +5674,8 @@ class ArrayMultiDimensionBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_bounded_string() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -5763,13 +5684,12 @@ class ArrayMultiDimensionBoundedString * @brief This function returns a reference to member var_array_bounded_string * @return Reference to member var_array_bounded_string */ - eProsima_user_DllExport std::array, 10>, 10>& var_array_bounded_string() + eProsima_user_DllExport std::array, 10>, + 10>& var_array_bounded_string() { return m_var_array_bounded_string; } - - private: std::array, 10>, 10> m_var_array_bounded_string; @@ -5804,7 +5724,7 @@ class ArrayMultiDimensionBoundedWString eProsima_user_DllExport ArrayMultiDimensionBoundedWString( const ArrayMultiDimensionBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -5826,7 +5746,7 @@ class ArrayMultiDimensionBoundedWString const ArrayMultiDimensionBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -5868,7 +5788,8 @@ class ArrayMultiDimensionBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array, 10>, 10>& _var_array_bounded_wstring) + const std::array, 10>, + 10>& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -5878,7 +5799,8 @@ class ArrayMultiDimensionBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array, 10>, 10>&& _var_array_bounded_wstring) + std::array, 10>, + 10>&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -5887,7 +5809,8 @@ class ArrayMultiDimensionBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -5896,13 +5819,12 @@ class ArrayMultiDimensionBoundedWString * @brief This function returns a reference to member var_array_bounded_wstring * @return Reference to member var_array_bounded_wstring */ - eProsima_user_DllExport std::array, 10>, 10>& var_array_bounded_wstring() + eProsima_user_DllExport std::array, 10>, + 10>& var_array_bounded_wstring() { return m_var_array_bounded_wstring; } - - private: std::array, 10>, 10> m_var_array_bounded_wstring; @@ -5937,7 +5859,7 @@ class ArrayMultiDimensionEnum eProsima_user_DllExport ArrayMultiDimensionEnum( const ArrayMultiDimensionEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -5959,7 +5881,7 @@ class ArrayMultiDimensionEnum const ArrayMultiDimensionEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -6020,7 +5942,8 @@ class ArrayMultiDimensionEnum * @brief This function returns a constant reference to member var_array_enum * @return Constant reference to member var_array_enum */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_enum() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_enum() const { return m_var_array_enum; } @@ -6034,11 +5957,10 @@ class ArrayMultiDimensionEnum return m_var_array_enum; } - - private: - std::array, 10>, 10> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; + std::array, 10>, + 10> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; }; /*! @@ -6070,7 +5992,7 @@ class ArrayMultiDimensionBitMask eProsima_user_DllExport ArrayMultiDimensionBitMask( const ArrayMultiDimensionBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -6092,7 +6014,7 @@ class ArrayMultiDimensionBitMask const ArrayMultiDimensionBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -6153,7 +6075,8 @@ class ArrayMultiDimensionBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_bitmask() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_bitmask() const { return m_var_array_bitmask; } @@ -6167,8 +6090,6 @@ class ArrayMultiDimensionBitMask return m_var_array_bitmask; } - - private: std::array, 10>, 10> m_var_array_bitmask{ {{ {{0}} }} }; @@ -6203,7 +6124,7 @@ class ArrayMultiDimensionAlias eProsima_user_DllExport ArrayMultiDimensionAlias( const ArrayMultiDimensionAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -6225,7 +6146,7 @@ class ArrayMultiDimensionAlias const ArrayMultiDimensionAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -6286,7 +6207,8 @@ class ArrayMultiDimensionAlias * @brief This function returns a constant reference to member var_array_alias * @return Constant reference to member var_array_alias */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_alias() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_alias() const { return m_var_array_alias; } @@ -6300,8 +6222,6 @@ class ArrayMultiDimensionAlias return m_var_array_alias; } - - private: std::array, 10>, 10> m_var_array_alias{ {{ {{0}} }} }; @@ -6336,7 +6256,7 @@ class ArrayMultiDimensionSequence eProsima_user_DllExport ArrayMultiDimensionSequence( const ArrayMultiDimensionSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -6358,7 +6278,7 @@ class ArrayMultiDimensionSequence const ArrayMultiDimensionSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -6419,7 +6339,8 @@ class ArrayMultiDimensionSequence * @brief This function returns a constant reference to member var_array_sequence * @return Constant reference to member var_array_sequence */ - eProsima_user_DllExport const std::array, 10>, 10>, 10>& var_array_sequence() const + eProsima_user_DllExport const std::array, 10>, 10>, + 10>& var_array_sequence() const { return m_var_array_sequence; } @@ -6433,8 +6354,6 @@ class ArrayMultiDimensionSequence return m_var_array_sequence; } - - private: std::array, 10>, 10>, 10> m_var_array_sequence; @@ -6469,7 +6388,7 @@ class ArrayMultiDimensionMap eProsima_user_DllExport ArrayMultiDimensionMap( const ArrayMultiDimensionMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -6491,7 +6410,7 @@ class ArrayMultiDimensionMap const ArrayMultiDimensionMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -6552,7 +6471,8 @@ class ArrayMultiDimensionMap * @brief This function returns a constant reference to member var_array_map * @return Constant reference to member var_array_map */ - eProsima_user_DllExport const std::array, 10>, 10>, 10>& var_array_map() const + eProsima_user_DllExport const std::array, 10>, 10>, + 10>& var_array_map() const { return m_var_array_map; } @@ -6566,8 +6486,6 @@ class ArrayMultiDimensionMap return m_var_array_map; } - - private: std::array, 10>, 10>, 10> m_var_array_map; @@ -6602,7 +6520,7 @@ class ArrayMultiDimensionUnion eProsima_user_DllExport ArrayMultiDimensionUnion( const ArrayMultiDimensionUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -6624,7 +6542,7 @@ class ArrayMultiDimensionUnion const ArrayMultiDimensionUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -6685,7 +6603,8 @@ class ArrayMultiDimensionUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_union() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_union() const { return m_var_array_union; } @@ -6699,8 +6618,6 @@ class ArrayMultiDimensionUnion return m_var_array_union; } - - private: std::array, 10>, 10> m_var_array_union; @@ -6735,7 +6652,7 @@ class ArrayMultiDimensionStructure eProsima_user_DllExport ArrayMultiDimensionStructure( const ArrayMultiDimensionStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -6757,7 +6674,7 @@ class ArrayMultiDimensionStructure const ArrayMultiDimensionStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -6818,7 +6735,8 @@ class ArrayMultiDimensionStructure * @brief This function returns a constant reference to member var_array_structure * @return Constant reference to member var_array_structure */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_structure() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_structure() const { return m_var_array_structure; } @@ -6832,8 +6750,6 @@ class ArrayMultiDimensionStructure return m_var_array_structure; } - - private: std::array, 10>, 10> m_var_array_structure; @@ -6868,7 +6784,7 @@ class ArrayMultiDimensionBitset eProsima_user_DllExport ArrayMultiDimensionBitset( const ArrayMultiDimensionBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -6890,7 +6806,7 @@ class ArrayMultiDimensionBitset const ArrayMultiDimensionBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -6951,7 +6867,8 @@ class ArrayMultiDimensionBitset * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array, 10>, 10>& var_array_bitset() const + eProsima_user_DllExport const std::array, 10>, + 10>& var_array_bitset() const { return m_var_array_bitset; } @@ -6965,8 +6882,6 @@ class ArrayMultiDimensionBitset return m_var_array_bitset; } - - private: std::array, 10>, 10> m_var_array_bitset; @@ -7003,7 +6918,7 @@ class ArraySingleDimensionLiteralsShort eProsima_user_DllExport ArraySingleDimensionLiteralsShort( const ArraySingleDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -7025,7 +6940,7 @@ class ArraySingleDimensionLiteralsShort const ArraySingleDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -7100,8 +7015,6 @@ class ArraySingleDimensionLiteralsShort return m_var_array_short; } - - private: std::array m_var_array_short{0}; @@ -7136,7 +7049,7 @@ class ArraySingleDimensionLiteralsUnsignedShort eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedShort( const ArraySingleDimensionLiteralsUnsignedShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -7158,7 +7071,7 @@ class ArraySingleDimensionLiteralsUnsignedShort const ArraySingleDimensionLiteralsUnsignedShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -7200,7 +7113,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @param _var_array_ushort New value to be copied in member var_array_ushort */ eProsima_user_DllExport void var_array_ushort( - const std::array& _var_array_ushort) + const std::array& _var_array_ushort) { m_var_array_ushort = _var_array_ushort; } @@ -7210,7 +7123,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @param _var_array_ushort New value to be moved in member var_array_ushort */ eProsima_user_DllExport void var_array_ushort( - std::array&& _var_array_ushort) + std::array&& _var_array_ushort) { m_var_array_ushort = std::move(_var_array_ushort); } @@ -7219,7 +7132,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @brief This function returns a constant reference to member var_array_ushort * @return Constant reference to member var_array_ushort */ - eProsima_user_DllExport const std::array& var_array_ushort() const + eProsima_user_DllExport const std::array& var_array_ushort() const { return m_var_array_ushort; } @@ -7228,16 +7141,14 @@ class ArraySingleDimensionLiteralsUnsignedShort * @brief This function returns a reference to member var_array_ushort * @return Reference to member var_array_ushort */ - eProsima_user_DllExport std::array& var_array_ushort() + eProsima_user_DllExport std::array& var_array_ushort() { return m_var_array_ushort; } - - private: - std::array m_var_array_ushort{0}; + std::array m_var_array_ushort{0}; }; /*! @@ -7269,7 +7180,7 @@ class ArraySingleDimensionLiteralsLong eProsima_user_DllExport ArraySingleDimensionLiteralsLong( const ArraySingleDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -7291,7 +7202,7 @@ class ArraySingleDimensionLiteralsLong const ArraySingleDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -7333,7 +7244,7 @@ class ArraySingleDimensionLiteralsLong * @param _var_array_long New value to be copied in member var_array_long */ eProsima_user_DllExport void var_array_long( - const std::array& _var_array_long) + const std::array& _var_array_long) { m_var_array_long = _var_array_long; } @@ -7343,7 +7254,7 @@ class ArraySingleDimensionLiteralsLong * @param _var_array_long New value to be moved in member var_array_long */ eProsima_user_DllExport void var_array_long( - std::array&& _var_array_long) + std::array&& _var_array_long) { m_var_array_long = std::move(_var_array_long); } @@ -7352,7 +7263,7 @@ class ArraySingleDimensionLiteralsLong * @brief This function returns a constant reference to member var_array_long * @return Constant reference to member var_array_long */ - eProsima_user_DllExport const std::array& var_array_long() const + eProsima_user_DllExport const std::array& var_array_long() const { return m_var_array_long; } @@ -7361,16 +7272,14 @@ class ArraySingleDimensionLiteralsLong * @brief This function returns a reference to member var_array_long * @return Reference to member var_array_long */ - eProsima_user_DllExport std::array& var_array_long() + eProsima_user_DllExport std::array& var_array_long() { return m_var_array_long; } - - private: - std::array m_var_array_long{0}; + std::array m_var_array_long{0}; }; /*! @@ -7402,7 +7311,7 @@ class ArraySingleDimensionLiteralsUnsignedLong eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedLong( const ArraySingleDimensionLiteralsUnsignedLong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -7424,7 +7333,7 @@ class ArraySingleDimensionLiteralsUnsignedLong const ArraySingleDimensionLiteralsUnsignedLong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -7499,8 +7408,6 @@ class ArraySingleDimensionLiteralsUnsignedLong return m_var_array_ulong; } - - private: std::array m_var_array_ulong{0}; @@ -7535,7 +7442,7 @@ class ArraySingleDimensionLiteralsLongLong eProsima_user_DllExport ArraySingleDimensionLiteralsLongLong( const ArraySingleDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -7557,7 +7464,7 @@ class ArraySingleDimensionLiteralsLongLong const ArraySingleDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -7599,7 +7506,7 @@ class ArraySingleDimensionLiteralsLongLong * @param _var_array_longlong New value to be copied in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - const std::array& _var_array_longlong) + const std::array& _var_array_longlong) { m_var_array_longlong = _var_array_longlong; } @@ -7609,7 +7516,7 @@ class ArraySingleDimensionLiteralsLongLong * @param _var_array_longlong New value to be moved in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - std::array&& _var_array_longlong) + std::array&& _var_array_longlong) { m_var_array_longlong = std::move(_var_array_longlong); } @@ -7618,7 +7525,7 @@ class ArraySingleDimensionLiteralsLongLong * @brief This function returns a constant reference to member var_array_longlong * @return Constant reference to member var_array_longlong */ - eProsima_user_DllExport const std::array& var_array_longlong() const + eProsima_user_DllExport const std::array& var_array_longlong() const { return m_var_array_longlong; } @@ -7627,16 +7534,14 @@ class ArraySingleDimensionLiteralsLongLong * @brief This function returns a reference to member var_array_longlong * @return Reference to member var_array_longlong */ - eProsima_user_DllExport std::array& var_array_longlong() + eProsima_user_DllExport std::array& var_array_longlong() { return m_var_array_longlong; } - - private: - std::array m_var_array_longlong{0}; + std::array m_var_array_longlong{0}; }; /*! @@ -7668,7 +7573,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedLongLong( const ArraySingleDimensionLiteralsUnsignedLongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -7690,7 +7595,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong const ArraySingleDimensionLiteralsUnsignedLongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -7732,7 +7637,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong * @param _var_array_ulonglong New value to be copied in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - const std::array& _var_array_ulonglong) + const std::array& _var_array_ulonglong) { m_var_array_ulonglong = _var_array_ulonglong; } @@ -7742,7 +7647,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong * @param _var_array_ulonglong New value to be moved in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - std::array&& _var_array_ulonglong) + std::array&& _var_array_ulonglong) { m_var_array_ulonglong = std::move(_var_array_ulonglong); } @@ -7765,11 +7670,9 @@ class ArraySingleDimensionLiteralsUnsignedLongLong return m_var_array_ulonglong; } - - private: - std::array m_var_array_ulonglong{0}; + std::array m_var_array_ulonglong{0}; }; /*! @@ -7801,7 +7704,7 @@ class ArraySingleDimensionLiteralsFloat eProsima_user_DllExport ArraySingleDimensionLiteralsFloat( const ArraySingleDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -7823,7 +7726,7 @@ class ArraySingleDimensionLiteralsFloat const ArraySingleDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -7898,8 +7801,6 @@ class ArraySingleDimensionLiteralsFloat return m_var_array_float; } - - private: std::array m_var_array_float{0.0}; @@ -7934,7 +7835,7 @@ class ArraySingleDimensionLiteralsDouble eProsima_user_DllExport ArraySingleDimensionLiteralsDouble( const ArraySingleDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -7956,7 +7857,7 @@ class ArraySingleDimensionLiteralsDouble const ArraySingleDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -7998,7 +7899,7 @@ class ArraySingleDimensionLiteralsDouble * @param _var_array_double New value to be copied in member var_array_double */ eProsima_user_DllExport void var_array_double( - const std::array& _var_array_double) + const std::array& _var_array_double) { m_var_array_double = _var_array_double; } @@ -8008,7 +7909,7 @@ class ArraySingleDimensionLiteralsDouble * @param _var_array_double New value to be moved in member var_array_double */ eProsima_user_DllExport void var_array_double( - std::array&& _var_array_double) + std::array&& _var_array_double) { m_var_array_double = std::move(_var_array_double); } @@ -8017,7 +7918,7 @@ class ArraySingleDimensionLiteralsDouble * @brief This function returns a constant reference to member var_array_double * @return Constant reference to member var_array_double */ - eProsima_user_DllExport const std::array& var_array_double() const + eProsima_user_DllExport const std::array& var_array_double() const { return m_var_array_double; } @@ -8026,16 +7927,14 @@ class ArraySingleDimensionLiteralsDouble * @brief This function returns a reference to member var_array_double * @return Reference to member var_array_double */ - eProsima_user_DllExport std::array& var_array_double() + eProsima_user_DllExport std::array& var_array_double() { return m_var_array_double; } - - private: - std::array m_var_array_double{0.0}; + std::array m_var_array_double{0.0}; }; /*! @@ -8067,7 +7966,7 @@ class ArraySingleDimensionLiteralsLongDouble eProsima_user_DllExport ArraySingleDimensionLiteralsLongDouble( const ArraySingleDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -8089,7 +7988,7 @@ class ArraySingleDimensionLiteralsLongDouble const ArraySingleDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -8131,7 +8030,7 @@ class ArraySingleDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be copied in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - const std::array& _var_array_longdouble) + const std::array& _var_array_longdouble) { m_var_array_longdouble = _var_array_longdouble; } @@ -8141,7 +8040,7 @@ class ArraySingleDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be moved in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - std::array&& _var_array_longdouble) + std::array&& _var_array_longdouble) { m_var_array_longdouble = std::move(_var_array_longdouble); } @@ -8150,7 +8049,7 @@ class ArraySingleDimensionLiteralsLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array& var_array_longdouble() const + eProsima_user_DllExport const std::array& var_array_longdouble() const { return m_var_array_longdouble; } @@ -8159,16 +8058,14 @@ class ArraySingleDimensionLiteralsLongDouble * @brief This function returns a reference to member var_array_longdouble * @return Reference to member var_array_longdouble */ - eProsima_user_DllExport std::array& var_array_longdouble() + eProsima_user_DllExport std::array& var_array_longdouble() { return m_var_array_longdouble; } - - private: - std::array m_var_array_longdouble{0.0}; + std::array m_var_array_longdouble{0.0}; }; /*! @@ -8200,7 +8097,7 @@ class ArraySingleDimensionLiteralsBoolean eProsima_user_DllExport ArraySingleDimensionLiteralsBoolean( const ArraySingleDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -8222,7 +8119,7 @@ class ArraySingleDimensionLiteralsBoolean const ArraySingleDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -8297,8 +8194,6 @@ class ArraySingleDimensionLiteralsBoolean return m_var_array_boolean; } - - private: std::array m_var_array_boolean{false}; @@ -8333,7 +8228,7 @@ class ArraySingleDimensionLiteralsOctet eProsima_user_DllExport ArraySingleDimensionLiteralsOctet( const ArraySingleDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -8355,7 +8250,7 @@ class ArraySingleDimensionLiteralsOctet const ArraySingleDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -8430,8 +8325,6 @@ class ArraySingleDimensionLiteralsOctet return m_var_array_octet; } - - private: std::array m_var_array_octet{0}; @@ -8466,7 +8359,7 @@ class ArraySingleDimensionLiteralsChar eProsima_user_DllExport ArraySingleDimensionLiteralsChar( const ArraySingleDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -8488,7 +8381,7 @@ class ArraySingleDimensionLiteralsChar const ArraySingleDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -8563,8 +8456,6 @@ class ArraySingleDimensionLiteralsChar return m_var_array_char; } - - private: std::array m_var_array_char{0}; @@ -8599,7 +8490,7 @@ class ArraySingleDimensionLiteralsWChar eProsima_user_DllExport ArraySingleDimensionLiteralsWChar( const ArraySingleDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -8621,7 +8512,7 @@ class ArraySingleDimensionLiteralsWChar const ArraySingleDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -8663,7 +8554,7 @@ class ArraySingleDimensionLiteralsWChar * @param _var_array_wchar New value to be copied in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - const std::array& _var_array_wchar) + const std::array& _var_array_wchar) { m_var_array_wchar = _var_array_wchar; } @@ -8673,7 +8564,7 @@ class ArraySingleDimensionLiteralsWChar * @param _var_array_wchar New value to be moved in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - std::array&& _var_array_wchar) + std::array&& _var_array_wchar) { m_var_array_wchar = std::move(_var_array_wchar); } @@ -8682,7 +8573,7 @@ class ArraySingleDimensionLiteralsWChar * @brief This function returns a constant reference to member var_array_wchar * @return Constant reference to member var_array_wchar */ - eProsima_user_DllExport const std::array& var_array_wchar() const + eProsima_user_DllExport const std::array& var_array_wchar() const { return m_var_array_wchar; } @@ -8691,16 +8582,14 @@ class ArraySingleDimensionLiteralsWChar * @brief This function returns a reference to member var_array_wchar * @return Reference to member var_array_wchar */ - eProsima_user_DllExport std::array& var_array_wchar() + eProsima_user_DllExport std::array& var_array_wchar() { return m_var_array_wchar; } - - private: - std::array m_var_array_wchar{0}; + std::array m_var_array_wchar{0}; }; /*! @@ -8732,7 +8621,7 @@ class ArraySingleDimensionLiteralsString eProsima_user_DllExport ArraySingleDimensionLiteralsString( const ArraySingleDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -8754,7 +8643,7 @@ class ArraySingleDimensionLiteralsString const ArraySingleDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -8829,8 +8718,6 @@ class ArraySingleDimensionLiteralsString return m_var_array_string; } - - private: std::array m_var_array_string; @@ -8865,7 +8752,7 @@ class ArraySingleDimensionLiteralsWString eProsima_user_DllExport ArraySingleDimensionLiteralsWString( const ArraySingleDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -8887,7 +8774,7 @@ class ArraySingleDimensionLiteralsWString const ArraySingleDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -8929,7 +8816,7 @@ class ArraySingleDimensionLiteralsWString * @param _var_array_wstring New value to be copied in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - const std::array& _var_array_wstring) + const std::array& _var_array_wstring) { m_var_array_wstring = _var_array_wstring; } @@ -8939,7 +8826,7 @@ class ArraySingleDimensionLiteralsWString * @param _var_array_wstring New value to be moved in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - std::array&& _var_array_wstring) + std::array&& _var_array_wstring) { m_var_array_wstring = std::move(_var_array_wstring); } @@ -8962,11 +8849,9 @@ class ArraySingleDimensionLiteralsWString return m_var_array_wstring; } - - private: - std::array m_var_array_wstring; + std::array m_var_array_wstring; }; /*! @@ -8998,7 +8883,7 @@ class ArraySingleDimensionLiteralsBoundedString eProsima_user_DllExport ArraySingleDimensionLiteralsBoundedString( const ArraySingleDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -9020,7 +8905,7 @@ class ArraySingleDimensionLiteralsBoundedString const ArraySingleDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -9081,7 +8966,8 @@ class ArraySingleDimensionLiteralsBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array& var_array_bounded_string() const + eProsima_user_DllExport const std::array& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -9095,8 +8981,6 @@ class ArraySingleDimensionLiteralsBoundedString return m_var_array_bounded_string; } - - private: std::array m_var_array_bounded_string; @@ -9131,7 +9015,7 @@ class ArraySingleDimensionLiteralsBoundedWString eProsima_user_DllExport ArraySingleDimensionLiteralsBoundedWString( const ArraySingleDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -9153,7 +9037,7 @@ class ArraySingleDimensionLiteralsBoundedWString const ArraySingleDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -9195,7 +9079,7 @@ class ArraySingleDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array& _var_array_bounded_wstring) + const std::array& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -9205,7 +9089,7 @@ class ArraySingleDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array&& _var_array_bounded_wstring) + std::array&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -9214,7 +9098,8 @@ class ArraySingleDimensionLiteralsBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -9228,11 +9113,9 @@ class ArraySingleDimensionLiteralsBoundedWString return m_var_array_bounded_wstring; } - - private: - std::array m_var_array_bounded_wstring; + std::array m_var_array_bounded_wstring; }; /*! @@ -9264,7 +9147,7 @@ class ArraySingleDimensionLiteralsEnum eProsima_user_DllExport ArraySingleDimensionLiteralsEnum( const ArraySingleDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -9286,7 +9169,7 @@ class ArraySingleDimensionLiteralsEnum const ArraySingleDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -9361,8 +9244,6 @@ class ArraySingleDimensionLiteralsEnum return m_var_array_enum; } - - private: std::array m_var_array_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -9397,7 +9278,7 @@ class ArraySingleDimensionLiteralsBitMask eProsima_user_DllExport ArraySingleDimensionLiteralsBitMask( const ArraySingleDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -9419,7 +9300,7 @@ class ArraySingleDimensionLiteralsBitMask const ArraySingleDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -9461,7 +9342,7 @@ class ArraySingleDimensionLiteralsBitMask * @param _var_array_bitmask New value to be copied in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - const std::array& _var_array_bitmask) + const std::array& _var_array_bitmask) { m_var_array_bitmask = _var_array_bitmask; } @@ -9471,7 +9352,7 @@ class ArraySingleDimensionLiteralsBitMask * @param _var_array_bitmask New value to be moved in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - std::array&& _var_array_bitmask) + std::array&& _var_array_bitmask) { m_var_array_bitmask = std::move(_var_array_bitmask); } @@ -9480,7 +9361,7 @@ class ArraySingleDimensionLiteralsBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array& var_array_bitmask() const + eProsima_user_DllExport const std::array& var_array_bitmask() const { return m_var_array_bitmask; } @@ -9489,16 +9370,14 @@ class ArraySingleDimensionLiteralsBitMask * @brief This function returns a reference to member var_array_bitmask * @return Reference to member var_array_bitmask */ - eProsima_user_DllExport std::array& var_array_bitmask() + eProsima_user_DllExport std::array& var_array_bitmask() { return m_var_array_bitmask; } - - private: - std::array m_var_array_bitmask{0}; + std::array m_var_array_bitmask{0}; }; /*! @@ -9530,7 +9409,7 @@ class ArraySingleDimensionLiteralsAlias eProsima_user_DllExport ArraySingleDimensionLiteralsAlias( const ArraySingleDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -9552,7 +9431,7 @@ class ArraySingleDimensionLiteralsAlias const ArraySingleDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -9627,8 +9506,6 @@ class ArraySingleDimensionLiteralsAlias return m_var_array_alias; } - - private: std::array m_var_array_alias{0}; @@ -9663,7 +9540,7 @@ class ArraySingleDimensionLiteralsShortArray eProsima_user_DllExport ArraySingleDimensionLiteralsShortArray( const ArraySingleDimensionLiteralsShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; } @@ -9685,7 +9562,7 @@ class ArraySingleDimensionLiteralsShortArray const ArraySingleDimensionLiteralsShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; return *this; } @@ -9727,7 +9604,7 @@ class ArraySingleDimensionLiteralsShortArray * @param _var_array_short_array New value to be copied in member var_array_short_array */ eProsima_user_DllExport void var_array_short_array( - const std::array, size_1*size_2>& _var_array_short_array) + const std::array, size_1* size_2>& _var_array_short_array) { m_var_array_short_array = _var_array_short_array; } @@ -9737,7 +9614,7 @@ class ArraySingleDimensionLiteralsShortArray * @param _var_array_short_array New value to be moved in member var_array_short_array */ eProsima_user_DllExport void var_array_short_array( - std::array, size_1*size_2>&& _var_array_short_array) + std::array, size_1* size_2>&& _var_array_short_array) { m_var_array_short_array = std::move(_var_array_short_array); } @@ -9746,7 +9623,8 @@ class ArraySingleDimensionLiteralsShortArray * @brief This function returns a constant reference to member var_array_short_array * @return Constant reference to member var_array_short_array */ - eProsima_user_DllExport const std::array, size_1*size_2>& var_array_short_array() const + eProsima_user_DllExport const std::array, + size_1*size_2>& var_array_short_array() const { return m_var_array_short_array; } @@ -9755,16 +9633,14 @@ class ArraySingleDimensionLiteralsShortArray * @brief This function returns a reference to member var_array_short_array * @return Reference to member var_array_short_array */ - eProsima_user_DllExport std::array, size_1*size_2>& var_array_short_array() + eProsima_user_DllExport std::array, size_1*size_2>& var_array_short_array() { return m_var_array_short_array; } - - private: - std::array, size_1*size_2> m_var_array_short_array{ {{0}} }; + std::array, size_1* size_2> m_var_array_short_array{ {{0}} }; }; /*! @@ -9796,7 +9672,7 @@ class ArraySingleDimensionLiteralsSequence eProsima_user_DllExport ArraySingleDimensionLiteralsSequence( const ArraySingleDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -9818,7 +9694,7 @@ class ArraySingleDimensionLiteralsSequence const ArraySingleDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -9893,8 +9769,6 @@ class ArraySingleDimensionLiteralsSequence return m_var_array_sequence; } - - private: std::array, size_1> m_var_array_sequence; @@ -9929,7 +9803,7 @@ class ArraySingleDimensionLiteralsMap eProsima_user_DllExport ArraySingleDimensionLiteralsMap( const ArraySingleDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -9951,7 +9825,7 @@ class ArraySingleDimensionLiteralsMap const ArraySingleDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -10026,8 +9900,6 @@ class ArraySingleDimensionLiteralsMap return m_var_array_map; } - - private: std::array, size_2> m_var_array_map; @@ -10062,7 +9934,7 @@ class ArraySingleDimensionLiteralsUnion eProsima_user_DllExport ArraySingleDimensionLiteralsUnion( const ArraySingleDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -10084,7 +9956,7 @@ class ArraySingleDimensionLiteralsUnion const ArraySingleDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -10126,7 +9998,7 @@ class ArraySingleDimensionLiteralsUnion * @param _var_array_union New value to be copied in member var_array_union */ eProsima_user_DllExport void var_array_union( - const std::array& _var_array_union) + const std::array& _var_array_union) { m_var_array_union = _var_array_union; } @@ -10136,7 +10008,7 @@ class ArraySingleDimensionLiteralsUnion * @param _var_array_union New value to be moved in member var_array_union */ eProsima_user_DllExport void var_array_union( - std::array&& _var_array_union) + std::array&& _var_array_union) { m_var_array_union = std::move(_var_array_union); } @@ -10145,7 +10017,7 @@ class ArraySingleDimensionLiteralsUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array& var_array_union() const + eProsima_user_DllExport const std::array& var_array_union() const { return m_var_array_union; } @@ -10154,16 +10026,14 @@ class ArraySingleDimensionLiteralsUnion * @brief This function returns a reference to member var_array_union * @return Reference to member var_array_union */ - eProsima_user_DllExport std::array& var_array_union() + eProsima_user_DllExport std::array& var_array_union() { return m_var_array_union; } - - private: - std::array m_var_array_union; + std::array m_var_array_union; }; /*! @@ -10195,7 +10065,7 @@ class ArraySingleDimensionLiteralsStructure eProsima_user_DllExport ArraySingleDimensionLiteralsStructure( const ArraySingleDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -10217,7 +10087,7 @@ class ArraySingleDimensionLiteralsStructure const ArraySingleDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -10292,8 +10162,6 @@ class ArraySingleDimensionLiteralsStructure return m_var_array_structure; } - - private: std::array m_var_array_structure; @@ -10328,7 +10196,7 @@ class ArraySingleDimensionLiteralsBitset eProsima_user_DllExport ArraySingleDimensionLiteralsBitset( const ArraySingleDimensionLiteralsBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -10350,7 +10218,7 @@ class ArraySingleDimensionLiteralsBitset const ArraySingleDimensionLiteralsBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -10392,7 +10260,7 @@ class ArraySingleDimensionLiteralsBitset * @param _var_array_bitset New value to be copied in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - const std::array& _var_array_bitset) + const std::array& _var_array_bitset) { m_var_array_bitset = _var_array_bitset; } @@ -10402,7 +10270,7 @@ class ArraySingleDimensionLiteralsBitset * @param _var_array_bitset New value to be moved in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - std::array&& _var_array_bitset) + std::array&& _var_array_bitset) { m_var_array_bitset = std::move(_var_array_bitset); } @@ -10411,7 +10279,7 @@ class ArraySingleDimensionLiteralsBitset * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array& var_array_bitset() const + eProsima_user_DllExport const std::array& var_array_bitset() const { return m_var_array_bitset; } @@ -10420,16 +10288,14 @@ class ArraySingleDimensionLiteralsBitset * @brief This function returns a reference to member var_array_bitset * @return Reference to member var_array_bitset */ - eProsima_user_DllExport std::array& var_array_bitset() + eProsima_user_DllExport std::array& var_array_bitset() { return m_var_array_bitset; } - - private: - std::array m_var_array_bitset; + std::array m_var_array_bitset; }; /*! @@ -10461,7 +10327,7 @@ class ArrayMultiDimensionLiteralsShort eProsima_user_DllExport ArrayMultiDimensionLiteralsShort( const ArrayMultiDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -10483,7 +10349,7 @@ class ArrayMultiDimensionLiteralsShort const ArrayMultiDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -10525,7 +10391,7 @@ class ArrayMultiDimensionLiteralsShort * @param _var_array_short New value to be copied in member var_array_short */ eProsima_user_DllExport void var_array_short( - const std::array, 5+5>, size_1>& _var_array_short) + const std::array, 5 + 5>, size_1>& _var_array_short) { m_var_array_short = _var_array_short; } @@ -10535,7 +10401,7 @@ class ArrayMultiDimensionLiteralsShort * @param _var_array_short New value to be moved in member var_array_short */ eProsima_user_DllExport void var_array_short( - std::array, 5+5>, size_1>&& _var_array_short) + std::array, 5 + 5>, size_1>&& _var_array_short) { m_var_array_short = std::move(_var_array_short); } @@ -10544,7 +10410,8 @@ class ArrayMultiDimensionLiteralsShort * @brief This function returns a constant reference to member var_array_short * @return Constant reference to member var_array_short */ - eProsima_user_DllExport const std::array, 5+5>, size_1>& var_array_short() const + eProsima_user_DllExport const std::array, 5 + 5>, + size_1>& var_array_short() const { return m_var_array_short; } @@ -10553,16 +10420,14 @@ class ArrayMultiDimensionLiteralsShort * @brief This function returns a reference to member var_array_short * @return Reference to member var_array_short */ - eProsima_user_DllExport std::array, 5+5>, size_1>& var_array_short() + eProsima_user_DllExport std::array, 5 + 5>, size_1>& var_array_short() { return m_var_array_short; } - - private: - std::array, 5+5>, size_1> m_var_array_short{ {{ {{0}} }} }; + std::array, 5 + 5>, size_1> m_var_array_short{ {{ {{0}} }} }; }; /*! @@ -10594,7 +10459,7 @@ class ArrayMultiDimensionLiteralsUShort eProsima_user_DllExport ArrayMultiDimensionLiteralsUShort( const ArrayMultiDimensionLiteralsUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -10616,7 +10481,7 @@ class ArrayMultiDimensionLiteralsUShort const ArrayMultiDimensionLiteralsUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -10677,7 +10542,8 @@ class ArrayMultiDimensionLiteralsUShort * @brief This function returns a constant reference to member var_array_ushort * @return Constant reference to member var_array_ushort */ - eProsima_user_DllExport const std::array, size_1*2>, size_1>& var_array_ushort() const + eProsima_user_DllExport const std::array, size_1*2>, + size_1>& var_array_ushort() const { return m_var_array_ushort; } @@ -10691,8 +10557,6 @@ class ArrayMultiDimensionLiteralsUShort return m_var_array_ushort; } - - private: std::array, size_1*2>, size_1> m_var_array_ushort{ {{ {{0}} }} }; @@ -10727,7 +10591,7 @@ class ArrayMultiDimensionLiteralsLong eProsima_user_DllExport ArrayMultiDimensionLiteralsLong( const ArrayMultiDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -10749,7 +10613,7 @@ class ArrayMultiDimensionLiteralsLong const ArrayMultiDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -10791,7 +10655,7 @@ class ArrayMultiDimensionLiteralsLong * @param _var_array_long New value to be copied in member var_array_long */ eProsima_user_DllExport void var_array_long( - const std::array, size_1>, 5*2>& _var_array_long) + const std::array, size_1>, 5 * 2>& _var_array_long) { m_var_array_long = _var_array_long; } @@ -10801,7 +10665,7 @@ class ArrayMultiDimensionLiteralsLong * @param _var_array_long New value to be moved in member var_array_long */ eProsima_user_DllExport void var_array_long( - std::array, size_1>, 5*2>&& _var_array_long) + std::array, size_1>, 5 * 2>&& _var_array_long) { m_var_array_long = std::move(_var_array_long); } @@ -10810,7 +10674,7 @@ class ArrayMultiDimensionLiteralsLong * @brief This function returns a constant reference to member var_array_long * @return Constant reference to member var_array_long */ - eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_long() const + eProsima_user_DllExport const std::array, size_1>, 5 * 2>& var_array_long() const { return m_var_array_long; } @@ -10819,16 +10683,14 @@ class ArrayMultiDimensionLiteralsLong * @brief This function returns a reference to member var_array_long * @return Reference to member var_array_long */ - eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_long() + eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_long() { return m_var_array_long; } - - private: - std::array, size_1>, 5*2> m_var_array_long{ {{ {{0}} }} }; + std::array, size_1>, 5 * 2> m_var_array_long{ {{ {{0}} }} }; }; /*! @@ -10860,7 +10722,7 @@ class ArrayMultiDimensionLiteralsULong eProsima_user_DllExport ArrayMultiDimensionLiteralsULong( const ArrayMultiDimensionLiteralsULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -10882,7 +10744,7 @@ class ArrayMultiDimensionLiteralsULong const ArrayMultiDimensionLiteralsULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -10924,7 +10786,7 @@ class ArrayMultiDimensionLiteralsULong * @param _var_array_ulong New value to be copied in member var_array_ulong */ eProsima_user_DllExport void var_array_ulong( - const std::array, size_1*size_2>, 5+5>& _var_array_ulong) + const std::array, size_1* size_2>, 5 + 5>& _var_array_ulong) { m_var_array_ulong = _var_array_ulong; } @@ -10934,7 +10796,7 @@ class ArrayMultiDimensionLiteralsULong * @param _var_array_ulong New value to be moved in member var_array_ulong */ eProsima_user_DllExport void var_array_ulong( - std::array, size_1*size_2>, 5+5>&& _var_array_ulong) + std::array, size_1* size_2>, 5 + 5>&& _var_array_ulong) { m_var_array_ulong = std::move(_var_array_ulong); } @@ -10943,7 +10805,8 @@ class ArrayMultiDimensionLiteralsULong * @brief This function returns a constant reference to member var_array_ulong * @return Constant reference to member var_array_ulong */ - eProsima_user_DllExport const std::array, size_1*size_2>, 5+5>& var_array_ulong() const + eProsima_user_DllExport const std::array, size_1*size_2>, + 5 + 5>& var_array_ulong() const { return m_var_array_ulong; } @@ -10952,16 +10815,15 @@ class ArrayMultiDimensionLiteralsULong * @brief This function returns a reference to member var_array_ulong * @return Reference to member var_array_ulong */ - eProsima_user_DllExport std::array, size_1*size_2>, 5+5>& var_array_ulong() + eProsima_user_DllExport std::array, size_1*size_2>, + 5 + 5>& var_array_ulong() { return m_var_array_ulong; } - - private: - std::array, size_1*size_2>, 5+5> m_var_array_ulong{ {{ {{0}} }} }; + std::array, size_1* size_2>, 5 + 5> m_var_array_ulong{ {{ {{0}} }} }; }; /*! @@ -10993,7 +10855,7 @@ class ArrayMultiDimensionLiteralsLongLong eProsima_user_DllExport ArrayMultiDimensionLiteralsLongLong( const ArrayMultiDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -11015,7 +10877,7 @@ class ArrayMultiDimensionLiteralsLongLong const ArrayMultiDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -11057,7 +10919,7 @@ class ArrayMultiDimensionLiteralsLongLong * @param _var_array_longlong New value to be copied in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - const std::array, 5*2>, size_1>& _var_array_longlong) + const std::array, 5 * 2>, size_1>& _var_array_longlong) { m_var_array_longlong = _var_array_longlong; } @@ -11067,7 +10929,7 @@ class ArrayMultiDimensionLiteralsLongLong * @param _var_array_longlong New value to be moved in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - std::array, 5*2>, size_1>&& _var_array_longlong) + std::array, 5 * 2>, size_1>&& _var_array_longlong) { m_var_array_longlong = std::move(_var_array_longlong); } @@ -11076,7 +10938,8 @@ class ArrayMultiDimensionLiteralsLongLong * @brief This function returns a constant reference to member var_array_longlong * @return Constant reference to member var_array_longlong */ - eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_longlong() const + eProsima_user_DllExport const std::array, 5 * 2>, + size_1>& var_array_longlong() const { return m_var_array_longlong; } @@ -11085,16 +10948,14 @@ class ArrayMultiDimensionLiteralsLongLong * @brief This function returns a reference to member var_array_longlong * @return Reference to member var_array_longlong */ - eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_longlong() + eProsima_user_DllExport std::array, 5 * 2>, size_1>& var_array_longlong() { return m_var_array_longlong; } - - private: - std::array, 5*2>, size_1> m_var_array_longlong{ {{ {{0}} }} }; + std::array, 5 * 2>, size_1> m_var_array_longlong{ {{ {{0}} }} }; }; /*! @@ -11126,7 +10987,7 @@ class ArrayMultiDimensionLiteralsULongLong eProsima_user_DllExport ArrayMultiDimensionLiteralsULongLong( const ArrayMultiDimensionLiteralsULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -11148,7 +11009,7 @@ class ArrayMultiDimensionLiteralsULongLong const ArrayMultiDimensionLiteralsULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -11190,7 +11051,7 @@ class ArrayMultiDimensionLiteralsULongLong * @param _var_array_ulonglong New value to be copied in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - const std::array, size_1*size_2>, size_1+5>& _var_array_ulonglong) + const std::array, size_1* size_2>, size_1 + 5>& _var_array_ulonglong) { m_var_array_ulonglong = _var_array_ulonglong; } @@ -11200,7 +11061,7 @@ class ArrayMultiDimensionLiteralsULongLong * @param _var_array_ulonglong New value to be moved in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - std::array, size_1*size_2>, size_1+5>&& _var_array_ulonglong) + std::array, size_1* size_2>, size_1 + 5>&& _var_array_ulonglong) { m_var_array_ulonglong = std::move(_var_array_ulonglong); } @@ -11209,7 +11070,8 @@ class ArrayMultiDimensionLiteralsULongLong * @brief This function returns a constant reference to member var_array_ulonglong * @return Constant reference to member var_array_ulonglong */ - eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_ulonglong() const + eProsima_user_DllExport const std::array, size_1*size_2>, + size_1 + 5>& var_array_ulonglong() const { return m_var_array_ulonglong; } @@ -11218,16 +11080,16 @@ class ArrayMultiDimensionLiteralsULongLong * @brief This function returns a reference to member var_array_ulonglong * @return Reference to member var_array_ulonglong */ - eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_ulonglong() + eProsima_user_DllExport std::array, size_1*size_2>, + size_1 + 5>& var_array_ulonglong() { return m_var_array_ulonglong; } - - private: - std::array, size_1*size_2>, size_1+5> m_var_array_ulonglong{ {{ {{0}} }} }; + std::array, size_1* size_2>, + size_1 + 5> m_var_array_ulonglong{ {{ {{0}} }} }; }; /*! @@ -11259,7 +11121,7 @@ class ArrayMultiDimensionLiteralsFloat eProsima_user_DllExport ArrayMultiDimensionLiteralsFloat( const ArrayMultiDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -11281,7 +11143,7 @@ class ArrayMultiDimensionLiteralsFloat const ArrayMultiDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -11323,7 +11185,7 @@ class ArrayMultiDimensionLiteralsFloat * @param _var_array_float New value to be copied in member var_array_float */ eProsima_user_DllExport void var_array_float( - const std::array, size_1>, 5*2>& _var_array_float) + const std::array, size_1>, 5 * 2>& _var_array_float) { m_var_array_float = _var_array_float; } @@ -11333,7 +11195,7 @@ class ArrayMultiDimensionLiteralsFloat * @param _var_array_float New value to be moved in member var_array_float */ eProsima_user_DllExport void var_array_float( - std::array, size_1>, 5*2>&& _var_array_float) + std::array, size_1>, 5 * 2>&& _var_array_float) { m_var_array_float = std::move(_var_array_float); } @@ -11342,7 +11204,8 @@ class ArrayMultiDimensionLiteralsFloat * @brief This function returns a constant reference to member var_array_float * @return Constant reference to member var_array_float */ - eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_float() const + eProsima_user_DllExport const std::array, size_1>, + 5 * 2>& var_array_float() const { return m_var_array_float; } @@ -11351,16 +11214,14 @@ class ArrayMultiDimensionLiteralsFloat * @brief This function returns a reference to member var_array_float * @return Reference to member var_array_float */ - eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_float() + eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_float() { return m_var_array_float; } - - private: - std::array, size_1>, 5*2> m_var_array_float{ {{ {{0.0}} }} }; + std::array, size_1>, 5 * 2> m_var_array_float{ {{ {{0.0}} }} }; }; /*! @@ -11392,7 +11253,7 @@ class ArrayMultiDimensionLiteralsDouble eProsima_user_DllExport ArrayMultiDimensionLiteralsDouble( const ArrayMultiDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -11414,7 +11275,7 @@ class ArrayMultiDimensionLiteralsDouble const ArrayMultiDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -11456,7 +11317,7 @@ class ArrayMultiDimensionLiteralsDouble * @param _var_array_double New value to be copied in member var_array_double */ eProsima_user_DllExport void var_array_double( - const std::array, size_1+5>, size_1>& _var_array_double) + const std::array, size_1 + 5>, size_1>& _var_array_double) { m_var_array_double = _var_array_double; } @@ -11466,7 +11327,7 @@ class ArrayMultiDimensionLiteralsDouble * @param _var_array_double New value to be moved in member var_array_double */ eProsima_user_DllExport void var_array_double( - std::array, size_1+5>, size_1>&& _var_array_double) + std::array, size_1 + 5>, size_1>&& _var_array_double) { m_var_array_double = std::move(_var_array_double); } @@ -11475,7 +11336,8 @@ class ArrayMultiDimensionLiteralsDouble * @brief This function returns a constant reference to member var_array_double * @return Constant reference to member var_array_double */ - eProsima_user_DllExport const std::array, size_1+5>, size_1>& var_array_double() const + eProsima_user_DllExport const std::array, size_1 + 5>, + size_1>& var_array_double() const { return m_var_array_double; } @@ -11484,16 +11346,14 @@ class ArrayMultiDimensionLiteralsDouble * @brief This function returns a reference to member var_array_double * @return Reference to member var_array_double */ - eProsima_user_DllExport std::array, size_1+5>, size_1>& var_array_double() + eProsima_user_DllExport std::array, size_1 + 5>, size_1>& var_array_double() { return m_var_array_double; } - - private: - std::array, size_1+5>, size_1> m_var_array_double{ {{ {{0.0}} }} }; + std::array, size_1 + 5>, size_1> m_var_array_double{ {{ {{0.0}} }} }; }; /*! @@ -11525,7 +11385,7 @@ class ArrayMultiDimensionLiteralsLongDouble eProsima_user_DllExport ArrayMultiDimensionLiteralsLongDouble( const ArrayMultiDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -11547,7 +11407,7 @@ class ArrayMultiDimensionLiteralsLongDouble const ArrayMultiDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -11589,7 +11449,7 @@ class ArrayMultiDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be copied in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - const std::array, size_1>, size_1>& _var_array_longdouble) + const std::array, size_1>, size_1>& _var_array_longdouble) { m_var_array_longdouble = _var_array_longdouble; } @@ -11599,7 +11459,7 @@ class ArrayMultiDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be moved in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - std::array, size_1>, size_1>&& _var_array_longdouble) + std::array, size_1>, size_1>&& _var_array_longdouble) { m_var_array_longdouble = std::move(_var_array_longdouble); } @@ -11608,7 +11468,8 @@ class ArrayMultiDimensionLiteralsLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array, size_1>, size_1>& var_array_longdouble() const + eProsima_user_DllExport const std::array, size_1>, + size_1>& var_array_longdouble() const { return m_var_array_longdouble; } @@ -11617,16 +11478,15 @@ class ArrayMultiDimensionLiteralsLongDouble * @brief This function returns a reference to member var_array_longdouble * @return Reference to member var_array_longdouble */ - eProsima_user_DllExport std::array, size_1>, size_1>& var_array_longdouble() + eProsima_user_DllExport std::array, size_1>, + size_1>& var_array_longdouble() { return m_var_array_longdouble; } - - private: - std::array, size_1>, size_1> m_var_array_longdouble{ {{ {{0.0}} }} }; + std::array, size_1>, size_1> m_var_array_longdouble{ {{ {{0.0}} }} }; }; /*! @@ -11658,7 +11518,7 @@ class ArrayMultiDimensionLiteralsBoolean eProsima_user_DllExport ArrayMultiDimensionLiteralsBoolean( const ArrayMultiDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -11680,7 +11540,7 @@ class ArrayMultiDimensionLiteralsBoolean const ArrayMultiDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -11722,7 +11582,7 @@ class ArrayMultiDimensionLiteralsBoolean * @param _var_array_boolean New value to be copied in member var_array_boolean */ eProsima_user_DllExport void var_array_boolean( - const std::array, size_1>, size_1*size_2>& _var_array_boolean) + const std::array, size_1>, size_1* size_2>& _var_array_boolean) { m_var_array_boolean = _var_array_boolean; } @@ -11732,7 +11592,7 @@ class ArrayMultiDimensionLiteralsBoolean * @param _var_array_boolean New value to be moved in member var_array_boolean */ eProsima_user_DllExport void var_array_boolean( - std::array, size_1>, size_1*size_2>&& _var_array_boolean) + std::array, size_1>, size_1* size_2>&& _var_array_boolean) { m_var_array_boolean = std::move(_var_array_boolean); } @@ -11741,7 +11601,8 @@ class ArrayMultiDimensionLiteralsBoolean * @brief This function returns a constant reference to member var_array_boolean * @return Constant reference to member var_array_boolean */ - eProsima_user_DllExport const std::array, size_1>, size_1*size_2>& var_array_boolean() const + eProsima_user_DllExport const std::array, size_1>, + size_1*size_2>& var_array_boolean() const { return m_var_array_boolean; } @@ -11755,11 +11616,9 @@ class ArrayMultiDimensionLiteralsBoolean return m_var_array_boolean; } - - private: - std::array, size_1>, size_1*size_2> m_var_array_boolean{ {{ {{false}} }} }; + std::array, size_1>, size_1* size_2> m_var_array_boolean{ {{ {{false}} }} }; }; /*! @@ -11791,7 +11650,7 @@ class ArrayMultiDimensionLiteralsOctet eProsima_user_DllExport ArrayMultiDimensionLiteralsOctet( const ArrayMultiDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -11813,7 +11672,7 @@ class ArrayMultiDimensionLiteralsOctet const ArrayMultiDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -11874,7 +11733,8 @@ class ArrayMultiDimensionLiteralsOctet * @brief This function returns a constant reference to member var_array_octet * @return Constant reference to member var_array_octet */ - eProsima_user_DllExport const std::array, size_1*2>, size_1>& var_array_octet() const + eProsima_user_DllExport const std::array, size_1*2>, + size_1>& var_array_octet() const { return m_var_array_octet; } @@ -11888,8 +11748,6 @@ class ArrayMultiDimensionLiteralsOctet return m_var_array_octet; } - - private: std::array, size_1*2>, size_1> m_var_array_octet{ {{ {{0}} }} }; @@ -11924,7 +11782,7 @@ class ArrayMultiDimensionLiteralsChar eProsima_user_DllExport ArrayMultiDimensionLiteralsChar( const ArrayMultiDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -11946,7 +11804,7 @@ class ArrayMultiDimensionLiteralsChar const ArrayMultiDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -11988,7 +11846,7 @@ class ArrayMultiDimensionLiteralsChar * @param _var_array_char New value to be copied in member var_array_char */ eProsima_user_DllExport void var_array_char( - const std::array, size_1>, 5+5>& _var_array_char) + const std::array, size_1>, 5 + 5>& _var_array_char) { m_var_array_char = _var_array_char; } @@ -11998,7 +11856,7 @@ class ArrayMultiDimensionLiteralsChar * @param _var_array_char New value to be moved in member var_array_char */ eProsima_user_DllExport void var_array_char( - std::array, size_1>, 5+5>&& _var_array_char) + std::array, size_1>, 5 + 5>&& _var_array_char) { m_var_array_char = std::move(_var_array_char); } @@ -12007,7 +11865,7 @@ class ArrayMultiDimensionLiteralsChar * @brief This function returns a constant reference to member var_array_char * @return Constant reference to member var_array_char */ - eProsima_user_DllExport const std::array, size_1>, 5+5>& var_array_char() const + eProsima_user_DllExport const std::array, size_1>, 5 + 5>& var_array_char() const { return m_var_array_char; } @@ -12016,16 +11874,14 @@ class ArrayMultiDimensionLiteralsChar * @brief This function returns a reference to member var_array_char * @return Reference to member var_array_char */ - eProsima_user_DllExport std::array, size_1>, 5+5>& var_array_char() + eProsima_user_DllExport std::array, size_1>, 5 + 5>& var_array_char() { return m_var_array_char; } - - private: - std::array, size_1>, 5+5> m_var_array_char{ {{ {{0}} }} }; + std::array, size_1>, 5 + 5> m_var_array_char{ {{ {{0}} }} }; }; /*! @@ -12057,7 +11913,7 @@ class ArrayMultiDimensionLiteralsWChar eProsima_user_DllExport ArrayMultiDimensionLiteralsWChar( const ArrayMultiDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -12079,7 +11935,7 @@ class ArrayMultiDimensionLiteralsWChar const ArrayMultiDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -12121,7 +11977,7 @@ class ArrayMultiDimensionLiteralsWChar * @param _var_array_wchar New value to be copied in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - const std::array, size_1+5>, size_1*size_2>& _var_array_wchar) + const std::array, size_1 + 5>, size_1* size_2>& _var_array_wchar) { m_var_array_wchar = _var_array_wchar; } @@ -12131,7 +11987,7 @@ class ArrayMultiDimensionLiteralsWChar * @param _var_array_wchar New value to be moved in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - std::array, size_1+5>, size_1*size_2>&& _var_array_wchar) + std::array, size_1 + 5>, size_1* size_2>&& _var_array_wchar) { m_var_array_wchar = std::move(_var_array_wchar); } @@ -12140,7 +11996,8 @@ class ArrayMultiDimensionLiteralsWChar * @brief This function returns a constant reference to member var_array_wchar * @return Constant reference to member var_array_wchar */ - eProsima_user_DllExport const std::array, size_1+5>, size_1*size_2>& var_array_wchar() const + eProsima_user_DllExport const std::array, size_1 + 5>, + size_1*size_2>& var_array_wchar() const { return m_var_array_wchar; } @@ -12149,16 +12006,15 @@ class ArrayMultiDimensionLiteralsWChar * @brief This function returns a reference to member var_array_wchar * @return Reference to member var_array_wchar */ - eProsima_user_DllExport std::array, size_1+5>, size_1*size_2>& var_array_wchar() + eProsima_user_DllExport std::array, size_1 + 5>, + size_1*size_2>& var_array_wchar() { return m_var_array_wchar; } - - private: - std::array, size_1+5>, size_1*size_2> m_var_array_wchar{ {{ {{0}} }} }; + std::array, size_1 + 5>, size_1* size_2> m_var_array_wchar{ {{ {{0}} }} }; }; /*! @@ -12190,7 +12046,7 @@ class ArrayMultiDimensionLiteralsString eProsima_user_DllExport ArrayMultiDimensionLiteralsString( const ArrayMultiDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -12212,7 +12068,7 @@ class ArrayMultiDimensionLiteralsString const ArrayMultiDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -12254,7 +12110,7 @@ class ArrayMultiDimensionLiteralsString * @param _var_array_string New value to be copied in member var_array_string */ eProsima_user_DllExport void var_array_string( - const std::array, 5*2>, size_1>& _var_array_string) + const std::array, 5 * 2>, size_1>& _var_array_string) { m_var_array_string = _var_array_string; } @@ -12264,7 +12120,7 @@ class ArrayMultiDimensionLiteralsString * @param _var_array_string New value to be moved in member var_array_string */ eProsima_user_DllExport void var_array_string( - std::array, 5*2>, size_1>&& _var_array_string) + std::array, 5 * 2>, size_1>&& _var_array_string) { m_var_array_string = std::move(_var_array_string); } @@ -12273,7 +12129,8 @@ class ArrayMultiDimensionLiteralsString * @brief This function returns a constant reference to member var_array_string * @return Constant reference to member var_array_string */ - eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_string() const + eProsima_user_DllExport const std::array, 5 * 2>, + size_1>& var_array_string() const { return m_var_array_string; } @@ -12282,16 +12139,14 @@ class ArrayMultiDimensionLiteralsString * @brief This function returns a reference to member var_array_string * @return Reference to member var_array_string */ - eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_string() + eProsima_user_DllExport std::array, 5 * 2>, size_1>& var_array_string() { return m_var_array_string; } - - private: - std::array, 5*2>, size_1> m_var_array_string; + std::array, 5 * 2>, size_1> m_var_array_string; }; /*! @@ -12323,7 +12178,7 @@ class ArrayMultiDimensionLiteralsWString eProsima_user_DllExport ArrayMultiDimensionLiteralsWString( const ArrayMultiDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -12345,7 +12200,7 @@ class ArrayMultiDimensionLiteralsWString const ArrayMultiDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -12387,7 +12242,8 @@ class ArrayMultiDimensionLiteralsWString * @param _var_array_wstring New value to be copied in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - const std::array, size_1*size_2>, size_1+5>& _var_array_wstring) + const std::array, size_1* size_2>, + size_1 + 5>& _var_array_wstring) { m_var_array_wstring = _var_array_wstring; } @@ -12397,7 +12253,7 @@ class ArrayMultiDimensionLiteralsWString * @param _var_array_wstring New value to be moved in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - std::array, size_1*size_2>, size_1+5>&& _var_array_wstring) + std::array, size_1* size_2>, size_1 + 5>&& _var_array_wstring) { m_var_array_wstring = std::move(_var_array_wstring); } @@ -12406,7 +12262,8 @@ class ArrayMultiDimensionLiteralsWString * @brief This function returns a constant reference to member var_array_wstring * @return Constant reference to member var_array_wstring */ - eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_wstring() const + eProsima_user_DllExport const std::array, size_1*size_2>, + size_1 + 5>& var_array_wstring() const { return m_var_array_wstring; } @@ -12415,16 +12272,15 @@ class ArrayMultiDimensionLiteralsWString * @brief This function returns a reference to member var_array_wstring * @return Reference to member var_array_wstring */ - eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_wstring() + eProsima_user_DllExport std::array, size_1*size_2>, + size_1 + 5>& var_array_wstring() { return m_var_array_wstring; } - - private: - std::array, size_1*size_2>, size_1+5> m_var_array_wstring; + std::array, size_1* size_2>, size_1 + 5> m_var_array_wstring; }; /*! @@ -12456,7 +12312,7 @@ class ArrayMultiDimensionLiteralsBoundedString eProsima_user_DllExport ArrayMultiDimensionLiteralsBoundedString( const ArrayMultiDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -12478,7 +12334,7 @@ class ArrayMultiDimensionLiteralsBoundedString const ArrayMultiDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -12520,7 +12376,8 @@ class ArrayMultiDimensionLiteralsBoundedString * @param _var_array_bounded_string New value to be copied in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - const std::array, 5*2>, size_1>& _var_array_bounded_string) + const std::array, 5 * 2>, + size_1>& _var_array_bounded_string) { m_var_array_bounded_string = _var_array_bounded_string; } @@ -12530,7 +12387,8 @@ class ArrayMultiDimensionLiteralsBoundedString * @param _var_array_bounded_string New value to be moved in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - std::array, 5*2>, size_1>&& _var_array_bounded_string) + std::array, 5 * 2>, + size_1>&& _var_array_bounded_string) { m_var_array_bounded_string = std::move(_var_array_bounded_string); } @@ -12539,7 +12397,8 @@ class ArrayMultiDimensionLiteralsBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_bounded_string() const + eProsima_user_DllExport const std::array, 5 * 2>, + size_1>& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -12548,16 +12407,15 @@ class ArrayMultiDimensionLiteralsBoundedString * @brief This function returns a reference to member var_array_bounded_string * @return Reference to member var_array_bounded_string */ - eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_bounded_string() + eProsima_user_DllExport std::array, 5 * 2>, + size_1>& var_array_bounded_string() { return m_var_array_bounded_string; } - - private: - std::array, 5*2>, size_1> m_var_array_bounded_string; + std::array, 5 * 2>, size_1> m_var_array_bounded_string; }; /*! @@ -12589,7 +12447,7 @@ class ArrayMultiDimensionLiteralsBoundedWString eProsima_user_DllExport ArrayMultiDimensionLiteralsBoundedWString( const ArrayMultiDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -12611,7 +12469,7 @@ class ArrayMultiDimensionLiteralsBoundedWString const ArrayMultiDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -12653,7 +12511,8 @@ class ArrayMultiDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array, size_1*size_2>, size_1+5>& _var_array_bounded_wstring) + const std::array, size_1* size_2>, + size_1 + 5>& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -12663,7 +12522,8 @@ class ArrayMultiDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array, size_1*size_2>, size_1+5>&& _var_array_bounded_wstring) + std::array, size_1* size_2>, + size_1 + 5>&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -12672,7 +12532,8 @@ class ArrayMultiDimensionLiteralsBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array, + size_1*size_2>, size_1 + 5>& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -12681,16 +12542,16 @@ class ArrayMultiDimensionLiteralsBoundedWString * @brief This function returns a reference to member var_array_bounded_wstring * @return Reference to member var_array_bounded_wstring */ - eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_bounded_wstring() + eProsima_user_DllExport std::array, size_1*size_2>, + size_1 + 5>& var_array_bounded_wstring() { return m_var_array_bounded_wstring; } - - private: - std::array, size_1*size_2>, size_1+5> m_var_array_bounded_wstring; + std::array, size_1* size_2>, + size_1 + 5> m_var_array_bounded_wstring; }; /*! @@ -12722,7 +12583,7 @@ class ArrayMultiDimensionLiteralsEnum eProsima_user_DllExport ArrayMultiDimensionLiteralsEnum( const ArrayMultiDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -12744,7 +12605,7 @@ class ArrayMultiDimensionLiteralsEnum const ArrayMultiDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -12786,7 +12647,7 @@ class ArrayMultiDimensionLiteralsEnum * @param _var_array_enum New value to be copied in member var_array_enum */ eProsima_user_DllExport void var_array_enum( - const std::array, size_1>, 5*2>& _var_array_enum) + const std::array, size_1>, 5 * 2>& _var_array_enum) { m_var_array_enum = _var_array_enum; } @@ -12796,7 +12657,7 @@ class ArrayMultiDimensionLiteralsEnum * @param _var_array_enum New value to be moved in member var_array_enum */ eProsima_user_DllExport void var_array_enum( - std::array, size_1>, 5*2>&& _var_array_enum) + std::array, size_1>, 5 * 2>&& _var_array_enum) { m_var_array_enum = std::move(_var_array_enum); } @@ -12805,7 +12666,8 @@ class ArrayMultiDimensionLiteralsEnum * @brief This function returns a constant reference to member var_array_enum * @return Constant reference to member var_array_enum */ - eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_enum() const + eProsima_user_DllExport const std::array, size_1>, + 5 * 2>& var_array_enum() const { return m_var_array_enum; } @@ -12814,16 +12676,15 @@ class ArrayMultiDimensionLiteralsEnum * @brief This function returns a reference to member var_array_enum * @return Reference to member var_array_enum */ - eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_enum() + eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_enum() { return m_var_array_enum; } - - private: - std::array, size_1>, 5*2> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; + std::array, size_1>, + 5 * 2> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; }; /*! @@ -12855,7 +12716,7 @@ class ArrayMultiDimensionLiteralsBitMask eProsima_user_DllExport ArrayMultiDimensionLiteralsBitMask( const ArrayMultiDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -12877,7 +12738,7 @@ class ArrayMultiDimensionLiteralsBitMask const ArrayMultiDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -12919,7 +12780,8 @@ class ArrayMultiDimensionLiteralsBitMask * @param _var_array_bitmask New value to be copied in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - const std::array, size_1+5>, size_1>& _var_array_bitmask) + const std::array, size_1 + 5>, + size_1>& _var_array_bitmask) { m_var_array_bitmask = _var_array_bitmask; } @@ -12929,7 +12791,7 @@ class ArrayMultiDimensionLiteralsBitMask * @param _var_array_bitmask New value to be moved in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - std::array, size_1+5>, size_1>&& _var_array_bitmask) + std::array, size_1 + 5>, size_1>&& _var_array_bitmask) { m_var_array_bitmask = std::move(_var_array_bitmask); } @@ -12938,7 +12800,8 @@ class ArrayMultiDimensionLiteralsBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array, size_1+5>, size_1>& var_array_bitmask() const + eProsima_user_DllExport const std::array, size_1 + 5>, + size_1>& var_array_bitmask() const { return m_var_array_bitmask; } @@ -12947,16 +12810,16 @@ class ArrayMultiDimensionLiteralsBitMask * @brief This function returns a reference to member var_array_bitmask * @return Reference to member var_array_bitmask */ - eProsima_user_DllExport std::array, size_1+5>, size_1>& var_array_bitmask() + eProsima_user_DllExport std::array, size_1 + 5>, + size_1>& var_array_bitmask() { return m_var_array_bitmask; } - - private: - std::array, size_1+5>, size_1> m_var_array_bitmask{ {{ {{0}} }} }; + std::array, size_1 + 5>, + size_1> m_var_array_bitmask{ {{ {{0}} }} }; }; /*! @@ -12988,7 +12851,7 @@ class ArrayMultiDimensionLiteralsAlias eProsima_user_DllExport ArrayMultiDimensionLiteralsAlias( const ArrayMultiDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -13010,7 +12873,7 @@ class ArrayMultiDimensionLiteralsAlias const ArrayMultiDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -13052,7 +12915,8 @@ class ArrayMultiDimensionLiteralsAlias * @param _var_array_alias New value to be copied in member var_array_alias */ eProsima_user_DllExport void var_array_alias( - const std::array, 5*2>, size_1*2>& _var_array_alias) + const std::array, 5 * 2>, + size_1*2>& _var_array_alias) { m_var_array_alias = _var_array_alias; } @@ -13062,7 +12926,7 @@ class ArrayMultiDimensionLiteralsAlias * @param _var_array_alias New value to be moved in member var_array_alias */ eProsima_user_DllExport void var_array_alias( - std::array, 5*2>, size_1*2>&& _var_array_alias) + std::array, 5 * 2>, size_1*2>&& _var_array_alias) { m_var_array_alias = std::move(_var_array_alias); } @@ -13071,7 +12935,8 @@ class ArrayMultiDimensionLiteralsAlias * @brief This function returns a constant reference to member var_array_alias * @return Constant reference to member var_array_alias */ - eProsima_user_DllExport const std::array, 5*2>, size_1*2>& var_array_alias() const + eProsima_user_DllExport const std::array, 5 * 2>, + size_1*2>& var_array_alias() const { return m_var_array_alias; } @@ -13080,16 +12945,16 @@ class ArrayMultiDimensionLiteralsAlias * @brief This function returns a reference to member var_array_alias * @return Reference to member var_array_alias */ - eProsima_user_DllExport std::array, 5*2>, size_1*2>& var_array_alias() + eProsima_user_DllExport std::array, 5 * 2>, + size_1*2>& var_array_alias() { return m_var_array_alias; } - - private: - std::array, 5*2>, size_1*2> m_var_array_alias{ {{ {{0}} }} }; + std::array, 5 * 2>, + size_1*2> m_var_array_alias{ {{ {{0}} }} }; }; /*! @@ -13121,7 +12986,7 @@ class ArrayMultiDimensionLiteralsSequence eProsima_user_DllExport ArrayMultiDimensionLiteralsSequence( const ArrayMultiDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -13143,7 +13008,7 @@ class ArrayMultiDimensionLiteralsSequence const ArrayMultiDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -13185,7 +13050,8 @@ class ArrayMultiDimensionLiteralsSequence * @param _var_array_sequence New value to be copied in member var_array_sequence */ eProsima_user_DllExport void var_array_sequence( - const std::array, 5*2>, size_1>, size_1+5>& _var_array_sequence) + const std::array, 5 * 2>, size_1>, + size_1 + 5>& _var_array_sequence) { m_var_array_sequence = _var_array_sequence; } @@ -13195,7 +13061,7 @@ class ArrayMultiDimensionLiteralsSequence * @param _var_array_sequence New value to be moved in member var_array_sequence */ eProsima_user_DllExport void var_array_sequence( - std::array, 5*2>, size_1>, size_1+5>&& _var_array_sequence) + std::array, 5 * 2>, size_1>, size_1 + 5>&& _var_array_sequence) { m_var_array_sequence = std::move(_var_array_sequence); } @@ -13204,7 +13070,8 @@ class ArrayMultiDimensionLiteralsSequence * @brief This function returns a constant reference to member var_array_sequence * @return Constant reference to member var_array_sequence */ - eProsima_user_DllExport const std::array, 5*2>, size_1>, size_1+5>& var_array_sequence() const + eProsima_user_DllExport const std::array, 5 * 2>, size_1>, + size_1 + 5>& var_array_sequence() const { return m_var_array_sequence; } @@ -13213,16 +13080,15 @@ class ArrayMultiDimensionLiteralsSequence * @brief This function returns a reference to member var_array_sequence * @return Reference to member var_array_sequence */ - eProsima_user_DllExport std::array, 5*2>, size_1>, size_1+5>& var_array_sequence() + eProsima_user_DllExport std::array, 5 * 2>, size_1>, + size_1 + 5>& var_array_sequence() { return m_var_array_sequence; } - - private: - std::array, 5*2>, size_1>, size_1+5> m_var_array_sequence; + std::array, 5 * 2>, size_1>, size_1 + 5> m_var_array_sequence; }; /*! @@ -13254,7 +13120,7 @@ class ArrayMultiDimensionLiteralsMap eProsima_user_DllExport ArrayMultiDimensionLiteralsMap( const ArrayMultiDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -13276,7 +13142,7 @@ class ArrayMultiDimensionLiteralsMap const ArrayMultiDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -13318,7 +13184,8 @@ class ArrayMultiDimensionLiteralsMap * @param _var_array_map New value to be copied in member var_array_map */ eProsima_user_DllExport void var_array_map( - const std::array, size_1>, size_1*2>, size_1>& _var_array_map) + const std::array, size_1>, size_1*2>, + size_1>& _var_array_map) { m_var_array_map = _var_array_map; } @@ -13337,7 +13204,8 @@ class ArrayMultiDimensionLiteralsMap * @brief This function returns a constant reference to member var_array_map * @return Constant reference to member var_array_map */ - eProsima_user_DllExport const std::array, size_1>, size_1*2>, size_1>& var_array_map() const + eProsima_user_DllExport const std::array, size_1>, size_1*2>, + size_1>& var_array_map() const { return m_var_array_map; } @@ -13346,13 +13214,12 @@ class ArrayMultiDimensionLiteralsMap * @brief This function returns a reference to member var_array_map * @return Reference to member var_array_map */ - eProsima_user_DllExport std::array, size_1>, size_1*2>, size_1>& var_array_map() + eProsima_user_DllExport std::array, size_1>, size_1*2>, + size_1>& var_array_map() { return m_var_array_map; } - - private: std::array, size_1>, size_1*2>, size_1> m_var_array_map; @@ -13387,7 +13254,7 @@ class ArrayMultiDimensionLiteralsUnion eProsima_user_DllExport ArrayMultiDimensionLiteralsUnion( const ArrayMultiDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -13409,7 +13276,7 @@ class ArrayMultiDimensionLiteralsUnion const ArrayMultiDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -13451,7 +13318,8 @@ class ArrayMultiDimensionLiteralsUnion * @param _var_array_union New value to be copied in member var_array_union */ eProsima_user_DllExport void var_array_union( - const std::array, size_1+5>, size_1*size_2>& _var_array_union) + const std::array, size_1 + 5>, + size_1* size_2>& _var_array_union) { m_var_array_union = _var_array_union; } @@ -13461,7 +13329,8 @@ class ArrayMultiDimensionLiteralsUnion * @param _var_array_union New value to be moved in member var_array_union */ eProsima_user_DllExport void var_array_union( - std::array, size_1+5>, size_1*size_2>&& _var_array_union) + std::array, size_1 + 5>, + size_1* size_2>&& _var_array_union) { m_var_array_union = std::move(_var_array_union); } @@ -13470,7 +13339,8 @@ class ArrayMultiDimensionLiteralsUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array, size_1+5>, size_1*size_2>& var_array_union() const + eProsima_user_DllExport const std::array, size_1 + 5>, + size_1*size_2>& var_array_union() const { return m_var_array_union; } @@ -13479,16 +13349,15 @@ class ArrayMultiDimensionLiteralsUnion * @brief This function returns a reference to member var_array_union * @return Reference to member var_array_union */ - eProsima_user_DllExport std::array, size_1+5>, size_1*size_2>& var_array_union() + eProsima_user_DllExport std::array, size_1 + 5>, + size_1*size_2>& var_array_union() { return m_var_array_union; } - - private: - std::array, size_1+5>, size_1*size_2> m_var_array_union; + std::array, size_1 + 5>, size_1* size_2> m_var_array_union; }; /*! @@ -13520,7 +13389,7 @@ class ArrayMultiDimensionLiteralsStructure eProsima_user_DllExport ArrayMultiDimensionLiteralsStructure( const ArrayMultiDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -13542,7 +13411,7 @@ class ArrayMultiDimensionLiteralsStructure const ArrayMultiDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -13584,7 +13453,7 @@ class ArrayMultiDimensionLiteralsStructure * @param _var_array_structure New value to be copied in member var_array_structure */ eProsima_user_DllExport void var_array_structure( - const std::array, size_1>, 5>& _var_array_structure) + const std::array, size_1>, 5>& _var_array_structure) { m_var_array_structure = _var_array_structure; } @@ -13594,7 +13463,7 @@ class ArrayMultiDimensionLiteralsStructure * @param _var_array_structure New value to be moved in member var_array_structure */ eProsima_user_DllExport void var_array_structure( - std::array, size_1>, 5>&& _var_array_structure) + std::array, size_1>, 5>&& _var_array_structure) { m_var_array_structure = std::move(_var_array_structure); } @@ -13603,7 +13472,8 @@ class ArrayMultiDimensionLiteralsStructure * @brief This function returns a constant reference to member var_array_structure * @return Constant reference to member var_array_structure */ - eProsima_user_DllExport const std::array, size_1>, 5>& var_array_structure() const + eProsima_user_DllExport const std::array, size_1>, + 5>& var_array_structure() const { return m_var_array_structure; } @@ -13612,16 +13482,15 @@ class ArrayMultiDimensionLiteralsStructure * @brief This function returns a reference to member var_array_structure * @return Reference to member var_array_structure */ - eProsima_user_DllExport std::array, size_1>, 5>& var_array_structure() + eProsima_user_DllExport std::array, size_1>, + 5>& var_array_structure() { return m_var_array_structure; } - - private: - std::array, size_1>, 5> m_var_array_structure; + std::array, size_1>, 5> m_var_array_structure; }; /*! @@ -13653,7 +13522,7 @@ class ArrayMultiDimensionLiteralsBitSet eProsima_user_DllExport ArrayMultiDimensionLiteralsBitSet( const ArrayMultiDimensionLiteralsBitSet& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -13675,7 +13544,7 @@ class ArrayMultiDimensionLiteralsBitSet const ArrayMultiDimensionLiteralsBitSet& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -13717,7 +13586,8 @@ class ArrayMultiDimensionLiteralsBitSet * @param _var_array_bitset New value to be copied in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - const std::array, size_1*2>, size_1+5>& _var_array_bitset) + const std::array, size_1*2>, + size_1 + 5>& _var_array_bitset) { m_var_array_bitset = _var_array_bitset; } @@ -13727,7 +13597,8 @@ class ArrayMultiDimensionLiteralsBitSet * @param _var_array_bitset New value to be moved in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - std::array, size_1*2>, size_1+5>&& _var_array_bitset) + std::array, size_1*2>, + size_1 + 5>&& _var_array_bitset) { m_var_array_bitset = std::move(_var_array_bitset); } @@ -13736,7 +13607,8 @@ class ArrayMultiDimensionLiteralsBitSet * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array, size_1*2>, size_1+5>& var_array_bitset() const + eProsima_user_DllExport const std::array, size_1*2>, + size_1 + 5>& var_array_bitset() const { return m_var_array_bitset; } @@ -13745,16 +13617,15 @@ class ArrayMultiDimensionLiteralsBitSet * @brief This function returns a reference to member var_array_bitset * @return Reference to member var_array_bitset */ - eProsima_user_DllExport std::array, size_1*2>, size_1+5>& var_array_bitset() + eProsima_user_DllExport std::array, size_1*2>, + size_1 + 5>& var_array_bitset() { return m_var_array_bitset; } - - private: - std::array, size_1*2>, size_1+5> m_var_array_bitset; + std::array, size_1*2>, size_1 + 5> m_var_array_bitset; }; /*! @@ -13786,7 +13657,7 @@ class BoundedSmallArrays eProsima_user_DllExport BoundedSmallArrays( const BoundedSmallArrays& x) { - m_var_array_small = x.m_var_array_small; + m_var_array_small = x.m_var_array_small; } @@ -13808,7 +13679,7 @@ class BoundedSmallArrays const BoundedSmallArrays& x) { - m_var_array_small = x.m_var_array_small; + m_var_array_small = x.m_var_array_small; return *this; } @@ -13883,8 +13754,6 @@ class BoundedSmallArrays return m_var_array_small; } - - private: std::array m_var_array_small{0}; @@ -13919,7 +13788,7 @@ class BoundedBigArrays eProsima_user_DllExport BoundedBigArrays( const BoundedBigArrays& x) { - m_var_array_big = x.m_var_array_big; + m_var_array_big = x.m_var_array_big; } @@ -13941,7 +13810,7 @@ class BoundedBigArrays const BoundedBigArrays& x) { - m_var_array_big = x.m_var_array_big; + m_var_array_big = x.m_var_array_big; return *this; } @@ -14016,8 +13885,6 @@ class BoundedBigArrays return m_var_array_big; } - - private: std::array m_var_array_big{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp index f4e895b1..076f79cf 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp @@ -56,17 +56,17 @@ */ struct InnerTypedBitsetHelper { - bool boolean_bitfield : 1; + bool boolean_bitfield : 1; - uint8_t byte_bitfield : 8; + uint8_t byte_bitfield : 8; - int8_t int8_bitfield : 8; + int8_t int8_bitfield : 8; - uint8_t uint8_bitfield : 8; + uint8_t uint8_bitfield : 8; - int16_t short_bitfield : 16; + int16_t short_bitfield : 16; - uint16_t ushort_bitfield : 16; + uint16_t ushort_bitfield : 16; /*! @@ -77,11 +77,11 @@ struct InnerTypedBitsetHelper const InnerTypedBitsetHelper& x) const { return (boolean_bitfield == x.boolean_bitfield && - byte_bitfield == x.byte_bitfield && - int8_bitfield == x.int8_bitfield && - uint8_bitfield == x.uint8_bitfield && - short_bitfield == x.short_bitfield && - ushort_bitfield == x.ushort_bitfield); + byte_bitfield == x.byte_bitfield && + int8_bitfield == x.int8_bitfield && + uint8_bitfield == x.uint8_bitfield && + short_bitfield == x.short_bitfield && + ushort_bitfield == x.ushort_bitfield); } /*! @@ -93,6 +93,7 @@ struct InnerTypedBitsetHelper { return !(*this == x); } + }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper2 defined by the user in the IDL file. @@ -100,9 +101,9 @@ struct InnerTypedBitsetHelper */ struct InnerTypedBitsetHelper2 { - int32_t long_bitfield : 32; + int32_t long_bitfield : 32; - uint32_t ulong_bitfield : 32; + uint32_t ulong_bitfield : 32; /*! @@ -113,7 +114,7 @@ struct InnerTypedBitsetHelper2 const InnerTypedBitsetHelper2& x) const { return (long_bitfield == x.long_bitfield && - ulong_bitfield == x.ulong_bitfield); + ulong_bitfield == x.ulong_bitfield); } /*! @@ -125,6 +126,7 @@ struct InnerTypedBitsetHelper2 { return !(*this == x); } + }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper3 defined by the user in the IDL file. @@ -132,7 +134,7 @@ struct InnerTypedBitsetHelper2 */ struct InnerTypedBitsetHelper3 { - int64_t long_long_bitfield : 64; + int64_t long_long_bitfield : 64; /*! @@ -154,6 +156,7 @@ struct InnerTypedBitsetHelper3 { return !(*this == x); } + }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper4 defined by the user in the IDL file. @@ -161,7 +164,7 @@ struct InnerTypedBitsetHelper3 */ struct InnerTypedBitsetHelper4 { - uint64_t ulong_long_bitfield : 64; + uint64_t ulong_long_bitfield : 64; /*! @@ -183,6 +186,7 @@ struct InnerTypedBitsetHelper4 { return !(*this == x); } + }; /*! * @brief This class represents the structure BitsetStruct defined by the user in the IDL file. @@ -213,15 +217,15 @@ class BitsetStruct eProsima_user_DllExport BitsetStruct( const BitsetStruct& x) { - m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; + m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; - m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; + m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; - m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; + m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; - m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; + m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; - m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; + m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; } @@ -247,15 +251,15 @@ class BitsetStruct const BitsetStruct& x) { - m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; + m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; - m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; + m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; - m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; + m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; - m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; + m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; - m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; + m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; return *this; } @@ -284,10 +288,10 @@ class BitsetStruct const BitsetStruct& x) const { return (m_var_InnerBitsetHelper == x.m_var_InnerBitsetHelper && - m_var_InnerTypedBitsetHelper == x.m_var_InnerTypedBitsetHelper && - m_var_InnerTypedBitsetHelper2 == x.m_var_InnerTypedBitsetHelper2 && - m_var_InnerTypedBitsetHelper3 == x.m_var_InnerTypedBitsetHelper3 && - m_var_InnerTypedBitsetHelper4 == x.m_var_InnerTypedBitsetHelper4); + m_var_InnerTypedBitsetHelper == x.m_var_InnerTypedBitsetHelper && + m_var_InnerTypedBitsetHelper2 == x.m_var_InnerTypedBitsetHelper2 && + m_var_InnerTypedBitsetHelper3 == x.m_var_InnerTypedBitsetHelper3 && + m_var_InnerTypedBitsetHelper4 == x.m_var_InnerTypedBitsetHelper4); } /*! @@ -338,7 +342,6 @@ class BitsetStruct return m_var_InnerBitsetHelper; } - /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper * @param _var_InnerTypedBitsetHelper New value to be copied in member var_InnerTypedBitsetHelper @@ -377,7 +380,6 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper; } - /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper2 * @param _var_InnerTypedBitsetHelper2 New value to be copied in member var_InnerTypedBitsetHelper2 @@ -416,7 +418,6 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper2; } - /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper3 * @param _var_InnerTypedBitsetHelper3 New value to be copied in member var_InnerTypedBitsetHelper3 @@ -455,7 +456,6 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper3; } - /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper4 * @param _var_InnerTypedBitsetHelper4 New value to be copied in member var_InnerTypedBitsetHelper4 @@ -494,8 +494,6 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper4; } - - private: InnerBitsetHelper m_var_InnerBitsetHelper{}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp index a17a6504..fdc992ca 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp @@ -111,13 +111,13 @@ class ModuleConstsLiteralsStruct eProsima_user_DllExport ModuleConstsLiteralsStruct( const ModuleConstsLiteralsStruct& x) { - m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; + m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; - m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; + m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; - m_var1 = x.m_var1; + m_var1 = x.m_var1; - m_var2 = x.m_var2; + m_var2 = x.m_var2; } @@ -129,7 +129,8 @@ class ModuleConstsLiteralsStruct ModuleConstsLiteralsStruct&& x) noexcept { m_module1_array_literal_const_moduled = std::move(x.m_module1_array_literal_const_moduled); - m_module1_array_literal_const_alias_const_moduled = std::move(x.m_module1_array_literal_const_alias_const_moduled); + m_module1_array_literal_const_alias_const_moduled = + std::move(x.m_module1_array_literal_const_alias_const_moduled); m_var1 = x.m_var1; m_var2 = x.m_var2; } @@ -142,13 +143,13 @@ class ModuleConstsLiteralsStruct const ModuleConstsLiteralsStruct& x) { - m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; + m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; - m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; + m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; - m_var1 = x.m_var1; + m_var1 = x.m_var1; - m_var2 = x.m_var2; + m_var2 = x.m_var2; return *this; } @@ -162,7 +163,8 @@ class ModuleConstsLiteralsStruct { m_module1_array_literal_const_moduled = std::move(x.m_module1_array_literal_const_moduled); - m_module1_array_literal_const_alias_const_moduled = std::move(x.m_module1_array_literal_const_alias_const_moduled); + m_module1_array_literal_const_alias_const_moduled = + std::move(x.m_module1_array_literal_const_alias_const_moduled); m_var1 = x.m_var1; m_var2 = x.m_var2; return *this; @@ -176,9 +178,10 @@ class ModuleConstsLiteralsStruct const ModuleConstsLiteralsStruct& x) const { return (m_module1_array_literal_const_moduled == x.m_module1_array_literal_const_moduled && - m_module1_array_literal_const_alias_const_moduled == x.m_module1_array_literal_const_alias_const_moduled && - m_var1 == x.m_var1 && - m_var2 == x.m_var2); + m_module1_array_literal_const_alias_const_moduled == + x.m_module1_array_literal_const_alias_const_moduled && + m_var1 == x.m_var1 && + m_var2 == x.m_var2); } /*! @@ -229,7 +232,6 @@ class ModuleConstsLiteralsStruct return m_module1_array_literal_const_moduled; } - /*! * @brief This function copies the value in member module1_array_literal_const_alias_const_moduled * @param _module1_array_literal_const_alias_const_moduled New value to be copied in member module1_array_literal_const_alias_const_moduled @@ -254,7 +256,8 @@ class ModuleConstsLiteralsStruct * @brief This function returns a constant reference to member module1_array_literal_const_alias_const_moduled * @return Constant reference to member module1_array_literal_const_alias_const_moduled */ - eProsima_user_DllExport const std::array& module1_array_literal_const_alias_const_moduled() const + eProsima_user_DllExport const std::array& module1_array_literal_const_alias_const_moduled() const { return m_module1_array_literal_const_alias_const_moduled; } @@ -268,7 +271,6 @@ class ModuleConstsLiteralsStruct return m_module1_array_literal_const_alias_const_moduled; } - /*! * @brief This function sets a value in member var1 * @param _var1 New value for member var1 @@ -297,7 +299,6 @@ class ModuleConstsLiteralsStruct return m_var1; } - /*! * @brief This function sets a value in member var2 * @param _var2 New value for member var2 @@ -326,8 +327,6 @@ class ModuleConstsLiteralsStruct return m_var2; } - - private: std::array m_module1_array_literal_const_moduled{0}; @@ -372,15 +371,15 @@ class Module2ConstsLiteralsStruct eProsima_user_DllExport Module2ConstsLiteralsStruct( const Module2ConstsLiteralsStruct& x) { - m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; + m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; - m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; + m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; - m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; + m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; - m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; + m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; - m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; + m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; } @@ -392,7 +391,8 @@ class Module2ConstsLiteralsStruct Module2ConstsLiteralsStruct&& x) noexcept { m_module2_array_literal_const_moduled = std::move(x.m_module2_array_literal_const_moduled); - m_module2_array_literal_const_alias_const_moduled = std::move(x.m_module2_array_literal_const_alias_const_moduled); + m_module2_array_literal_const_alias_const_moduled = + std::move(x.m_module2_array_literal_const_alias_const_moduled); m_module2_array_literal_const_scoped_moduled = std::move(x.m_module2_array_literal_const_scoped_moduled); m_module2_array_literal_module1_const_moduled = std::move(x.m_module2_array_literal_module1_const_moduled); m_module2_array_literal_const_moduled_module1 = std::move(x.m_module2_array_literal_const_moduled_module1); @@ -406,15 +406,15 @@ class Module2ConstsLiteralsStruct const Module2ConstsLiteralsStruct& x) { - m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; + m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; - m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; + m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; - m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; + m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; - m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; + m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; - m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; + m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; return *this; } @@ -428,7 +428,8 @@ class Module2ConstsLiteralsStruct { m_module2_array_literal_const_moduled = std::move(x.m_module2_array_literal_const_moduled); - m_module2_array_literal_const_alias_const_moduled = std::move(x.m_module2_array_literal_const_alias_const_moduled); + m_module2_array_literal_const_alias_const_moduled = + std::move(x.m_module2_array_literal_const_alias_const_moduled); m_module2_array_literal_const_scoped_moduled = std::move(x.m_module2_array_literal_const_scoped_moduled); m_module2_array_literal_module1_const_moduled = std::move(x.m_module2_array_literal_module1_const_moduled); m_module2_array_literal_const_moduled_module1 = std::move(x.m_module2_array_literal_const_moduled_module1); @@ -443,10 +444,11 @@ class Module2ConstsLiteralsStruct const Module2ConstsLiteralsStruct& x) const { return (m_module2_array_literal_const_moduled == x.m_module2_array_literal_const_moduled && - m_module2_array_literal_const_alias_const_moduled == x.m_module2_array_literal_const_alias_const_moduled && - m_module2_array_literal_const_scoped_moduled == x.m_module2_array_literal_const_scoped_moduled && - m_module2_array_literal_module1_const_moduled == x.m_module2_array_literal_module1_const_moduled && - m_module2_array_literal_const_moduled_module1 == x.m_module2_array_literal_const_moduled_module1); + m_module2_array_literal_const_alias_const_moduled == + x.m_module2_array_literal_const_alias_const_moduled && + m_module2_array_literal_const_scoped_moduled == x.m_module2_array_literal_const_scoped_moduled && + m_module2_array_literal_module1_const_moduled == x.m_module2_array_literal_module1_const_moduled && + m_module2_array_literal_const_moduled_module1 == x.m_module2_array_literal_const_moduled_module1); } /*! @@ -497,7 +499,6 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_moduled; } - /*! * @brief This function copies the value in member module2_array_literal_const_alias_const_moduled * @param _module2_array_literal_const_alias_const_moduled New value to be copied in member module2_array_literal_const_alias_const_moduled @@ -522,7 +523,8 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_alias_const_moduled * @return Constant reference to member module2_array_literal_const_alias_const_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_const_alias_const_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_const_alias_const_moduled() const { return m_module2_array_literal_const_alias_const_moduled; } @@ -536,7 +538,6 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_alias_const_moduled; } - /*! * @brief This function copies the value in member module2_array_literal_const_scoped_moduled * @param _module2_array_literal_const_scoped_moduled New value to be copied in member module2_array_literal_const_scoped_moduled @@ -561,7 +562,8 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_scoped_moduled * @return Constant reference to member module2_array_literal_const_scoped_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_const_scoped_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_const_scoped_moduled() const { return m_module2_array_literal_const_scoped_moduled; } @@ -570,12 +572,12 @@ class Module2ConstsLiteralsStruct * @brief This function returns a reference to member module2_array_literal_const_scoped_moduled * @return Reference to member module2_array_literal_const_scoped_moduled */ - eProsima_user_DllExport std::array& module2_array_literal_const_scoped_moduled() + eProsima_user_DllExport std::array& module2_array_literal_const_scoped_moduled() { return m_module2_array_literal_const_scoped_moduled; } - /*! * @brief This function copies the value in member module2_array_literal_module1_const_moduled * @param _module2_array_literal_module1_const_moduled New value to be copied in member module2_array_literal_module1_const_moduled @@ -600,7 +602,8 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_module1_const_moduled * @return Constant reference to member module2_array_literal_module1_const_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_module1_const_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_module1_const_moduled() const { return m_module2_array_literal_module1_const_moduled; } @@ -609,12 +612,12 @@ class Module2ConstsLiteralsStruct * @brief This function returns a reference to member module2_array_literal_module1_const_moduled * @return Reference to member module2_array_literal_module1_const_moduled */ - eProsima_user_DllExport std::array& module2_array_literal_module1_const_moduled() + eProsima_user_DllExport std::array& module2_array_literal_module1_const_moduled() { return m_module2_array_literal_module1_const_moduled; } - /*! * @brief This function copies the value in member module2_array_literal_const_moduled_module1 * @param _module2_array_literal_const_moduled_module1 New value to be copied in member module2_array_literal_const_moduled_module1 @@ -639,7 +642,8 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_moduled_module1 * @return Constant reference to member module2_array_literal_const_moduled_module1 */ - eProsima_user_DllExport const std::array& module2_array_literal_const_moduled_module1() const + eProsima_user_DllExport const std::array& module2_array_literal_const_moduled_module1() const { return m_module2_array_literal_const_moduled_module1; } @@ -653,8 +657,6 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_moduled_module1; } - - private: std::array m_module2_array_literal_const_moduled{0}; @@ -695,61 +697,61 @@ class ConstsLiteralsStruct eProsima_user_DllExport ConstsLiteralsStruct( const ConstsLiteralsStruct& x) { - m_array_literal_const_short = x.m_array_literal_const_short; + m_array_literal_const_short = x.m_array_literal_const_short; - m_array_literal_const_ushort = x.m_array_literal_const_ushort; + m_array_literal_const_ushort = x.m_array_literal_const_ushort; - m_array_literal_const_long = x.m_array_literal_const_long; + m_array_literal_const_long = x.m_array_literal_const_long; - m_array_literal_const_ulong = x.m_array_literal_const_ulong; + m_array_literal_const_ulong = x.m_array_literal_const_ulong; - m_array_literal_const_longlong = x.m_array_literal_const_longlong; + m_array_literal_const_longlong = x.m_array_literal_const_longlong; - m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; + m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; - m_array_literal_const_int8 = x.m_array_literal_const_int8; + m_array_literal_const_int8 = x.m_array_literal_const_int8; - m_array_literal_const_uint8 = x.m_array_literal_const_uint8; + m_array_literal_const_uint8 = x.m_array_literal_const_uint8; - m_array_literal_const_int16 = x.m_array_literal_const_int16; + m_array_literal_const_int16 = x.m_array_literal_const_int16; - m_array_literal_const_uint16 = x.m_array_literal_const_uint16; + m_array_literal_const_uint16 = x.m_array_literal_const_uint16; - m_array_literal_const_int32 = x.m_array_literal_const_int32; + m_array_literal_const_int32 = x.m_array_literal_const_int32; - m_array_literal_const_uint32 = x.m_array_literal_const_uint32; + m_array_literal_const_uint32 = x.m_array_literal_const_uint32; - m_array_literal_const_int64 = x.m_array_literal_const_int64; + m_array_literal_const_int64 = x.m_array_literal_const_int64; - m_array_literal_const_uint64 = x.m_array_literal_const_uint64; + m_array_literal_const_uint64 = x.m_array_literal_const_uint64; - m_array_literals_operations1_const = x.m_array_literals_operations1_const; + m_array_literals_operations1_const = x.m_array_literals_operations1_const; - m_array_literals_operations2_const = x.m_array_literals_operations2_const; + m_array_literals_operations2_const = x.m_array_literals_operations2_const; - m_array_literals_operations3_const = x.m_array_literals_operations3_const; + m_array_literals_operations3_const = x.m_array_literals_operations3_const; - m_array_literals_operations4_const = x.m_array_literals_operations4_const; + m_array_literals_operations4_const = x.m_array_literals_operations4_const; - m_array_literals_operations5_const = x.m_array_literals_operations5_const; + m_array_literals_operations5_const = x.m_array_literals_operations5_const; - m_array_literals_operations6_const = x.m_array_literals_operations6_const; + m_array_literals_operations6_const = x.m_array_literals_operations6_const; - m_array_literals_operations7_const = x.m_array_literals_operations7_const; + m_array_literals_operations7_const = x.m_array_literals_operations7_const; - m_array_literals_operations8_const = x.m_array_literals_operations8_const; + m_array_literals_operations8_const = x.m_array_literals_operations8_const; - m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; + m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; - m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; + m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; - m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; + m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; - m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; + m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; - m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; + m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; - m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; + m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; } @@ -798,61 +800,61 @@ class ConstsLiteralsStruct const ConstsLiteralsStruct& x) { - m_array_literal_const_short = x.m_array_literal_const_short; + m_array_literal_const_short = x.m_array_literal_const_short; - m_array_literal_const_ushort = x.m_array_literal_const_ushort; + m_array_literal_const_ushort = x.m_array_literal_const_ushort; - m_array_literal_const_long = x.m_array_literal_const_long; + m_array_literal_const_long = x.m_array_literal_const_long; - m_array_literal_const_ulong = x.m_array_literal_const_ulong; + m_array_literal_const_ulong = x.m_array_literal_const_ulong; - m_array_literal_const_longlong = x.m_array_literal_const_longlong; + m_array_literal_const_longlong = x.m_array_literal_const_longlong; - m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; + m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; - m_array_literal_const_int8 = x.m_array_literal_const_int8; + m_array_literal_const_int8 = x.m_array_literal_const_int8; - m_array_literal_const_uint8 = x.m_array_literal_const_uint8; + m_array_literal_const_uint8 = x.m_array_literal_const_uint8; - m_array_literal_const_int16 = x.m_array_literal_const_int16; + m_array_literal_const_int16 = x.m_array_literal_const_int16; - m_array_literal_const_uint16 = x.m_array_literal_const_uint16; + m_array_literal_const_uint16 = x.m_array_literal_const_uint16; - m_array_literal_const_int32 = x.m_array_literal_const_int32; + m_array_literal_const_int32 = x.m_array_literal_const_int32; - m_array_literal_const_uint32 = x.m_array_literal_const_uint32; + m_array_literal_const_uint32 = x.m_array_literal_const_uint32; - m_array_literal_const_int64 = x.m_array_literal_const_int64; + m_array_literal_const_int64 = x.m_array_literal_const_int64; - m_array_literal_const_uint64 = x.m_array_literal_const_uint64; + m_array_literal_const_uint64 = x.m_array_literal_const_uint64; - m_array_literals_operations1_const = x.m_array_literals_operations1_const; + m_array_literals_operations1_const = x.m_array_literals_operations1_const; - m_array_literals_operations2_const = x.m_array_literals_operations2_const; + m_array_literals_operations2_const = x.m_array_literals_operations2_const; - m_array_literals_operations3_const = x.m_array_literals_operations3_const; + m_array_literals_operations3_const = x.m_array_literals_operations3_const; - m_array_literals_operations4_const = x.m_array_literals_operations4_const; + m_array_literals_operations4_const = x.m_array_literals_operations4_const; - m_array_literals_operations5_const = x.m_array_literals_operations5_const; + m_array_literals_operations5_const = x.m_array_literals_operations5_const; - m_array_literals_operations6_const = x.m_array_literals_operations6_const; + m_array_literals_operations6_const = x.m_array_literals_operations6_const; - m_array_literals_operations7_const = x.m_array_literals_operations7_const; + m_array_literals_operations7_const = x.m_array_literals_operations7_const; - m_array_literals_operations8_const = x.m_array_literals_operations8_const; + m_array_literals_operations8_const = x.m_array_literals_operations8_const; - m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; + m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; - m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; + m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; - m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; + m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; - m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; + m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; - m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; + m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; - m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; + m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; return *this; } @@ -904,33 +906,33 @@ class ConstsLiteralsStruct const ConstsLiteralsStruct& x) const { return (m_array_literal_const_short == x.m_array_literal_const_short && - m_array_literal_const_ushort == x.m_array_literal_const_ushort && - m_array_literal_const_long == x.m_array_literal_const_long && - m_array_literal_const_ulong == x.m_array_literal_const_ulong && - m_array_literal_const_longlong == x.m_array_literal_const_longlong && - m_array_literal_const_ulonglong == x.m_array_literal_const_ulonglong && - m_array_literal_const_int8 == x.m_array_literal_const_int8 && - m_array_literal_const_uint8 == x.m_array_literal_const_uint8 && - m_array_literal_const_int16 == x.m_array_literal_const_int16 && - m_array_literal_const_uint16 == x.m_array_literal_const_uint16 && - m_array_literal_const_int32 == x.m_array_literal_const_int32 && - m_array_literal_const_uint32 == x.m_array_literal_const_uint32 && - m_array_literal_const_int64 == x.m_array_literal_const_int64 && - m_array_literal_const_uint64 == x.m_array_literal_const_uint64 && - m_array_literals_operations1_const == x.m_array_literals_operations1_const && - m_array_literals_operations2_const == x.m_array_literals_operations2_const && - m_array_literals_operations3_const == x.m_array_literals_operations3_const && - m_array_literals_operations4_const == x.m_array_literals_operations4_const && - m_array_literals_operations5_const == x.m_array_literals_operations5_const && - m_array_literals_operations6_const == x.m_array_literals_operations6_const && - m_array_literals_operations7_const == x.m_array_literals_operations7_const && - m_array_literals_operations8_const == x.m_array_literals_operations8_const && - m_array_literal_const_inner_const_helper == x.m_array_literal_const_inner_const_helper && - m_array_moduled1_literal_const == x.m_array_moduled1_literal_const && - m_array_moduled2_literal_const == x.m_array_moduled2_literal_const && - m_array_literal_const_alias_const == x.m_array_literal_const_alias_const && - m_array_moduled1_literal_alias_const_moduled == x.m_array_moduled1_literal_alias_const_moduled && - m_array_moduled2_literal_alias_const_moduled == x.m_array_moduled2_literal_alias_const_moduled); + m_array_literal_const_ushort == x.m_array_literal_const_ushort && + m_array_literal_const_long == x.m_array_literal_const_long && + m_array_literal_const_ulong == x.m_array_literal_const_ulong && + m_array_literal_const_longlong == x.m_array_literal_const_longlong && + m_array_literal_const_ulonglong == x.m_array_literal_const_ulonglong && + m_array_literal_const_int8 == x.m_array_literal_const_int8 && + m_array_literal_const_uint8 == x.m_array_literal_const_uint8 && + m_array_literal_const_int16 == x.m_array_literal_const_int16 && + m_array_literal_const_uint16 == x.m_array_literal_const_uint16 && + m_array_literal_const_int32 == x.m_array_literal_const_int32 && + m_array_literal_const_uint32 == x.m_array_literal_const_uint32 && + m_array_literal_const_int64 == x.m_array_literal_const_int64 && + m_array_literal_const_uint64 == x.m_array_literal_const_uint64 && + m_array_literals_operations1_const == x.m_array_literals_operations1_const && + m_array_literals_operations2_const == x.m_array_literals_operations2_const && + m_array_literals_operations3_const == x.m_array_literals_operations3_const && + m_array_literals_operations4_const == x.m_array_literals_operations4_const && + m_array_literals_operations5_const == x.m_array_literals_operations5_const && + m_array_literals_operations6_const == x.m_array_literals_operations6_const && + m_array_literals_operations7_const == x.m_array_literals_operations7_const && + m_array_literals_operations8_const == x.m_array_literals_operations8_const && + m_array_literal_const_inner_const_helper == x.m_array_literal_const_inner_const_helper && + m_array_moduled1_literal_const == x.m_array_moduled1_literal_const && + m_array_moduled2_literal_const == x.m_array_moduled2_literal_const && + m_array_literal_const_alias_const == x.m_array_literal_const_alias_const && + m_array_moduled1_literal_alias_const_moduled == x.m_array_moduled1_literal_alias_const_moduled && + m_array_moduled2_literal_alias_const_moduled == x.m_array_moduled2_literal_alias_const_moduled); } /*! @@ -981,7 +983,6 @@ class ConstsLiteralsStruct return m_array_literal_const_short; } - /*! * @brief This function copies the value in member array_literal_const_ushort * @param _array_literal_const_ushort New value to be copied in member array_literal_const_ushort @@ -1020,7 +1021,6 @@ class ConstsLiteralsStruct return m_array_literal_const_ushort; } - /*! * @brief This function copies the value in member array_literal_const_long * @param _array_literal_const_long New value to be copied in member array_literal_const_long @@ -1059,7 +1059,6 @@ class ConstsLiteralsStruct return m_array_literal_const_long; } - /*! * @brief This function copies the value in member array_literal_const_ulong * @param _array_literal_const_ulong New value to be copied in member array_literal_const_ulong @@ -1098,7 +1097,6 @@ class ConstsLiteralsStruct return m_array_literal_const_ulong; } - /*! * @brief This function copies the value in member array_literal_const_longlong * @param _array_literal_const_longlong New value to be copied in member array_literal_const_longlong @@ -1137,7 +1135,6 @@ class ConstsLiteralsStruct return m_array_literal_const_longlong; } - /*! * @brief This function copies the value in member array_literal_const_ulonglong * @param _array_literal_const_ulonglong New value to be copied in member array_literal_const_ulonglong @@ -1176,7 +1173,6 @@ class ConstsLiteralsStruct return m_array_literal_const_ulonglong; } - /*! * @brief This function copies the value in member array_literal_const_int8 * @param _array_literal_const_int8 New value to be copied in member array_literal_const_int8 @@ -1215,7 +1211,6 @@ class ConstsLiteralsStruct return m_array_literal_const_int8; } - /*! * @brief This function copies the value in member array_literal_const_uint8 * @param _array_literal_const_uint8 New value to be copied in member array_literal_const_uint8 @@ -1254,7 +1249,6 @@ class ConstsLiteralsStruct return m_array_literal_const_uint8; } - /*! * @brief This function copies the value in member array_literal_const_int16 * @param _array_literal_const_int16 New value to be copied in member array_literal_const_int16 @@ -1293,7 +1287,6 @@ class ConstsLiteralsStruct return m_array_literal_const_int16; } - /*! * @brief This function copies the value in member array_literal_const_uint16 * @param _array_literal_const_uint16 New value to be copied in member array_literal_const_uint16 @@ -1332,7 +1325,6 @@ class ConstsLiteralsStruct return m_array_literal_const_uint16; } - /*! * @brief This function copies the value in member array_literal_const_int32 * @param _array_literal_const_int32 New value to be copied in member array_literal_const_int32 @@ -1371,7 +1363,6 @@ class ConstsLiteralsStruct return m_array_literal_const_int32; } - /*! * @brief This function copies the value in member array_literal_const_uint32 * @param _array_literal_const_uint32 New value to be copied in member array_literal_const_uint32 @@ -1410,7 +1401,6 @@ class ConstsLiteralsStruct return m_array_literal_const_uint32; } - /*! * @brief This function copies the value in member array_literal_const_int64 * @param _array_literal_const_int64 New value to be copied in member array_literal_const_int64 @@ -1449,7 +1439,6 @@ class ConstsLiteralsStruct return m_array_literal_const_int64; } - /*! * @brief This function copies the value in member array_literal_const_uint64 * @param _array_literal_const_uint64 New value to be copied in member array_literal_const_uint64 @@ -1488,13 +1477,12 @@ class ConstsLiteralsStruct return m_array_literal_const_uint64; } - /*! * @brief This function copies the value in member array_literals_operations1_const * @param _array_literals_operations1_const New value to be copied in member array_literals_operations1_const */ eProsima_user_DllExport void array_literals_operations1_const( - const std::array& _array_literals_operations1_const) + const std::array& _array_literals_operations1_const) { m_array_literals_operations1_const = _array_literals_operations1_const; } @@ -1504,7 +1492,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations1_const New value to be moved in member array_literals_operations1_const */ eProsima_user_DllExport void array_literals_operations1_const( - std::array&& _array_literals_operations1_const) + std::array&& _array_literals_operations1_const) { m_array_literals_operations1_const = std::move(_array_literals_operations1_const); } @@ -1513,7 +1501,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations1_const * @return Constant reference to member array_literals_operations1_const */ - eProsima_user_DllExport const std::array& array_literals_operations1_const() const + eProsima_user_DllExport const std::array& array_literals_operations1_const() const { return m_array_literals_operations1_const; } @@ -1522,18 +1511,17 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations1_const * @return Reference to member array_literals_operations1_const */ - eProsima_user_DllExport std::array& array_literals_operations1_const() + eProsima_user_DllExport std::array& array_literals_operations1_const() { return m_array_literals_operations1_const; } - /*! * @brief This function copies the value in member array_literals_operations2_const * @param _array_literals_operations2_const New value to be copied in member array_literals_operations2_const */ eProsima_user_DllExport void array_literals_operations2_const( - const std::array& _array_literals_operations2_const) + const std::array& _array_literals_operations2_const) { m_array_literals_operations2_const = _array_literals_operations2_const; } @@ -1543,7 +1531,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations2_const New value to be moved in member array_literals_operations2_const */ eProsima_user_DllExport void array_literals_operations2_const( - std::array&& _array_literals_operations2_const) + std::array&& _array_literals_operations2_const) { m_array_literals_operations2_const = std::move(_array_literals_operations2_const); } @@ -1552,7 +1540,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations2_const * @return Constant reference to member array_literals_operations2_const */ - eProsima_user_DllExport const std::array& array_literals_operations2_const() const + eProsima_user_DllExport const std::array& array_literals_operations2_const() const { return m_array_literals_operations2_const; } @@ -1561,18 +1550,17 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations2_const * @return Reference to member array_literals_operations2_const */ - eProsima_user_DllExport std::array& array_literals_operations2_const() + eProsima_user_DllExport std::array& array_literals_operations2_const() { return m_array_literals_operations2_const; } - /*! * @brief This function copies the value in member array_literals_operations3_const * @param _array_literals_operations3_const New value to be copied in member array_literals_operations3_const */ eProsima_user_DllExport void array_literals_operations3_const( - const std::array& _array_literals_operations3_const) + const std::array& _array_literals_operations3_const) { m_array_literals_operations3_const = _array_literals_operations3_const; } @@ -1582,7 +1570,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations3_const New value to be moved in member array_literals_operations3_const */ eProsima_user_DllExport void array_literals_operations3_const( - std::array&& _array_literals_operations3_const) + std::array&& _array_literals_operations3_const) { m_array_literals_operations3_const = std::move(_array_literals_operations3_const); } @@ -1591,7 +1579,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations3_const * @return Constant reference to member array_literals_operations3_const */ - eProsima_user_DllExport const std::array& array_literals_operations3_const() const + eProsima_user_DllExport const std::array& array_literals_operations3_const() const { return m_array_literals_operations3_const; } @@ -1600,18 +1589,19 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations3_const * @return Reference to member array_literals_operations3_const */ - eProsima_user_DllExport std::array& array_literals_operations3_const() + eProsima_user_DllExport std::array& array_literals_operations3_const() { return m_array_literals_operations3_const; } - /*! * @brief This function copies the value in member array_literals_operations4_const * @param _array_literals_operations4_const New value to be copied in member array_literals_operations4_const */ eProsima_user_DllExport void array_literals_operations4_const( - const std::array& _array_literals_operations4_const) + const std::array& _array_literals_operations4_const) { m_array_literals_operations4_const = _array_literals_operations4_const; } @@ -1621,7 +1611,8 @@ class ConstsLiteralsStruct * @param _array_literals_operations4_const New value to be moved in member array_literals_operations4_const */ eProsima_user_DllExport void array_literals_operations4_const( - std::array&& _array_literals_operations4_const) + std::array&& _array_literals_operations4_const) { m_array_literals_operations4_const = std::move(_array_literals_operations4_const); } @@ -1630,7 +1621,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations4_const * @return Constant reference to member array_literals_operations4_const */ - eProsima_user_DllExport const std::array& array_literals_operations4_const() const + eProsima_user_DllExport const std::array& array_literals_operations4_const() const { return m_array_literals_operations4_const; } @@ -1639,18 +1631,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations4_const * @return Reference to member array_literals_operations4_const */ - eProsima_user_DllExport std::array& array_literals_operations4_const() + eProsima_user_DllExport std::array& array_literals_operations4_const() { return m_array_literals_operations4_const; } - /*! * @brief This function copies the value in member array_literals_operations5_const * @param _array_literals_operations5_const New value to be copied in member array_literals_operations5_const */ eProsima_user_DllExport void array_literals_operations5_const( - const std::array& _array_literals_operations5_const) + const std::array& _array_literals_operations5_const) { m_array_literals_operations5_const = _array_literals_operations5_const; } @@ -1660,7 +1652,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations5_const New value to be moved in member array_literals_operations5_const */ eProsima_user_DllExport void array_literals_operations5_const( - std::array&& _array_literals_operations5_const) + std::array&& _array_literals_operations5_const) { m_array_literals_operations5_const = std::move(_array_literals_operations5_const); } @@ -1683,13 +1675,12 @@ class ConstsLiteralsStruct return m_array_literals_operations5_const; } - /*! * @brief This function copies the value in member array_literals_operations6_const * @param _array_literals_operations6_const New value to be copied in member array_literals_operations6_const */ eProsima_user_DllExport void array_literals_operations6_const( - const std::array& _array_literals_operations6_const) + const std::array& _array_literals_operations6_const) { m_array_literals_operations6_const = _array_literals_operations6_const; } @@ -1699,7 +1690,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations6_const New value to be moved in member array_literals_operations6_const */ eProsima_user_DllExport void array_literals_operations6_const( - std::array&& _array_literals_operations6_const) + std::array&& _array_literals_operations6_const) { m_array_literals_operations6_const = std::move(_array_literals_operations6_const); } @@ -1708,7 +1699,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations6_const * @return Constant reference to member array_literals_operations6_const */ - eProsima_user_DllExport const std::array& array_literals_operations6_const() const + eProsima_user_DllExport const std::array& array_literals_operations6_const() const { return m_array_literals_operations6_const; } @@ -1717,18 +1709,17 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations6_const * @return Reference to member array_literals_operations6_const */ - eProsima_user_DllExport std::array& array_literals_operations6_const() + eProsima_user_DllExport std::array& array_literals_operations6_const() { return m_array_literals_operations6_const; } - /*! * @brief This function copies the value in member array_literals_operations7_const * @param _array_literals_operations7_const New value to be copied in member array_literals_operations7_const */ eProsima_user_DllExport void array_literals_operations7_const( - const std::array& _array_literals_operations7_const) + const std::array& _array_literals_operations7_const) { m_array_literals_operations7_const = _array_literals_operations7_const; } @@ -1738,7 +1729,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations7_const New value to be moved in member array_literals_operations7_const */ eProsima_user_DllExport void array_literals_operations7_const( - std::array&& _array_literals_operations7_const) + std::array&& _array_literals_operations7_const) { m_array_literals_operations7_const = std::move(_array_literals_operations7_const); } @@ -1747,7 +1738,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations7_const * @return Constant reference to member array_literals_operations7_const */ - eProsima_user_DllExport const std::array& array_literals_operations7_const() const + eProsima_user_DllExport const std::array& array_literals_operations7_const() const { return m_array_literals_operations7_const; } @@ -1756,18 +1748,19 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations7_const * @return Reference to member array_literals_operations7_const */ - eProsima_user_DllExport std::array& array_literals_operations7_const() + eProsima_user_DllExport std::array& array_literals_operations7_const() { return m_array_literals_operations7_const; } - /*! * @brief This function copies the value in member array_literals_operations8_const * @param _array_literals_operations8_const New value to be copied in member array_literals_operations8_const */ eProsima_user_DllExport void array_literals_operations8_const( - const std::array& _array_literals_operations8_const) + const std::array& _array_literals_operations8_const) { m_array_literals_operations8_const = _array_literals_operations8_const; } @@ -1777,7 +1770,8 @@ class ConstsLiteralsStruct * @param _array_literals_operations8_const New value to be moved in member array_literals_operations8_const */ eProsima_user_DllExport void array_literals_operations8_const( - std::array&& _array_literals_operations8_const) + std::array&& _array_literals_operations8_const) { m_array_literals_operations8_const = std::move(_array_literals_operations8_const); } @@ -1786,7 +1780,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations8_const * @return Constant reference to member array_literals_operations8_const */ - eProsima_user_DllExport const std::array& array_literals_operations8_const() const + eProsima_user_DllExport const std::array& array_literals_operations8_const() const { return m_array_literals_operations8_const; } @@ -1795,12 +1790,12 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations8_const * @return Reference to member array_literals_operations8_const */ - eProsima_user_DllExport std::array& array_literals_operations8_const() + eProsima_user_DllExport std::array& array_literals_operations8_const() { return m_array_literals_operations8_const; } - /*! * @brief This function copies the value in member array_literal_const_inner_const_helper * @param _array_literal_const_inner_const_helper New value to be copied in member array_literal_const_inner_const_helper @@ -1825,7 +1820,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literal_const_inner_const_helper * @return Constant reference to member array_literal_const_inner_const_helper */ - eProsima_user_DllExport const std::array& array_literal_const_inner_const_helper() const + eProsima_user_DllExport const std::array& array_literal_const_inner_const_helper() const { return m_array_literal_const_inner_const_helper; } @@ -1839,7 +1835,6 @@ class ConstsLiteralsStruct return m_array_literal_const_inner_const_helper; } - /*! * @brief This function copies the value in member array_moduled1_literal_const * @param _array_moduled1_literal_const New value to be copied in member array_moduled1_literal_const @@ -1864,7 +1859,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled1_literal_const * @return Constant reference to member array_moduled1_literal_const */ - eProsima_user_DllExport const std::array& array_moduled1_literal_const() const + eProsima_user_DllExport const std::array& array_moduled1_literal_const() const { return m_array_moduled1_literal_const; } @@ -1878,7 +1874,6 @@ class ConstsLiteralsStruct return m_array_moduled1_literal_const; } - /*! * @brief This function copies the value in member array_moduled2_literal_const * @param _array_moduled2_literal_const New value to be copied in member array_moduled2_literal_const @@ -1903,7 +1898,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled2_literal_const * @return Constant reference to member array_moduled2_literal_const */ - eProsima_user_DllExport const std::array& array_moduled2_literal_const() const + eProsima_user_DllExport const std::array& array_moduled2_literal_const() const { return m_array_moduled2_literal_const; } @@ -1917,7 +1913,6 @@ class ConstsLiteralsStruct return m_array_moduled2_literal_const; } - /*! * @brief This function copies the value in member array_literal_const_alias_const * @param _array_literal_const_alias_const New value to be copied in member array_literal_const_alias_const @@ -1956,7 +1951,6 @@ class ConstsLiteralsStruct return m_array_literal_const_alias_const; } - /*! * @brief This function copies the value in member array_moduled1_literal_alias_const_moduled * @param _array_moduled1_literal_alias_const_moduled New value to be copied in member array_moduled1_literal_alias_const_moduled @@ -1981,7 +1975,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled1_literal_alias_const_moduled * @return Constant reference to member array_moduled1_literal_alias_const_moduled */ - eProsima_user_DllExport const std::array& array_moduled1_literal_alias_const_moduled() const + eProsima_user_DllExport const std::array& array_moduled1_literal_alias_const_moduled() const { return m_array_moduled1_literal_alias_const_moduled; } @@ -1990,12 +1985,12 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_moduled1_literal_alias_const_moduled * @return Reference to member array_moduled1_literal_alias_const_moduled */ - eProsima_user_DllExport std::array& array_moduled1_literal_alias_const_moduled() + eProsima_user_DllExport std::array& array_moduled1_literal_alias_const_moduled() { return m_array_moduled1_literal_alias_const_moduled; } - /*! * @brief This function copies the value in member array_moduled2_literal_alias_const_moduled * @param _array_moduled2_literal_alias_const_moduled New value to be copied in member array_moduled2_literal_alias_const_moduled @@ -2020,7 +2015,8 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled2_literal_alias_const_moduled * @return Constant reference to member array_moduled2_literal_alias_const_moduled */ - eProsima_user_DllExport const std::array& array_moduled2_literal_alias_const_moduled() const + eProsima_user_DllExport const std::array& array_moduled2_literal_alias_const_moduled() const { return m_array_moduled2_literal_alias_const_moduled; } @@ -2029,13 +2025,12 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_moduled2_literal_alias_const_moduled * @return Reference to member array_moduled2_literal_alias_const_moduled */ - eProsima_user_DllExport std::array& array_moduled2_literal_alias_const_moduled() + eProsima_user_DllExport std::array& array_moduled2_literal_alias_const_moduled() { return m_array_moduled2_literal_alias_const_moduled; } - - private: std::array m_array_literal_const_short{0}; @@ -2052,14 +2047,16 @@ class ConstsLiteralsStruct std::array m_array_literal_const_uint32{0}; std::array m_array_literal_const_int64{0}; std::array m_array_literal_const_uint64{0}; - std::array m_array_literals_operations1_const{0}; - std::array m_array_literals_operations2_const{0}; - std::array m_array_literals_operations3_const{0}; - std::array m_array_literals_operations4_const{0}; - std::array m_array_literals_operations5_const{0}; - std::array m_array_literals_operations6_const{0}; - std::array m_array_literals_operations7_const{0}; - std::array m_array_literals_operations8_const{0}; + std::array m_array_literals_operations1_const{0}; + std::array m_array_literals_operations2_const{0}; + std::array m_array_literals_operations3_const{0}; + std::array m_array_literals_operations4_const{0}; + std::array m_array_literals_operations5_const{0}; + std::array m_array_literals_operations6_const{0}; + std::array m_array_literals_operations7_const{0}; + std::array m_array_literals_operations8_const{0}; std::array m_array_literal_const_inner_const_helper{0}; std::array m_array_moduled1_literal_const{0}; std::array m_array_moduled2_literal_const{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp index c23af216..d2cdd826 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp @@ -41,175 +41,173 @@ typedef int16_t alias_short; -namespace const_module1 -{ - typedef int16_t alias_short_moduled; +namespace const_module1 { +typedef int16_t alias_short_moduled; - /*! - * @brief This class represents the TopicDataType of the type ModuleConstsLiteralsStruct defined by the user in the IDL file. - * @ingroup constants - */ - class ModuleConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type ModuleConstsLiteralsStruct defined by the user in the IDL file. + * @ingroup constants + */ +class ModuleConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef ModuleConstsLiteralsStruct type; + typedef ModuleConstsLiteralsStruct type; - eProsima_user_DllExport ModuleConstsLiteralsStructPubSubType(); + eProsima_user_DllExport ModuleConstsLiteralsStructPubSubType(); - eProsima_user_DllExport ~ModuleConstsLiteralsStructPubSubType() override; + eProsima_user_DllExport ~ModuleConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace const_module1 -namespace const_module2 -{ +namespace const_module2 { - /*! - * @brief This class represents the TopicDataType of the type Module2ConstsLiteralsStruct defined by the user in the IDL file. - * @ingroup constants - */ - class Module2ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type Module2ConstsLiteralsStruct defined by the user in the IDL file. + * @ingroup constants + */ +class Module2ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef Module2ConstsLiteralsStruct type; + typedef Module2ConstsLiteralsStruct type; - eProsima_user_DllExport Module2ConstsLiteralsStructPubSubType(); + eProsima_user_DllExport Module2ConstsLiteralsStructPubSubType(); - eProsima_user_DllExport ~Module2ConstsLiteralsStructPubSubType() override; + eProsima_user_DllExport ~Module2ConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace const_module2 /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp index ac7b675f..05e043ed 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp @@ -98,13 +98,13 @@ class ForwardDeclarationsRecursiveStruct eProsima_user_DllExport ForwardDeclarationsRecursiveStruct( const ForwardDeclarationsRecursiveStruct& x) { - m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; + m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; - m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; + m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; - m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; + m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; - m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; + m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; } @@ -129,13 +129,13 @@ class ForwardDeclarationsRecursiveStruct const ForwardDeclarationsRecursiveStruct& x) { - m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; + m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; - m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; + m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; - m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; + m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; - m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; + m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; return *this; } @@ -163,9 +163,9 @@ class ForwardDeclarationsRecursiveStruct const ForwardDeclarationsRecursiveStruct& x) const { return (m_var_RecursiveUnboundedSeqForwardStruct == x.m_var_RecursiveUnboundedSeqForwardStruct && - m_var_RecursiveBoundedSeqForwardStruct == x.m_var_RecursiveBoundedSeqForwardStruct && - m_var_RecursiveUnboundedSeqForwardUnion == x.m_var_RecursiveUnboundedSeqForwardUnion && - m_var_RecursiveBoundedSeqForwardUnion == x.m_var_RecursiveBoundedSeqForwardUnion); + m_var_RecursiveBoundedSeqForwardStruct == x.m_var_RecursiveBoundedSeqForwardStruct && + m_var_RecursiveUnboundedSeqForwardUnion == x.m_var_RecursiveUnboundedSeqForwardUnion && + m_var_RecursiveBoundedSeqForwardUnion == x.m_var_RecursiveBoundedSeqForwardUnion); } /*! @@ -216,7 +216,6 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveUnboundedSeqForwardStruct; } - /*! * @brief This function copies the value in member var_RecursiveBoundedSeqForwardStruct * @param _var_RecursiveBoundedSeqForwardStruct New value to be copied in member var_RecursiveBoundedSeqForwardStruct @@ -255,7 +254,6 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveBoundedSeqForwardStruct; } - /*! * @brief This function copies the value in member var_RecursiveUnboundedSeqForwardUnion * @param _var_RecursiveUnboundedSeqForwardUnion New value to be copied in member var_RecursiveUnboundedSeqForwardUnion @@ -294,7 +292,6 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveUnboundedSeqForwardUnion; } - /*! * @brief This function copies the value in member var_RecursiveBoundedSeqForwardUnion * @param _var_RecursiveBoundedSeqForwardUnion New value to be copied in member var_RecursiveBoundedSeqForwardUnion @@ -333,8 +330,6 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveBoundedSeqForwardUnion; } - - private: RecursiveUnboundedSeqForwardStruct m_var_RecursiveUnboundedSeqForwardStruct; @@ -380,13 +375,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } } @@ -402,13 +397,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } } @@ -424,13 +419,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } @@ -448,13 +443,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } @@ -475,13 +470,13 @@ class ForwardUnion { switch (selected_member_) { - case 0x00000001: - ret_value = (m_case_zero == x.m_case_zero); - break; + case 0x00000001: + ret_value = (m_case_zero == x.m_case_zero); + break; - case 0x00000002: - ret_value = (m_case_one == x.m_case_one); - break; + case 0x00000002: + ret_value = (m_case_one == x.m_case_one); + break; } } @@ -511,25 +506,26 @@ class ForwardUnion switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -585,7 +581,6 @@ class ForwardUnion return m_case_zero; } - /*! * @brief This function sets a value in member case_one * @param _case_one New value for member case_one @@ -627,7 +622,6 @@ class ForwardUnion return m_case_one; } - void _default() { if (member_destructor_) @@ -638,45 +632,43 @@ class ForwardUnion selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& case_zero_() + int32_t& case_zero_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_case_zero = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_case_zero = {0}; - } + } - return m_case_zero; - } + return m_case_zero; + } - int32_t& case_one_() + int32_t& case_one_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_case_one = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_case_one = {0}; - } - - return m_case_one; - } + } + return m_case_one; + } int32_t m__d {2147483647}; @@ -719,9 +711,9 @@ class ForwardStruct eProsima_user_DllExport ForwardStruct( const ForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -744,9 +736,9 @@ class ForwardStruct const ForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -772,7 +764,7 @@ class ForwardStruct const ForwardStruct& x) const { return (m_var_short == x.m_var_short && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -813,7 +805,6 @@ class ForwardStruct return m_var_short; } - /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -842,8 +833,6 @@ class ForwardStruct return m_var_long; } - - private: int16_t m_var_short{0}; @@ -893,7 +882,7 @@ class ForwardStruct eProsima_user_DllExport ForwardStruct( const ForwardStruct& x) { - m_var_u_long_long = x.m_var_u_long_long; + m_var_u_long_long = x.m_var_u_long_long; } @@ -915,7 +904,7 @@ class ForwardStruct const ForwardStruct& x) { - m_var_u_long_long = x.m_var_u_long_long; + m_var_u_long_long = x.m_var_u_long_long; return *this; } @@ -980,8 +969,6 @@ class ForwardStruct return m_var_u_long_long; } - - private: uint64_t m_var_u_long_long{0}; @@ -1018,13 +1005,13 @@ class ModuledForwardDeclarationsRecursiveStruct eProsima_user_DllExport ModuledForwardDeclarationsRecursiveStruct( const ModuledForwardDeclarationsRecursiveStruct& x) { - m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; + m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; - m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; + m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; - m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; + m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; - m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; + m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1049,13 +1036,13 @@ class ModuledForwardDeclarationsRecursiveStruct const ModuledForwardDeclarationsRecursiveStruct& x) { - m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; + m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; - m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; + m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; - m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; + m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; - m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; + m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; return *this; } @@ -1083,9 +1070,9 @@ class ModuledForwardDeclarationsRecursiveStruct const ModuledForwardDeclarationsRecursiveStruct& x) const { return (m_var_ModuledRecursiveUnboundedSeqForwardStruct == x.m_var_ModuledRecursiveUnboundedSeqForwardStruct && - m_var_ModuledRecursiveBoundedSeqForwardStruct == x.m_var_ModuledRecursiveBoundedSeqForwardStruct && - m_var_ModuledRecursiveUnboundedSeqForwardUnion == x.m_var_ModuledRecursiveUnboundedSeqForwardUnion && - m_var_ModuledRecursiveBoundedSeqForwardUnion == x.m_var_ModuledRecursiveBoundedSeqForwardUnion); + m_var_ModuledRecursiveBoundedSeqForwardStruct == x.m_var_ModuledRecursiveBoundedSeqForwardStruct && + m_var_ModuledRecursiveUnboundedSeqForwardUnion == x.m_var_ModuledRecursiveUnboundedSeqForwardUnion && + m_var_ModuledRecursiveBoundedSeqForwardUnion == x.m_var_ModuledRecursiveBoundedSeqForwardUnion); } /*! @@ -1103,7 +1090,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardStruct New value to be copied in member var_ModuledRecursiveUnboundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardStruct( - const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& _var_ModuledRecursiveUnboundedSeqForwardStruct) + const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& + _var_ModuledRecursiveUnboundedSeqForwardStruct) { m_var_ModuledRecursiveUnboundedSeqForwardStruct = _var_ModuledRecursiveUnboundedSeqForwardStruct; } @@ -1113,7 +1101,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardStruct New value to be moved in member var_ModuledRecursiveUnboundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardStruct( - declarations_module::ModuledRecursiveUnboundedSeqForwardStruct&& _var_ModuledRecursiveUnboundedSeqForwardStruct) + declarations_module::ModuledRecursiveUnboundedSeqForwardStruct&& + _var_ModuledRecursiveUnboundedSeqForwardStruct) { m_var_ModuledRecursiveUnboundedSeqForwardStruct = std::move(_var_ModuledRecursiveUnboundedSeqForwardStruct); } @@ -1122,7 +1111,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveUnboundedSeqForwardStruct * @return Constant reference to member var_ModuledRecursiveUnboundedSeqForwardStruct */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& var_ModuledRecursiveUnboundedSeqForwardStruct() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& + var_ModuledRecursiveUnboundedSeqForwardStruct() const { return m_var_ModuledRecursiveUnboundedSeqForwardStruct; } @@ -1131,18 +1121,19 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveUnboundedSeqForwardStruct * @return Reference to member var_ModuledRecursiveUnboundedSeqForwardStruct */ - eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& var_ModuledRecursiveUnboundedSeqForwardStruct() + eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& + var_ModuledRecursiveUnboundedSeqForwardStruct() { return m_var_ModuledRecursiveUnboundedSeqForwardStruct; } - /*! * @brief This function copies the value in member var_ModuledRecursiveBoundedSeqForwardStruct * @param _var_ModuledRecursiveBoundedSeqForwardStruct New value to be copied in member var_ModuledRecursiveBoundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveBoundedSeqForwardStruct( - const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& _var_ModuledRecursiveBoundedSeqForwardStruct) + const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& + _var_ModuledRecursiveBoundedSeqForwardStruct) { m_var_ModuledRecursiveBoundedSeqForwardStruct = _var_ModuledRecursiveBoundedSeqForwardStruct; } @@ -1161,7 +1152,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveBoundedSeqForwardStruct * @return Constant reference to member var_ModuledRecursiveBoundedSeqForwardStruct */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& var_ModuledRecursiveBoundedSeqForwardStruct() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& + var_ModuledRecursiveBoundedSeqForwardStruct() const { return m_var_ModuledRecursiveBoundedSeqForwardStruct; } @@ -1170,18 +1162,19 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveBoundedSeqForwardStruct * @return Reference to member var_ModuledRecursiveBoundedSeqForwardStruct */ - eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardStruct& var_ModuledRecursiveBoundedSeqForwardStruct() + eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardStruct& + var_ModuledRecursiveBoundedSeqForwardStruct() { return m_var_ModuledRecursiveBoundedSeqForwardStruct; } - /*! * @brief This function copies the value in member var_ModuledRecursiveUnboundedSeqForwardUnion * @param _var_ModuledRecursiveUnboundedSeqForwardUnion New value to be copied in member var_ModuledRecursiveUnboundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardUnion( - const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& _var_ModuledRecursiveUnboundedSeqForwardUnion) + const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& + _var_ModuledRecursiveUnboundedSeqForwardUnion) { m_var_ModuledRecursiveUnboundedSeqForwardUnion = _var_ModuledRecursiveUnboundedSeqForwardUnion; } @@ -1191,7 +1184,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardUnion New value to be moved in member var_ModuledRecursiveUnboundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardUnion( - declarations_module::ModuledRecursiveUnboundedSeqForwardUnion&& _var_ModuledRecursiveUnboundedSeqForwardUnion) + declarations_module::ModuledRecursiveUnboundedSeqForwardUnion&& + _var_ModuledRecursiveUnboundedSeqForwardUnion) { m_var_ModuledRecursiveUnboundedSeqForwardUnion = std::move(_var_ModuledRecursiveUnboundedSeqForwardUnion); } @@ -1200,7 +1194,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveUnboundedSeqForwardUnion * @return Constant reference to member var_ModuledRecursiveUnboundedSeqForwardUnion */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& var_ModuledRecursiveUnboundedSeqForwardUnion() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& + var_ModuledRecursiveUnboundedSeqForwardUnion() const { return m_var_ModuledRecursiveUnboundedSeqForwardUnion; } @@ -1209,18 +1204,19 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveUnboundedSeqForwardUnion * @return Reference to member var_ModuledRecursiveUnboundedSeqForwardUnion */ - eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& var_ModuledRecursiveUnboundedSeqForwardUnion() + eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& + var_ModuledRecursiveUnboundedSeqForwardUnion() { return m_var_ModuledRecursiveUnboundedSeqForwardUnion; } - /*! * @brief This function copies the value in member var_ModuledRecursiveBoundedSeqForwardUnion * @param _var_ModuledRecursiveBoundedSeqForwardUnion New value to be copied in member var_ModuledRecursiveBoundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveBoundedSeqForwardUnion( - const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& _var_ModuledRecursiveBoundedSeqForwardUnion) + const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& + _var_ModuledRecursiveBoundedSeqForwardUnion) { m_var_ModuledRecursiveBoundedSeqForwardUnion = _var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1239,7 +1235,8 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveBoundedSeqForwardUnion * @return Constant reference to member var_ModuledRecursiveBoundedSeqForwardUnion */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& var_ModuledRecursiveBoundedSeqForwardUnion() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& + var_ModuledRecursiveBoundedSeqForwardUnion() const { return m_var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1248,13 +1245,12 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveBoundedSeqForwardUnion * @return Reference to member var_ModuledRecursiveBoundedSeqForwardUnion */ - eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardUnion& var_ModuledRecursiveBoundedSeqForwardUnion() + eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardUnion& + var_ModuledRecursiveBoundedSeqForwardUnion() { return m_var_ModuledRecursiveBoundedSeqForwardUnion; } - - private: declarations_module::ModuledRecursiveUnboundedSeqForwardStruct m_var_ModuledRecursiveUnboundedSeqForwardStruct; @@ -1294,9 +1290,9 @@ class ModuledForwardStruct eProsima_user_DllExport ModuledForwardStruct( const ModuledForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -1319,9 +1315,9 @@ class ModuledForwardStruct const ModuledForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -1347,7 +1343,7 @@ class ModuledForwardStruct const ModuledForwardStruct& x) const { return (m_var_short == x.m_var_short && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -1388,7 +1384,6 @@ class ModuledForwardStruct return m_var_short; } - /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -1417,8 +1412,6 @@ class ModuledForwardStruct return m_var_long; } - - private: int16_t m_var_short{0}; @@ -1463,13 +1456,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } } @@ -1485,13 +1478,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } } @@ -1507,13 +1500,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } @@ -1531,13 +1524,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } @@ -1558,13 +1551,13 @@ class ModuledForwardUnion { switch (selected_member_) { - case 0x00000001: - ret_value = (m_case_zero == x.m_case_zero); - break; + case 0x00000001: + ret_value = (m_case_zero == x.m_case_zero); + break; - case 0x00000002: - ret_value = (m_case_one == x.m_case_one); - break; + case 0x00000002: + ret_value = (m_case_one == x.m_case_one); + break; } } @@ -1594,25 +1587,26 @@ class ModuledForwardUnion switch (__d) { - case long_const: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case long_const: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1668,7 +1662,6 @@ class ModuledForwardUnion return m_case_zero; } - /*! * @brief This function sets a value in member case_one * @param _case_one New value for member case_one @@ -1710,7 +1703,6 @@ class ModuledForwardUnion return m_case_one; } - void _default() { if (member_destructor_) @@ -1721,45 +1713,43 @@ class ModuledForwardUnion selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& case_zero_() + int32_t& case_zero_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_case_zero = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_case_zero = {0}; - } + } - return m_case_zero; - } + return m_case_zero; + } - int32_t& case_one_() + int32_t& case_one_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_case_one = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_case_one = {0}; - return m_case_one; - } + } + return m_case_one; + } int32_t m__d {2147483647}; @@ -1804,9 +1794,9 @@ class ModuledCommonNameStructure eProsima_user_DllExport ModuledCommonNameStructure( const ModuledCommonNameStructure& x) { - m_global_struct = x.m_global_struct; + m_global_struct = x.m_global_struct; - m_namespaced_struct = x.m_namespaced_struct; + m_namespaced_struct = x.m_namespaced_struct; } @@ -1829,9 +1819,9 @@ class ModuledCommonNameStructure const ModuledCommonNameStructure& x) { - m_global_struct = x.m_global_struct; + m_global_struct = x.m_global_struct; - m_namespaced_struct = x.m_namespaced_struct; + m_namespaced_struct = x.m_namespaced_struct; return *this; } @@ -1857,7 +1847,7 @@ class ModuledCommonNameStructure const ModuledCommonNameStructure& x) const { return (m_global_struct == x.m_global_struct && - m_namespaced_struct == x.m_namespaced_struct); + m_namespaced_struct == x.m_namespaced_struct); } /*! @@ -1908,7 +1898,6 @@ class ModuledCommonNameStructure return m_global_struct; } - /*! * @brief This function copies the value in member namespaced_struct * @param _namespaced_struct New value to be copied in member namespaced_struct @@ -1947,8 +1936,6 @@ class ModuledCommonNameStructure return m_namespaced_struct; } - - private: ForwardStruct m_global_struct; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp index a3e57c0b..bf0489ae 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp @@ -205,93 +205,92 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType unsigned char* key_buffer_; }; -namespace declarations_module +namespace declarations_module { +typedef std::vector ModuledRecursiveUnboundedSeqForwardStruct; +typedef std::vector ModuledRecursiveBoundedSeqForwardStruct; +typedef std::vector ModuledRecursiveUnboundedSeqForwardUnion; +typedef std::vector ModuledRecursiveBoundedSeqForwardUnion; + +/*! + * @brief This class represents the TopicDataType of the type ForwardStruct defined by the user in the IDL file. + * @ingroup declarations + */ +class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType { - typedef std::vector ModuledRecursiveUnboundedSeqForwardStruct; - typedef std::vector ModuledRecursiveBoundedSeqForwardStruct; - typedef std::vector ModuledRecursiveUnboundedSeqForwardUnion; - typedef std::vector ModuledRecursiveBoundedSeqForwardUnion; - - /*! - * @brief This class represents the TopicDataType of the type ForwardStruct defined by the user in the IDL file. - * @ingroup declarations - */ - class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +public: - typedef ForwardStruct type; + typedef ForwardStruct type; - eProsima_user_DllExport ForwardStructPubSubType(); + eProsima_user_DllExport ForwardStructPubSubType(); - eProsima_user_DllExport ~ForwardStructPubSubType() override; + eProsima_user_DllExport ~ForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace declarations_module /*! @@ -374,89 +373,88 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas unsigned char* key_buffer_; }; -namespace declarations_module -{ +namespace declarations_module { - /*! - * @brief This class represents the TopicDataType of the type ModuledForwardStruct defined by the user in the IDL file. - * @ingroup declarations - */ - class ModuledForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type ModuledForwardStruct defined by the user in the IDL file. + * @ingroup declarations + */ +class ModuledForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef ModuledForwardStruct type; + typedef ModuledForwardStruct type; - eProsima_user_DllExport ModuledForwardStructPubSubType(); + eProsima_user_DllExport ModuledForwardStructPubSubType(); - eProsima_user_DllExport ~ModuledForwardStructPubSubType() override; + eProsima_user_DllExport ~ModuledForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace declarations_module diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp index 7308cd3a..d7e74d07 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp @@ -93,9 +93,9 @@ class EnumStructure eProsima_user_DllExport EnumStructure( const EnumStructure& x) { - m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; + m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; - m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; + m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; } @@ -118,9 +118,9 @@ class EnumStructure const EnumStructure& x) { - m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; + m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; - m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; + m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; return *this; } @@ -146,7 +146,7 @@ class EnumStructure const EnumStructure& x) const { return (m_var_InnerEnumHelper == x.m_var_InnerEnumHelper && - m_var_scoped_InnerEnumHelper == x.m_var_scoped_InnerEnumHelper); + m_var_scoped_InnerEnumHelper == x.m_var_scoped_InnerEnumHelper); } /*! @@ -187,7 +187,6 @@ class EnumStructure return m_var_InnerEnumHelper; } - /*! * @brief This function sets a value in member var_scoped_InnerEnumHelper * @param _var_scoped_InnerEnumHelper New value for member var_scoped_InnerEnumHelper @@ -216,8 +215,6 @@ class EnumStructure return m_var_scoped_InnerEnumHelper; } - - private: InnerEnumHelper m_var_InnerEnumHelper{InnerEnumHelper::ENUM_VALUE_1}; @@ -253,7 +250,7 @@ class BitMaskStructure eProsima_user_DllExport BitMaskStructure( const BitMaskStructure& x) { - m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; + m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; } @@ -275,7 +272,7 @@ class BitMaskStructure const BitMaskStructure& x) { - m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; + m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; return *this; } @@ -350,8 +347,6 @@ class BitMaskStructure return m_var_InnerBitMaskHelper; } - - private: InnerBitMaskHelper m_var_InnerBitMaskHelper{0}; @@ -386,7 +381,7 @@ class BoundedBitMaskStructure eProsima_user_DllExport BoundedBitMaskStructure( const BoundedBitMaskStructure& x) { - m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; + m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; } @@ -408,7 +403,7 @@ class BoundedBitMaskStructure const BoundedBitMaskStructure& x) { - m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; + m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; return *this; } @@ -483,8 +478,6 @@ class BoundedBitMaskStructure return m_var_InnerBoundedBitMaskHelper; } - - private: InnerBoundedBitMaskHelper m_var_InnerBoundedBitMaskHelper{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp index bd437018..ab2c075e 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp @@ -38,8 +38,7 @@ Generated enumerations is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // FASTDDS_GEN_API_VER -namespace Test -{ +namespace Test { } // namespace Test /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp index 069ec1c6..b71e1772 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp @@ -90,7 +90,7 @@ class short_external eProsima_user_DllExport short_external( const short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -112,7 +112,7 @@ class short_external const short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -187,8 +187,6 @@ class short_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -223,7 +221,7 @@ class ushort_external eProsima_user_DllExport ushort_external( const ushort_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -245,7 +243,7 @@ class ushort_external const ushort_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -320,8 +318,6 @@ class ushort_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -356,7 +352,7 @@ class long_external eProsima_user_DllExport long_external( const long_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -378,7 +374,7 @@ class long_external const long_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -453,8 +449,6 @@ class long_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -489,7 +483,7 @@ class ulong_external eProsima_user_DllExport ulong_external( const ulong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -511,7 +505,7 @@ class ulong_external const ulong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -586,8 +580,6 @@ class ulong_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -622,7 +614,7 @@ class longlong_external eProsima_user_DllExport longlong_external( const longlong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -644,7 +636,7 @@ class longlong_external const longlong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -719,8 +711,6 @@ class longlong_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -755,7 +745,7 @@ class ulonglong_external eProsima_user_DllExport ulonglong_external( const ulonglong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -777,7 +767,7 @@ class ulonglong_external const ulonglong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -852,8 +842,6 @@ class ulonglong_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -888,7 +876,7 @@ class float_external eProsima_user_DllExport float_external( const float_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -910,7 +898,7 @@ class float_external const float_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -985,8 +973,6 @@ class float_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1021,7 +1007,7 @@ class double_external eProsima_user_DllExport double_external( const double_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1043,7 +1029,7 @@ class double_external const double_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1118,8 +1104,6 @@ class double_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1154,7 +1138,7 @@ class longdouble_external eProsima_user_DllExport longdouble_external( const longdouble_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1176,7 +1160,7 @@ class longdouble_external const longdouble_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1251,8 +1235,6 @@ class longdouble_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1287,7 +1269,7 @@ class boolean_external eProsima_user_DllExport boolean_external( const boolean_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1309,7 +1291,7 @@ class boolean_external const boolean_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1384,8 +1366,6 @@ class boolean_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1420,7 +1400,7 @@ class octet_external eProsima_user_DllExport octet_external( const octet_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1442,7 +1422,7 @@ class octet_external const octet_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1517,8 +1497,6 @@ class octet_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1553,7 +1531,7 @@ class char_external eProsima_user_DllExport char_external( const char_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1575,7 +1553,7 @@ class char_external const char_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1650,8 +1628,6 @@ class char_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1686,7 +1662,7 @@ class wchar_external eProsima_user_DllExport wchar_external( const wchar_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1708,7 +1684,7 @@ class wchar_external const wchar_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1783,8 +1759,6 @@ class wchar_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -1819,7 +1793,7 @@ class sequence_short_external eProsima_user_DllExport sequence_short_external( const sequence_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1841,7 +1815,7 @@ class sequence_short_external const sequence_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1916,8 +1890,6 @@ class sequence_short_external return m_value; } - - private: eprosima::fastcdr::external> m_value; @@ -1952,7 +1924,7 @@ class string_unbounded_external eProsima_user_DllExport string_unbounded_external( const string_unbounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1974,7 +1946,7 @@ class string_unbounded_external const string_unbounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2049,8 +2021,6 @@ class string_unbounded_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -2085,7 +2055,7 @@ class string_bounded_external eProsima_user_DllExport string_bounded_external( const string_bounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2107,7 +2077,7 @@ class string_bounded_external const string_bounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2182,8 +2152,6 @@ class string_bounded_external return m_value; } - - private: eprosima::fastcdr::external> m_value; @@ -2218,7 +2186,7 @@ class map_short_external eProsima_user_DllExport map_short_external( const map_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2240,7 +2208,7 @@ class map_short_external const map_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2315,8 +2283,6 @@ class map_short_external return m_value; } - - private: eprosima::fastcdr::external> m_value; @@ -2351,7 +2317,7 @@ class array_short_external eProsima_user_DllExport array_short_external( const array_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2373,7 +2339,7 @@ class array_short_external const array_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2448,8 +2414,6 @@ class array_short_external return m_value; } - - private: eprosima::fastcdr::external> m_value; @@ -2484,7 +2448,7 @@ class struct_external eProsima_user_DllExport struct_external( const struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2506,7 +2470,7 @@ class struct_external const struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2581,8 +2545,6 @@ class struct_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -2617,9 +2579,9 @@ class InnerStructExternal eProsima_user_DllExport InnerStructExternal( const InnerStructExternal& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; } @@ -2642,9 +2604,9 @@ class InnerStructExternal const InnerStructExternal& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; return *this; } @@ -2670,7 +2632,7 @@ class InnerStructExternal const InnerStructExternal& x) const { return (m_s == x.m_s && - m_l == x.m_l); + m_l == x.m_l); } /*! @@ -2711,7 +2673,6 @@ class InnerStructExternal return m_s; } - /*! * @brief This function copies the value in member l * @param _l New value to be copied in member l @@ -2750,8 +2711,6 @@ class InnerStructExternal return m_l; } - - private: int16_t m_s{0}; @@ -2787,7 +2746,7 @@ class ext_struct_external eProsima_user_DllExport ext_struct_external( const ext_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2809,7 +2768,7 @@ class ext_struct_external const ext_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2884,8 +2843,6 @@ class ext_struct_external return m_value; } - - private: InnerStructExternal m_value; @@ -2920,7 +2877,7 @@ class ext_and_inner_struct_external eProsima_user_DllExport ext_and_inner_struct_external( const ext_and_inner_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2942,7 +2899,7 @@ class ext_and_inner_struct_external const ext_and_inner_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3017,8 +2974,6 @@ class ext_and_inner_struct_external return m_value; } - - private: eprosima::fastcdr::external m_value; @@ -3053,7 +3008,7 @@ class struct_external_optional eProsima_user_DllExport struct_external_optional( const struct_external_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3075,7 +3030,7 @@ class struct_external_optional const struct_external_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3136,7 +3091,8 @@ class struct_external_optional * @brief This function returns a constant reference to member value * @return Constant reference to member value */ - eProsima_user_DllExport const eprosima::fastcdr::optional>& value() const + eProsima_user_DllExport const eprosima::fastcdr::optional>& value() + const { return m_value; } @@ -3150,8 +3106,6 @@ class struct_external_optional return m_value; } - - private: eprosima::fastcdr::optional> m_value; @@ -3188,9 +3142,9 @@ class recursive_union_container eProsima_user_DllExport recursive_union_container( const recursive_union_container& x) { - m_l = x.m_l; + m_l = x.m_l; - m_ext = x.m_ext; + m_ext = x.m_ext; } @@ -3213,9 +3167,9 @@ class recursive_union_container const recursive_union_container& x) { - m_l = x.m_l; + m_l = x.m_l; - m_ext = x.m_ext; + m_ext = x.m_ext; return *this; } @@ -3241,7 +3195,7 @@ class recursive_union_container const recursive_union_container& x) const { return (m_l == x.m_l && - m_ext == x.m_ext); + m_ext == x.m_ext); } /*! @@ -3282,7 +3236,6 @@ class recursive_union_container return m_l; } - /*! * @brief This function copies the value in member ext * @param _ext New value to be copied in member ext @@ -3321,8 +3274,6 @@ class recursive_union_container return m_ext; } - - private: int32_t m_l{0}; @@ -3366,17 +3317,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - c_() = x.m_c; - break; + case 0x00000002: + c_() = x.m_c; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } } @@ -3392,17 +3343,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - c_() = std::move(x.m_c); - break; + case 0x00000002: + c_() = std::move(x.m_c); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } } @@ -3418,17 +3369,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - c_() = x.m_c; - break; + case 0x00000002: + c_() = x.m_c; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } @@ -3446,17 +3397,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - c_() = std::move(x.m_c); - break; + case 0x00000002: + c_() = std::move(x.m_c); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } @@ -3477,17 +3428,17 @@ class recursive_union { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; - case 0x00000002: - ret_value = (m_c == x.m_c); - break; + case 0x00000002: + ret_value = (m_c == x.m_c); + break; - case 0x00000003: - ret_value = (m_s == x.m_s); - break; + case 0x00000003: + ret_value = (m_s == x.m_s); + break; } } @@ -3517,32 +3468,33 @@ class recursive_union switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3598,7 +3550,6 @@ class recursive_union return m_l; } - /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -3651,7 +3602,6 @@ class recursive_union return m_c; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -3693,7 +3643,6 @@ class recursive_union return m_s; } - void _default() { if (member_destructor_) @@ -3704,63 +3653,64 @@ class recursive_union selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& l_() + int32_t& l_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; - - } - - return m_l; + member_destructor_(); } - recursive_union_container& c_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - selected_member_ = 0x00000002; - member_destructor_ = [&]() {m_c.~recursive_union_container();}; - new(&m_c) recursive_union_container(); + } - } + return m_l; + } - return m_c; + recursive_union_container& c_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - int16_t& s_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000002; + member_destructor_ = [&]() { - member_destructor_(); - } + m_c.~recursive_union_container(); + }; + new(&m_c) recursive_union_container(); - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_s = {0}; + } - } + return m_c; + } - return m_s; + int16_t& s_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_s = {0}; + + } + + return m_s; + } uint8_t m__d {127}; @@ -3804,9 +3754,9 @@ class recursive_test_1 eProsima_user_DllExport recursive_test_1( const recursive_test_1& x) { - m_s = x.m_s; + m_s = x.m_s; - m_u = x.m_u; + m_u = x.m_u; } @@ -3829,9 +3779,9 @@ class recursive_test_1 const recursive_test_1& x) { - m_s = x.m_s; + m_s = x.m_s; - m_u = x.m_u; + m_u = x.m_u; return *this; } @@ -3857,7 +3807,7 @@ class recursive_test_1 const recursive_test_1& x) const { return (m_s == x.m_s && - m_u == x.m_u); + m_u == x.m_u); } /*! @@ -3898,7 +3848,6 @@ class recursive_test_1 return m_s; } - /*! * @brief This function copies the value in member u * @param _u New value to be copied in member u @@ -3937,8 +3886,6 @@ class recursive_test_1 return m_u; } - - private: int16_t m_s{0}; @@ -3984,17 +3931,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - ext_() = x.m_ext; - break; + case 0x00000002: + ext_() = x.m_ext; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } } @@ -4010,17 +3957,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - ext_() = std::move(x.m_ext); - break; + case 0x00000002: + ext_() = std::move(x.m_ext); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } } @@ -4036,17 +3983,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - ext_() = x.m_ext; - break; + case 0x00000002: + ext_() = x.m_ext; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } @@ -4064,17 +4011,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - ext_() = std::move(x.m_ext); - break; + case 0x00000002: + ext_() = std::move(x.m_ext); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } @@ -4095,17 +4042,17 @@ class recursive_structure_container { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; - case 0x00000002: - ret_value = (m_ext == x.m_ext); - break; + case 0x00000002: + ret_value = (m_ext == x.m_ext); + break; - case 0x00000003: - ret_value = (m_s == x.m_s); - break; + case 0x00000003: + ret_value = (m_s == x.m_s); + break; } } @@ -4135,32 +4082,33 @@ class recursive_structure_container switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4216,7 +4164,6 @@ class recursive_structure_container return m_l; } - /*! * @brief This function copies the value in member ext * @param _ext New value to be copied in member ext @@ -4269,7 +4216,6 @@ class recursive_structure_container return m_ext; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -4311,7 +4257,6 @@ class recursive_structure_container return m_s; } - void _default() { if (member_destructor_) @@ -4322,63 +4267,64 @@ class recursive_structure_container selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& l_() + int32_t& l_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; - - } - - return m_l; + member_destructor_(); } - eprosima::fastcdr::external& ext_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - selected_member_ = 0x00000002; - member_destructor_ = [&]() {m_ext.~external();}; - new(&m_ext) eprosima::fastcdr::external(); + } - } + return m_l; + } - return m_ext; + eprosima::fastcdr::external& ext_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - int16_t& s_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000002; + member_destructor_ = [&]() { - member_destructor_(); - } + m_ext.~external(); + }; + new(&m_ext) eprosima::fastcdr::external(); - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_s = {0}; + } - } + return m_ext; + } - return m_s; + int16_t& s_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_s = {0}; + + } + + return m_s; + } uint8_t m__d {127}; @@ -4422,9 +4368,9 @@ class recursive_structure eProsima_user_DllExport recursive_structure( const recursive_structure& x) { - m_s = x.m_s; + m_s = x.m_s; - m_c = x.m_c; + m_c = x.m_c; } @@ -4447,9 +4393,9 @@ class recursive_structure const recursive_structure& x) { - m_s = x.m_s; + m_s = x.m_s; - m_c = x.m_c; + m_c = x.m_c; return *this; } @@ -4475,7 +4421,7 @@ class recursive_structure const recursive_structure& x) const { return (m_s == x.m_s && - m_c == x.m_c); + m_c == x.m_c); } /*! @@ -4516,7 +4462,6 @@ class recursive_structure return m_s; } - /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -4555,8 +4500,6 @@ class recursive_structure return m_c; } - - private: int16_t m_s{0}; @@ -4592,9 +4535,9 @@ class recursive_test_2 eProsima_user_DllExport recursive_test_2( const recursive_test_2& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; } @@ -4617,9 +4560,9 @@ class recursive_test_2 const recursive_test_2& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; return *this; } @@ -4645,7 +4588,7 @@ class recursive_test_2 const recursive_test_2& x) const { return (m_o == x.m_o && - m_s == x.m_s); + m_s == x.m_s); } /*! @@ -4686,7 +4629,6 @@ class recursive_test_2 return m_o; } - /*! * @brief This function copies the value in member s * @param _s New value to be copied in member s @@ -4725,8 +4667,6 @@ class recursive_test_2 return m_s; } - - private: uint8_t m_o{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp index eccac14e..94a06d0c 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp @@ -81,7 +81,7 @@ class FinalShortStruct eProsima_user_DllExport FinalShortStruct( const FinalShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class FinalShortStruct const FinalShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,8 +168,6 @@ class FinalShortStruct return m_var_short; } - - private: int16_t m_var_short{0}; @@ -204,7 +202,7 @@ class FinalUShortStruct eProsima_user_DllExport FinalUShortStruct( const FinalUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -226,7 +224,7 @@ class FinalUShortStruct const FinalUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -291,8 +289,6 @@ class FinalUShortStruct return m_var_ushort; } - - private: uint16_t m_var_ushort{0}; @@ -327,7 +323,7 @@ class FinalLongStruct eProsima_user_DllExport FinalLongStruct( const FinalLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -349,7 +345,7 @@ class FinalLongStruct const FinalLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -414,8 +410,6 @@ class FinalLongStruct return m_var_long; } - - private: int32_t m_var_long{0}; @@ -450,7 +444,7 @@ class FinalULongStruct eProsima_user_DllExport FinalULongStruct( const FinalULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -472,7 +466,7 @@ class FinalULongStruct const FinalULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -537,8 +531,6 @@ class FinalULongStruct return m_var_ulong; } - - private: uint32_t m_var_ulong{0}; @@ -573,7 +565,7 @@ class FinalLongLongStruct eProsima_user_DllExport FinalLongLongStruct( const FinalLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -595,7 +587,7 @@ class FinalLongLongStruct const FinalLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -660,8 +652,6 @@ class FinalLongLongStruct return m_var_longlong; } - - private: int64_t m_var_longlong{0}; @@ -696,7 +686,7 @@ class FinalULongLongStruct eProsima_user_DllExport FinalULongLongStruct( const FinalULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -718,7 +708,7 @@ class FinalULongLongStruct const FinalULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -783,8 +773,6 @@ class FinalULongLongStruct return m_var_ulonglong; } - - private: uint64_t m_var_ulonglong{0}; @@ -819,7 +807,7 @@ class FinalFloatStruct eProsima_user_DllExport FinalFloatStruct( const FinalFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -841,7 +829,7 @@ class FinalFloatStruct const FinalFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -906,8 +894,6 @@ class FinalFloatStruct return m_var_float; } - - private: float m_var_float{0.0}; @@ -942,7 +928,7 @@ class FinalDoubleStruct eProsima_user_DllExport FinalDoubleStruct( const FinalDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -964,7 +950,7 @@ class FinalDoubleStruct const FinalDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1029,8 +1015,6 @@ class FinalDoubleStruct return m_var_double; } - - private: double m_var_double{0.0}; @@ -1065,7 +1049,7 @@ class FinalLongDoubleStruct eProsima_user_DllExport FinalLongDoubleStruct( const FinalLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1087,7 +1071,7 @@ class FinalLongDoubleStruct const FinalLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1152,8 +1136,6 @@ class FinalLongDoubleStruct return m_var_longdouble; } - - private: long double m_var_longdouble{0.0}; @@ -1188,7 +1170,7 @@ class FinalBooleanStruct eProsima_user_DllExport FinalBooleanStruct( const FinalBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1210,7 +1192,7 @@ class FinalBooleanStruct const FinalBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1275,8 +1257,6 @@ class FinalBooleanStruct return m_var_boolean; } - - private: bool m_var_boolean{false}; @@ -1311,7 +1291,7 @@ class FinalOctetStruct eProsima_user_DllExport FinalOctetStruct( const FinalOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1333,7 +1313,7 @@ class FinalOctetStruct const FinalOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1398,8 +1378,6 @@ class FinalOctetStruct return m_var_octet; } - - private: uint8_t m_var_octet{0}; @@ -1434,7 +1412,7 @@ class FinalCharStruct eProsima_user_DllExport FinalCharStruct( const FinalCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1456,7 +1434,7 @@ class FinalCharStruct const FinalCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1521,8 +1499,6 @@ class FinalCharStruct return m_var_char8; } - - private: char m_var_char8{0}; @@ -1557,7 +1533,7 @@ class FinalWCharStruct eProsima_user_DllExport FinalWCharStruct( const FinalWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1579,7 +1555,7 @@ class FinalWCharStruct const FinalWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1644,8 +1620,6 @@ class FinalWCharStruct return m_var_char16; } - - private: wchar_t m_var_char16{0}; @@ -1680,7 +1654,7 @@ class FinalUnionStruct eProsima_user_DllExport FinalUnionStruct( const FinalUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1702,7 +1676,7 @@ class FinalUnionStruct const FinalUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1777,8 +1751,6 @@ class FinalUnionStruct return m_var_union; } - - private: InnerUnionHelper m_var_union; @@ -1873,8 +1845,6 @@ class FinalEmptyStruct return !(*this == x); } - - private: @@ -1910,7 +1880,7 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct const FinalEmptyInheritanceStruct& x) : FinalEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1935,7 +1905,7 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct { FinalEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1961,9 +1931,9 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct const FinalEmptyInheritanceStruct& x) const { if (FinalEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2015,8 +1985,6 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct return m_var_str; } - - private: std::string m_var_str; @@ -2053,7 +2021,7 @@ class FinalInheritanceStruct : public FinalShortStruct const FinalInheritanceStruct& x) : FinalShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2078,7 +2046,7 @@ class FinalInheritanceStruct : public FinalShortStruct { FinalShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2104,9 +2072,9 @@ class FinalInheritanceStruct : public FinalShortStruct const FinalInheritanceStruct& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2158,8 +2126,6 @@ class FinalInheritanceStruct : public FinalShortStruct return m_var_str; } - - private: std::string m_var_str; @@ -2247,9 +2213,9 @@ class InheritanceEmptyStruct : public FinalShortStruct const InheritanceEmptyStruct& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2264,8 +2230,6 @@ class InheritanceEmptyStruct : public FinalShortStruct return !(*this == x); } - - private: @@ -2301,7 +2265,7 @@ class FinalExtensibilityInheritance : public FinalShortStruct const FinalExtensibilityInheritance& x) : FinalShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2326,7 +2290,7 @@ class FinalExtensibilityInheritance : public FinalShortStruct { FinalShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2352,9 +2316,9 @@ class FinalExtensibilityInheritance : public FinalShortStruct const FinalExtensibilityInheritance& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2396,8 +2360,6 @@ class FinalExtensibilityInheritance : public FinalShortStruct return m_var_long; } - - private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp index a8786266..d41c9261 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp @@ -2258,7 +2258,8 @@ struct FinalExtensibilityInheritance_f FinalExtensibilityInheritance_f); }; -template struct FinalExtensibilityInheritance_rob; +template struct FinalExtensibilityInheritance_rob; template inline size_t constexpr FinalExtensibilityInheritance_offset_of() @@ -2359,14 +2360,16 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T static constexpr bool is_plain_xcdrv1_impl() { return 8ULL == - (detail::FinalExtensibilityInheritance_offset_of() + + (detail::FinalExtensibilityInheritance_offset_of() + sizeof(int32_t)); } static constexpr bool is_plain_xcdrv2_impl() { return 8ULL == - (detail::FinalExtensibilityInheritance_offset_of() + + (detail::FinalExtensibilityInheritance_offset_of() + sizeof(int32_t)); } diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp index 1d57b907..d71a983b 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp @@ -123,9 +123,9 @@ class InnerStructureHelper eProsima_user_DllExport InnerStructureHelper( const InnerStructureHelper& x) { - m_field1 = x.m_field1; + m_field1 = x.m_field1; - m_field2 = x.m_field2; + m_field2 = x.m_field2; } @@ -148,9 +148,9 @@ class InnerStructureHelper const InnerStructureHelper& x) { - m_field1 = x.m_field1; + m_field1 = x.m_field1; - m_field2 = x.m_field2; + m_field2 = x.m_field2; return *this; } @@ -176,7 +176,7 @@ class InnerStructureHelper const InnerStructureHelper& x) const { return (m_field1 == x.m_field1 && - m_field2 == x.m_field2); + m_field2 == x.m_field2); } /*! @@ -217,7 +217,6 @@ class InnerStructureHelper return m_field1; } - /*! * @brief This function sets a value in member field2 * @param _field2 New value for member field2 @@ -246,8 +245,6 @@ class InnerStructureHelper return m_field2; } - - private: int32_t m_field1{0}; @@ -343,8 +340,6 @@ class InnerEmptyStructureHelper return !(*this == x); } - - private: @@ -390,17 +385,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = x.m_longValue; - break; + case 0x00000001: + longValue_() = x.m_longValue; + break; - case 0x00000002: - floatValue_() = x.m_floatValue; - break; + case 0x00000002: + floatValue_() = x.m_floatValue; + break; - case 0x00000003: - shortValue_() = x.m_shortValue; - break; + case 0x00000003: + shortValue_() = x.m_shortValue; + break; } } @@ -416,17 +411,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = std::move(x.m_longValue); - break; + case 0x00000001: + longValue_() = std::move(x.m_longValue); + break; - case 0x00000002: - floatValue_() = std::move(x.m_floatValue); - break; + case 0x00000002: + floatValue_() = std::move(x.m_floatValue); + break; - case 0x00000003: - shortValue_() = std::move(x.m_shortValue); - break; + case 0x00000003: + shortValue_() = std::move(x.m_shortValue); + break; } } @@ -442,17 +437,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = x.m_longValue; - break; + case 0x00000001: + longValue_() = x.m_longValue; + break; - case 0x00000002: - floatValue_() = x.m_floatValue; - break; + case 0x00000002: + floatValue_() = x.m_floatValue; + break; - case 0x00000003: - shortValue_() = x.m_shortValue; - break; + case 0x00000003: + shortValue_() = x.m_shortValue; + break; } @@ -470,17 +465,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = std::move(x.m_longValue); - break; + case 0x00000001: + longValue_() = std::move(x.m_longValue); + break; - case 0x00000002: - floatValue_() = std::move(x.m_floatValue); - break; + case 0x00000002: + floatValue_() = std::move(x.m_floatValue); + break; - case 0x00000003: - shortValue_() = std::move(x.m_shortValue); - break; + case 0x00000003: + shortValue_() = std::move(x.m_shortValue); + break; } @@ -501,17 +496,17 @@ class InnerUnionHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_longValue == x.m_longValue); - break; + case 0x00000001: + ret_value = (m_longValue == x.m_longValue); + break; - case 0x00000002: - ret_value = (m_floatValue == x.m_floatValue); - break; + case 0x00000002: + ret_value = (m_floatValue == x.m_floatValue); + break; - case 0x00000003: - ret_value = (m_shortValue == x.m_shortValue); - break; + case 0x00000003: + ret_value = (m_shortValue == x.m_shortValue); + break; } } @@ -541,32 +536,33 @@ class InnerUnionHelper switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -622,7 +618,6 @@ class InnerUnionHelper return m_longValue; } - /*! * @brief This function sets a value in member floatValue * @param _floatValue New value for member floatValue @@ -664,7 +659,6 @@ class InnerUnionHelper return m_floatValue; } - /*! * @brief This function sets a value in member shortValue * @param _shortValue New value for member shortValue @@ -706,64 +700,61 @@ class InnerUnionHelper return m_shortValue; } - - private: - int32_t& longValue_() + int32_t& longValue_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_longValue = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_longValue = {0}; - } + } - return m_longValue; - } + return m_longValue; + } - float& floatValue_() + float& floatValue_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_floatValue = {0.0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_floatValue = {0.0}; - } + } - return m_floatValue; - } + return m_floatValue; + } - int16_t& shortValue_() + int16_t& shortValue_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_shortValue = {0}; + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_shortValue = {0}; - } - - return m_shortValue; - } + } + return m_shortValue; + } int32_t m__d {2147483647}; @@ -784,17 +775,17 @@ class InnerUnionHelper */ struct InnerBitsetHelper { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; /*! @@ -805,9 +796,9 @@ struct InnerBitsetHelper const InnerBitsetHelper& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d); + b == x.b && + c == x.c && + d == x.d); } /*! @@ -819,6 +810,7 @@ struct InnerBitsetHelper { return !(*this == x); } + }; const int16_t inner_const_helper = 1; typedef eprosima::fastcdr::fixed_string<10> Inner_alias_bounded_string_helper; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp index 68b4f1c2..e8393cc0 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp @@ -81,9 +81,9 @@ class InnerStructureHelperChild : public InnerStructureHelper const InnerStructureHelperChild& x) : InnerStructureHelper(x) { - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; } @@ -109,9 +109,9 @@ class InnerStructureHelperChild : public InnerStructureHelper { InnerStructureHelper::operator =(x); - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; return *this; } @@ -138,11 +138,11 @@ class InnerStructureHelperChild : public InnerStructureHelper const InnerStructureHelperChild& x) const { if (InnerStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_longlong == x.m_var_child_longlong && - m_var_child_ulonglong == x.m_var_child_ulonglong); + m_var_child_ulonglong == x.m_var_child_ulonglong); } /*! @@ -183,7 +183,6 @@ class InnerStructureHelperChild : public InnerStructureHelper return m_var_child_longlong; } - /*! * @brief This function sets a value in member var_child_ulonglong * @param _var_child_ulonglong New value for member var_child_ulonglong @@ -212,8 +211,6 @@ class InnerStructureHelperChild : public InnerStructureHelper return m_var_child_ulonglong; } - - private: int64_t m_var_child_longlong{0}; @@ -251,9 +248,9 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild const InnerStructureHelperChildChild& x) : InnerStructureHelperChild(x) { - m_var_child_childlonglong2 = x.m_var_child_childlonglong2; + m_var_child_childlonglong2 = x.m_var_child_childlonglong2; - m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; + m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; } @@ -279,9 +276,9 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild { InnerStructureHelperChild::operator =(x); - m_var_child_childlonglong2 = x.m_var_child_childlonglong2; + m_var_child_childlonglong2 = x.m_var_child_childlonglong2; - m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; + m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; return *this; } @@ -308,11 +305,11 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild const InnerStructureHelperChildChild& x) const { if (InnerStructureHelperChild::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_childlonglong2 == x.m_var_child_childlonglong2 && - m_var_childchild_ulonglong2 == x.m_var_childchild_ulonglong2); + m_var_childchild_ulonglong2 == x.m_var_childchild_ulonglong2); } /*! @@ -353,7 +350,6 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild return m_var_child_childlonglong2; } - /*! * @brief This function sets a value in member var_childchild_ulonglong2 * @param _var_childchild_ulonglong2 New value for member var_childchild_ulonglong2 @@ -382,8 +378,6 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild return m_var_childchild_ulonglong2; } - - private: int64_t m_var_child_childlonglong2{0}; @@ -472,9 +466,9 @@ class InnerStructureHelperEmptyChild : public InnerStructureHelper const InnerStructureHelperEmptyChild& x) const { if (InnerStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -489,8 +483,6 @@ class InnerStructureHelperEmptyChild : public InnerStructureHelper return !(*this == x); } - - private: @@ -526,7 +518,7 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil const InnerStructureHelperEmptyChildChild& x) : InnerStructureHelperEmptyChild(x) { - m_var_char = x.m_var_char; + m_var_char = x.m_var_char; } @@ -551,7 +543,7 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil { InnerStructureHelperEmptyChild::operator =(x); - m_var_char = x.m_var_char; + m_var_char = x.m_var_char; return *this; } @@ -577,9 +569,9 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil const InnerStructureHelperEmptyChildChild& x) const { if (InnerStructureHelperEmptyChild::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_char == x.m_var_char); } @@ -621,8 +613,6 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil return m_var_char; } - - private: char m_var_char{0}; @@ -659,9 +649,9 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper const InnerEmptyStructureHelperChild& x) : InnerEmptyStructureHelper(x) { - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; } @@ -687,9 +677,9 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper { InnerEmptyStructureHelper::operator =(x); - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; return *this; } @@ -716,11 +706,11 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper const InnerEmptyStructureHelperChild& x) const { if (InnerEmptyStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_longlong == x.m_var_child_longlong && - m_var_child_ulonglong == x.m_var_child_ulonglong); + m_var_child_ulonglong == x.m_var_child_ulonglong); } /*! @@ -761,7 +751,6 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper return m_var_child_longlong; } - /*! * @brief This function sets a value in member var_child_ulonglong * @param _var_child_ulonglong New value for member var_child_ulonglong @@ -790,8 +779,6 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper return m_var_child_ulonglong; } - - private: int64_t m_var_child_longlong{0}; @@ -829,7 +816,7 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias const StructAliasInheritanceStruct& x) : inner_structure_helper_alias(x) { - m_new_member = x.m_new_member; + m_new_member = x.m_new_member; } @@ -854,7 +841,7 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias { inner_structure_helper_alias::operator =(x); - m_new_member = x.m_new_member; + m_new_member = x.m_new_member; return *this; } @@ -880,9 +867,9 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias const StructAliasInheritanceStruct& x) const { if (inner_structure_helper_alias::operator !=(x)) - { - return false; - } + { + return false; + } return (m_new_member == x.m_new_member); } @@ -924,8 +911,6 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias return m_new_member; } - - private: int16_t m_new_member{0}; @@ -960,17 +945,17 @@ class StructuresInheritanceStruct eProsima_user_DllExport StructuresInheritanceStruct( const StructuresInheritanceStruct& x) { - m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; + m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; - m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; + m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; - m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; + m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; - m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; + m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; - m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; + m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; - m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; + m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; } @@ -997,17 +982,17 @@ class StructuresInheritanceStruct const StructuresInheritanceStruct& x) { - m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; + m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; - m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; + m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; - m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; + m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; - m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; + m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; - m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; + m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; - m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; + m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; return *this; } @@ -1037,11 +1022,11 @@ class StructuresInheritanceStruct const StructuresInheritanceStruct& x) const { return (m_var_InnerStructureHelperChild == x.m_var_InnerStructureHelperChild && - m_var_InnerStructureHelperChildChild == x.m_var_InnerStructureHelperChildChild && - m_var_InnerStructureHelperEmptyChild == x.m_var_InnerStructureHelperEmptyChild && - m_var_InnerStructureHelperEmptyChildChild == x.m_var_InnerStructureHelperEmptyChildChild && - m_var_InnerEmptyStructureHelperChild == x.m_var_InnerEmptyStructureHelperChild && - m_var_StructAliasInheritanceStruct == x.m_var_StructAliasInheritanceStruct); + m_var_InnerStructureHelperChildChild == x.m_var_InnerStructureHelperChildChild && + m_var_InnerStructureHelperEmptyChild == x.m_var_InnerStructureHelperEmptyChild && + m_var_InnerStructureHelperEmptyChildChild == x.m_var_InnerStructureHelperEmptyChildChild && + m_var_InnerEmptyStructureHelperChild == x.m_var_InnerEmptyStructureHelperChild && + m_var_StructAliasInheritanceStruct == x.m_var_StructAliasInheritanceStruct); } /*! @@ -1092,7 +1077,6 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperChild; } - /*! * @brief This function copies the value in member var_InnerStructureHelperChildChild * @param _var_InnerStructureHelperChildChild New value to be copied in member var_InnerStructureHelperChildChild @@ -1131,7 +1115,6 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperChildChild; } - /*! * @brief This function copies the value in member var_InnerStructureHelperEmptyChild * @param _var_InnerStructureHelperEmptyChild New value to be copied in member var_InnerStructureHelperEmptyChild @@ -1170,7 +1153,6 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperEmptyChild; } - /*! * @brief This function copies the value in member var_InnerStructureHelperEmptyChildChild * @param _var_InnerStructureHelperEmptyChildChild New value to be copied in member var_InnerStructureHelperEmptyChildChild @@ -1209,7 +1191,6 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperEmptyChildChild; } - /*! * @brief This function copies the value in member var_InnerEmptyStructureHelperChild * @param _var_InnerEmptyStructureHelperChild New value to be copied in member var_InnerEmptyStructureHelperChild @@ -1248,7 +1229,6 @@ class StructuresInheritanceStruct return m_var_InnerEmptyStructureHelperChild; } - /*! * @brief This function copies the value in member var_StructAliasInheritanceStruct * @param _var_StructAliasInheritanceStruct New value to be copied in member var_StructAliasInheritanceStruct @@ -1287,8 +1267,6 @@ class StructuresInheritanceStruct return m_var_StructAliasInheritanceStruct; } - - private: InnerStructureHelperChild m_var_InnerStructureHelperChild; @@ -1305,19 +1283,19 @@ class StructuresInheritanceStruct */ struct InnerBitsetHelperChild { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint32_t child_w : 17; + uint32_t child_w : 17; /*! @@ -1328,10 +1306,10 @@ struct InnerBitsetHelperChild const InnerBitsetHelperChild& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - child_w == x.child_w); + b == x.b && + c == x.c && + d == x.d && + child_w == x.child_w); } /*! @@ -1343,6 +1321,7 @@ struct InnerBitsetHelperChild { return !(*this == x); } + }; /*! * @brief This structure represents the bitset InnerBitsetHelperChildChild defined by the user in the IDL file. @@ -1350,21 +1329,21 @@ struct InnerBitsetHelperChild */ struct InnerBitsetHelperChildChild { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint32_t child_w : 17; + uint32_t child_w : 17; - uint16_t childchild_z : 14; + uint16_t childchild_z : 14; /*! @@ -1375,11 +1354,11 @@ struct InnerBitsetHelperChildChild const InnerBitsetHelperChildChild& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - child_w == x.child_w && - childchild_z == x.childchild_z); + b == x.b && + c == x.c && + d == x.d && + child_w == x.child_w && + childchild_z == x.childchild_z); } /*! @@ -1391,6 +1370,7 @@ struct InnerBitsetHelperChildChild { return !(*this == x); } + }; /*! * @brief This structure represents the bitset BitsetAliasInheritanceBitset defined by the user in the IDL file. @@ -1398,19 +1378,19 @@ struct InnerBitsetHelperChildChild */ struct BitsetAliasInheritanceBitset { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint16_t new_bitfield : 10; + uint16_t new_bitfield : 10; /*! @@ -1421,10 +1401,10 @@ struct BitsetAliasInheritanceBitset const BitsetAliasInheritanceBitset& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - new_bitfield == x.new_bitfield); + b == x.b && + c == x.c && + d == x.d && + new_bitfield == x.new_bitfield); } /*! @@ -1436,6 +1416,7 @@ struct BitsetAliasInheritanceBitset { return !(*this == x); } + }; /*! * @brief This class represents the structure BitsetsChildInheritanceStruct defined by the user in the IDL file. @@ -1466,11 +1447,11 @@ class BitsetsChildInheritanceStruct eProsima_user_DllExport BitsetsChildInheritanceStruct( const BitsetsChildInheritanceStruct& x) { - m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; + m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; - m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; + m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; - m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; + m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; } @@ -1494,11 +1475,11 @@ class BitsetsChildInheritanceStruct const BitsetsChildInheritanceStruct& x) { - m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; + m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; - m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; + m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; - m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; + m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; return *this; } @@ -1525,8 +1506,8 @@ class BitsetsChildInheritanceStruct const BitsetsChildInheritanceStruct& x) const { return (m_var_InnerBitsetHelperChild == x.m_var_InnerBitsetHelperChild && - m_var_InnerBitsetHelperChildChild == x.m_var_InnerBitsetHelperChildChild && - m_var_BitsetAliasInheritanceBitset == x.m_var_BitsetAliasInheritanceBitset); + m_var_InnerBitsetHelperChildChild == x.m_var_InnerBitsetHelperChildChild && + m_var_BitsetAliasInheritanceBitset == x.m_var_BitsetAliasInheritanceBitset); } /*! @@ -1577,7 +1558,6 @@ class BitsetsChildInheritanceStruct return m_var_InnerBitsetHelperChild; } - /*! * @brief This function copies the value in member var_InnerBitsetHelperChildChild * @param _var_InnerBitsetHelperChildChild New value to be copied in member var_InnerBitsetHelperChildChild @@ -1616,7 +1596,6 @@ class BitsetsChildInheritanceStruct return m_var_InnerBitsetHelperChildChild; } - /*! * @brief This function copies the value in member var_BitsetAliasInheritanceBitset * @param _var_BitsetAliasInheritanceBitset New value to be copied in member var_BitsetAliasInheritanceBitset @@ -1655,8 +1634,6 @@ class BitsetsChildInheritanceStruct return m_var_BitsetAliasInheritanceBitset; } - - private: InnerBitsetHelperChild m_var_InnerBitsetHelperChild{}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp index 9a12e1fd..6eea90e1 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp @@ -80,9 +80,9 @@ class KeyedShortStruct eProsima_user_DllExport KeyedShortStruct( const KeyedShortStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -105,9 +105,9 @@ class KeyedShortStruct const KeyedShortStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -133,7 +133,7 @@ class KeyedShortStruct const KeyedShortStruct& x) const { return (m_key_short == x.m_key_short && - m_var_short == x.m_var_short); + m_var_short == x.m_var_short); } /*! @@ -174,7 +174,6 @@ class KeyedShortStruct return m_key_short; } - /*! * @brief This function sets a value in member var_short * @param _var_short New value for member var_short @@ -203,8 +202,6 @@ class KeyedShortStruct return m_var_short; } - - private: int16_t m_key_short{0}; @@ -240,9 +237,9 @@ class KeyedUShortStruct eProsima_user_DllExport KeyedUShortStruct( const KeyedUShortStruct& x) { - m_key_ushort = x.m_key_ushort; + m_key_ushort = x.m_key_ushort; - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -265,9 +262,9 @@ class KeyedUShortStruct const KeyedUShortStruct& x) { - m_key_ushort = x.m_key_ushort; + m_key_ushort = x.m_key_ushort; - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -293,7 +290,7 @@ class KeyedUShortStruct const KeyedUShortStruct& x) const { return (m_key_ushort == x.m_key_ushort && - m_var_ushort == x.m_var_ushort); + m_var_ushort == x.m_var_ushort); } /*! @@ -334,7 +331,6 @@ class KeyedUShortStruct return m_key_ushort; } - /*! * @brief This function sets a value in member var_ushort * @param _var_ushort New value for member var_ushort @@ -363,8 +359,6 @@ class KeyedUShortStruct return m_var_ushort; } - - private: uint16_t m_key_ushort{0}; @@ -400,9 +394,9 @@ class KeyedLongStruct eProsima_user_DllExport KeyedLongStruct( const KeyedLongStruct& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -425,9 +419,9 @@ class KeyedLongStruct const KeyedLongStruct& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -453,7 +447,7 @@ class KeyedLongStruct const KeyedLongStruct& x) const { return (m_key_long == x.m_key_long && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -494,7 +488,6 @@ class KeyedLongStruct return m_key_long; } - /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -523,8 +516,6 @@ class KeyedLongStruct return m_var_long; } - - private: int32_t m_key_long{0}; @@ -560,9 +551,9 @@ class KeyedULongStruct eProsima_user_DllExport KeyedULongStruct( const KeyedULongStruct& x) { - m_key_ulong = x.m_key_ulong; + m_key_ulong = x.m_key_ulong; - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -585,9 +576,9 @@ class KeyedULongStruct const KeyedULongStruct& x) { - m_key_ulong = x.m_key_ulong; + m_key_ulong = x.m_key_ulong; - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -613,7 +604,7 @@ class KeyedULongStruct const KeyedULongStruct& x) const { return (m_key_ulong == x.m_key_ulong && - m_var_ulong == x.m_var_ulong); + m_var_ulong == x.m_var_ulong); } /*! @@ -654,7 +645,6 @@ class KeyedULongStruct return m_key_ulong; } - /*! * @brief This function sets a value in member var_ulong * @param _var_ulong New value for member var_ulong @@ -683,8 +673,6 @@ class KeyedULongStruct return m_var_ulong; } - - private: uint32_t m_key_ulong{0}; @@ -720,9 +708,9 @@ class KeyedLongLongStruct eProsima_user_DllExport KeyedLongLongStruct( const KeyedLongLongStruct& x) { - m_key_longlong = x.m_key_longlong; + m_key_longlong = x.m_key_longlong; - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -745,9 +733,9 @@ class KeyedLongLongStruct const KeyedLongLongStruct& x) { - m_key_longlong = x.m_key_longlong; + m_key_longlong = x.m_key_longlong; - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -773,7 +761,7 @@ class KeyedLongLongStruct const KeyedLongLongStruct& x) const { return (m_key_longlong == x.m_key_longlong && - m_var_longlong == x.m_var_longlong); + m_var_longlong == x.m_var_longlong); } /*! @@ -814,7 +802,6 @@ class KeyedLongLongStruct return m_key_longlong; } - /*! * @brief This function sets a value in member var_longlong * @param _var_longlong New value for member var_longlong @@ -843,8 +830,6 @@ class KeyedLongLongStruct return m_var_longlong; } - - private: int64_t m_key_longlong{0}; @@ -880,9 +865,9 @@ class KeyedULongLongStruct eProsima_user_DllExport KeyedULongLongStruct( const KeyedULongLongStruct& x) { - m_key_ulonglong = x.m_key_ulonglong; + m_key_ulonglong = x.m_key_ulonglong; - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -905,9 +890,9 @@ class KeyedULongLongStruct const KeyedULongLongStruct& x) { - m_key_ulonglong = x.m_key_ulonglong; + m_key_ulonglong = x.m_key_ulonglong; - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -933,7 +918,7 @@ class KeyedULongLongStruct const KeyedULongLongStruct& x) const { return (m_key_ulonglong == x.m_key_ulonglong && - m_var_ulonglong == x.m_var_ulonglong); + m_var_ulonglong == x.m_var_ulonglong); } /*! @@ -974,7 +959,6 @@ class KeyedULongLongStruct return m_key_ulonglong; } - /*! * @brief This function sets a value in member var_ulonglong * @param _var_ulonglong New value for member var_ulonglong @@ -1003,8 +987,6 @@ class KeyedULongLongStruct return m_var_ulonglong; } - - private: uint64_t m_key_ulonglong{0}; @@ -1040,9 +1022,9 @@ class KeyedFloatStruct eProsima_user_DllExport KeyedFloatStruct( const KeyedFloatStruct& x) { - m_key_float = x.m_key_float; + m_key_float = x.m_key_float; - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -1065,9 +1047,9 @@ class KeyedFloatStruct const KeyedFloatStruct& x) { - m_key_float = x.m_key_float; + m_key_float = x.m_key_float; - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -1093,7 +1075,7 @@ class KeyedFloatStruct const KeyedFloatStruct& x) const { return (m_key_float == x.m_key_float && - m_var_float == x.m_var_float); + m_var_float == x.m_var_float); } /*! @@ -1134,7 +1116,6 @@ class KeyedFloatStruct return m_key_float; } - /*! * @brief This function sets a value in member var_float * @param _var_float New value for member var_float @@ -1163,8 +1144,6 @@ class KeyedFloatStruct return m_var_float; } - - private: float m_key_float{0.0}; @@ -1200,9 +1179,9 @@ class KeyedDoubleStruct eProsima_user_DllExport KeyedDoubleStruct( const KeyedDoubleStruct& x) { - m_key_double = x.m_key_double; + m_key_double = x.m_key_double; - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -1225,9 +1204,9 @@ class KeyedDoubleStruct const KeyedDoubleStruct& x) { - m_key_double = x.m_key_double; + m_key_double = x.m_key_double; - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1253,7 +1232,7 @@ class KeyedDoubleStruct const KeyedDoubleStruct& x) const { return (m_key_double == x.m_key_double && - m_var_double == x.m_var_double); + m_var_double == x.m_var_double); } /*! @@ -1294,7 +1273,6 @@ class KeyedDoubleStruct return m_key_double; } - /*! * @brief This function sets a value in member var_double * @param _var_double New value for member var_double @@ -1323,8 +1301,6 @@ class KeyedDoubleStruct return m_var_double; } - - private: double m_key_double{0.0}; @@ -1360,9 +1336,9 @@ class KeyedLongDoubleStruct eProsima_user_DllExport KeyedLongDoubleStruct( const KeyedLongDoubleStruct& x) { - m_key_longdouble = x.m_key_longdouble; + m_key_longdouble = x.m_key_longdouble; - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1385,9 +1361,9 @@ class KeyedLongDoubleStruct const KeyedLongDoubleStruct& x) { - m_key_longdouble = x.m_key_longdouble; + m_key_longdouble = x.m_key_longdouble; - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1413,7 +1389,7 @@ class KeyedLongDoubleStruct const KeyedLongDoubleStruct& x) const { return (m_key_longdouble == x.m_key_longdouble && - m_var_longdouble == x.m_var_longdouble); + m_var_longdouble == x.m_var_longdouble); } /*! @@ -1454,7 +1430,6 @@ class KeyedLongDoubleStruct return m_key_longdouble; } - /*! * @brief This function sets a value in member var_longdouble * @param _var_longdouble New value for member var_longdouble @@ -1483,8 +1458,6 @@ class KeyedLongDoubleStruct return m_var_longdouble; } - - private: long double m_key_longdouble{0.0}; @@ -1520,9 +1493,9 @@ class KeyedBooleanStruct eProsima_user_DllExport KeyedBooleanStruct( const KeyedBooleanStruct& x) { - m_key_boolean = x.m_key_boolean; + m_key_boolean = x.m_key_boolean; - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1545,9 +1518,9 @@ class KeyedBooleanStruct const KeyedBooleanStruct& x) { - m_key_boolean = x.m_key_boolean; + m_key_boolean = x.m_key_boolean; - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1573,7 +1546,7 @@ class KeyedBooleanStruct const KeyedBooleanStruct& x) const { return (m_key_boolean == x.m_key_boolean && - m_var_boolean == x.m_var_boolean); + m_var_boolean == x.m_var_boolean); } /*! @@ -1614,7 +1587,6 @@ class KeyedBooleanStruct return m_key_boolean; } - /*! * @brief This function sets a value in member var_boolean * @param _var_boolean New value for member var_boolean @@ -1643,8 +1615,6 @@ class KeyedBooleanStruct return m_var_boolean; } - - private: bool m_key_boolean{false}; @@ -1680,9 +1650,9 @@ class KeyedOctetStruct eProsima_user_DllExport KeyedOctetStruct( const KeyedOctetStruct& x) { - m_key_octet = x.m_key_octet; + m_key_octet = x.m_key_octet; - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1705,9 +1675,9 @@ class KeyedOctetStruct const KeyedOctetStruct& x) { - m_key_octet = x.m_key_octet; + m_key_octet = x.m_key_octet; - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1733,7 +1703,7 @@ class KeyedOctetStruct const KeyedOctetStruct& x) const { return (m_key_octet == x.m_key_octet && - m_var_octet == x.m_var_octet); + m_var_octet == x.m_var_octet); } /*! @@ -1774,7 +1744,6 @@ class KeyedOctetStruct return m_key_octet; } - /*! * @brief This function sets a value in member var_octet * @param _var_octet New value for member var_octet @@ -1803,8 +1772,6 @@ class KeyedOctetStruct return m_var_octet; } - - private: uint8_t m_key_octet{0}; @@ -1840,9 +1807,9 @@ class KeyedCharStruct eProsima_user_DllExport KeyedCharStruct( const KeyedCharStruct& x) { - m_key_char8 = x.m_key_char8; + m_key_char8 = x.m_key_char8; - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1865,9 +1832,9 @@ class KeyedCharStruct const KeyedCharStruct& x) { - m_key_char8 = x.m_key_char8; + m_key_char8 = x.m_key_char8; - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1893,7 +1860,7 @@ class KeyedCharStruct const KeyedCharStruct& x) const { return (m_key_char8 == x.m_key_char8 && - m_var_char8 == x.m_var_char8); + m_var_char8 == x.m_var_char8); } /*! @@ -1934,7 +1901,6 @@ class KeyedCharStruct return m_key_char8; } - /*! * @brief This function sets a value in member var_char8 * @param _var_char8 New value for member var_char8 @@ -1963,8 +1929,6 @@ class KeyedCharStruct return m_var_char8; } - - private: char m_key_char8{0}; @@ -2000,9 +1964,9 @@ class KeyedWCharStruct eProsima_user_DllExport KeyedWCharStruct( const KeyedWCharStruct& x) { - m_key_char16 = x.m_key_char16; + m_key_char16 = x.m_key_char16; - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -2025,9 +1989,9 @@ class KeyedWCharStruct const KeyedWCharStruct& x) { - m_key_char16 = x.m_key_char16; + m_key_char16 = x.m_key_char16; - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -2053,7 +2017,7 @@ class KeyedWCharStruct const KeyedWCharStruct& x) const { return (m_key_char16 == x.m_key_char16 && - m_var_char16 == x.m_var_char16); + m_var_char16 == x.m_var_char16); } /*! @@ -2094,7 +2058,6 @@ class KeyedWCharStruct return m_key_char16; } - /*! * @brief This function sets a value in member var_char16 * @param _var_char16 New value for member var_char16 @@ -2123,8 +2086,6 @@ class KeyedWCharStruct return m_var_char16; } - - private: wchar_t m_key_char16{0}; @@ -2160,7 +2121,7 @@ class KeyedEmptyStruct eProsima_user_DllExport KeyedEmptyStruct( const KeyedEmptyStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; } @@ -2182,7 +2143,7 @@ class KeyedEmptyStruct const KeyedEmptyStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; return *this; } @@ -2247,8 +2208,6 @@ class KeyedEmptyStruct return m_key_short; } - - private: int16_t m_key_short{0}; @@ -2285,9 +2244,9 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct const KeyedEmptyInheritanceStruct& x) : KeyedEmptyStruct(x) { - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2313,9 +2272,9 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct { KeyedEmptyStruct::operator =(x); - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2342,11 +2301,11 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct const KeyedEmptyInheritanceStruct& x) const { if (KeyedEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_key_str == x.m_key_str && - m_var_str == x.m_var_str); + m_var_str == x.m_var_str); } /*! @@ -2397,7 +2356,6 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct return m_key_str; } - /*! * @brief This function copies the value in member var_str * @param _var_str New value to be copied in member var_str @@ -2436,8 +2394,6 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct return m_var_str; } - - private: std::string m_key_str; @@ -2475,9 +2431,9 @@ class KeyedInheritanceStruct : public KeyedShortStruct const KeyedInheritanceStruct& x) : KeyedShortStruct(x) { - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2503,9 +2459,9 @@ class KeyedInheritanceStruct : public KeyedShortStruct { KeyedShortStruct::operator =(x); - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2532,11 +2488,11 @@ class KeyedInheritanceStruct : public KeyedShortStruct const KeyedInheritanceStruct& x) const { if (KeyedShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_key_str == x.m_key_str && - m_var_str == x.m_var_str); + m_var_str == x.m_var_str); } /*! @@ -2587,7 +2543,6 @@ class KeyedInheritanceStruct : public KeyedShortStruct return m_key_str; } - /*! * @brief This function copies the value in member var_str * @param _var_str New value to be copied in member var_str @@ -2626,8 +2581,6 @@ class KeyedInheritanceStruct : public KeyedShortStruct return m_var_str; } - - private: std::string m_key_str; @@ -2716,9 +2669,9 @@ class InheritanceKeyedEmptyStruct : public KeyedShortStruct const InheritanceKeyedEmptyStruct& x) const { if (KeyedShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2733,8 +2686,6 @@ class InheritanceKeyedEmptyStruct : public KeyedShortStruct return !(*this == x); } - - private: @@ -2768,11 +2719,11 @@ class KeyedFinal eProsima_user_DllExport KeyedFinal( const KeyedFinal& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -2796,11 +2747,11 @@ class KeyedFinal const KeyedFinal& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -2827,8 +2778,8 @@ class KeyedFinal const KeyedFinal& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -2869,7 +2820,6 @@ class KeyedFinal return m_key_long; } - /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -2898,7 +2848,6 @@ class KeyedFinal return m_key_short; } - /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -2937,8 +2886,6 @@ class KeyedFinal return m_key_string; } - - private: int32_t m_key_long{0}; @@ -2975,11 +2922,11 @@ class KeyedAppendable eProsima_user_DllExport KeyedAppendable( const KeyedAppendable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -3003,11 +2950,11 @@ class KeyedAppendable const KeyedAppendable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -3034,8 +2981,8 @@ class KeyedAppendable const KeyedAppendable& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -3076,7 +3023,6 @@ class KeyedAppendable return m_key_long; } - /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -3105,7 +3051,6 @@ class KeyedAppendable return m_key_short; } - /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -3144,8 +3089,6 @@ class KeyedAppendable return m_key_string; } - - private: int32_t m_key_long{0}; @@ -3182,11 +3125,11 @@ class KeyedMutable eProsima_user_DllExport KeyedMutable( const KeyedMutable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -3210,11 +3153,11 @@ class KeyedMutable const KeyedMutable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -3241,8 +3184,8 @@ class KeyedMutable const KeyedMutable& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -3283,7 +3226,6 @@ class KeyedMutable return m_key_long; } - /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -3312,7 +3254,6 @@ class KeyedMutable return m_key_short; } - /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -3351,8 +3292,6 @@ class KeyedMutable return m_key_string; } - - private: int32_t m_key_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp index feb3ddf3..953490e5 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp @@ -82,7 +82,7 @@ class MapShortShort eProsima_user_DllExport MapShortShort( const MapShortShort& x) { - m_var_map_short_short = x.m_var_map_short_short; + m_var_map_short_short = x.m_var_map_short_short; } @@ -104,7 +104,7 @@ class MapShortShort const MapShortShort& x) { - m_var_map_short_short = x.m_var_map_short_short; + m_var_map_short_short = x.m_var_map_short_short; return *this; } @@ -179,8 +179,6 @@ class MapShortShort return m_var_map_short_short; } - - private: std::map m_var_map_short_short; @@ -215,7 +213,7 @@ class MapShortUShort eProsima_user_DllExport MapShortUShort( const MapShortUShort& x) { - m_var_map_short_ushort = x.m_var_map_short_ushort; + m_var_map_short_ushort = x.m_var_map_short_ushort; } @@ -237,7 +235,7 @@ class MapShortUShort const MapShortUShort& x) { - m_var_map_short_ushort = x.m_var_map_short_ushort; + m_var_map_short_ushort = x.m_var_map_short_ushort; return *this; } @@ -312,8 +310,6 @@ class MapShortUShort return m_var_map_short_ushort; } - - private: std::map m_var_map_short_ushort; @@ -348,7 +344,7 @@ class MapShortLong eProsima_user_DllExport MapShortLong( const MapShortLong& x) { - m_var_map_short_long = x.m_var_map_short_long; + m_var_map_short_long = x.m_var_map_short_long; } @@ -370,7 +366,7 @@ class MapShortLong const MapShortLong& x) { - m_var_map_short_long = x.m_var_map_short_long; + m_var_map_short_long = x.m_var_map_short_long; return *this; } @@ -445,8 +441,6 @@ class MapShortLong return m_var_map_short_long; } - - private: std::map m_var_map_short_long; @@ -481,7 +475,7 @@ class MapShortULong eProsima_user_DllExport MapShortULong( const MapShortULong& x) { - m_var_map_short_ulong = x.m_var_map_short_ulong; + m_var_map_short_ulong = x.m_var_map_short_ulong; } @@ -503,7 +497,7 @@ class MapShortULong const MapShortULong& x) { - m_var_map_short_ulong = x.m_var_map_short_ulong; + m_var_map_short_ulong = x.m_var_map_short_ulong; return *this; } @@ -578,8 +572,6 @@ class MapShortULong return m_var_map_short_ulong; } - - private: std::map m_var_map_short_ulong; @@ -614,7 +606,7 @@ class MapShortLongLong eProsima_user_DllExport MapShortLongLong( const MapShortLongLong& x) { - m_var_map_short_longlong = x.m_var_map_short_longlong; + m_var_map_short_longlong = x.m_var_map_short_longlong; } @@ -636,7 +628,7 @@ class MapShortLongLong const MapShortLongLong& x) { - m_var_map_short_longlong = x.m_var_map_short_longlong; + m_var_map_short_longlong = x.m_var_map_short_longlong; return *this; } @@ -711,8 +703,6 @@ class MapShortLongLong return m_var_map_short_longlong; } - - private: std::map m_var_map_short_longlong; @@ -747,7 +737,7 @@ class MapShortULongLong eProsima_user_DllExport MapShortULongLong( const MapShortULongLong& x) { - m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; + m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; } @@ -769,7 +759,7 @@ class MapShortULongLong const MapShortULongLong& x) { - m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; + m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; return *this; } @@ -844,8 +834,6 @@ class MapShortULongLong return m_var_map_short_ulonglong; } - - private: std::map m_var_map_short_ulonglong; @@ -880,7 +868,7 @@ class MapShortFloat eProsima_user_DllExport MapShortFloat( const MapShortFloat& x) { - m_var_map_short_float = x.m_var_map_short_float; + m_var_map_short_float = x.m_var_map_short_float; } @@ -902,7 +890,7 @@ class MapShortFloat const MapShortFloat& x) { - m_var_map_short_float = x.m_var_map_short_float; + m_var_map_short_float = x.m_var_map_short_float; return *this; } @@ -977,8 +965,6 @@ class MapShortFloat return m_var_map_short_float; } - - private: std::map m_var_map_short_float; @@ -1013,7 +999,7 @@ class MapShortDouble eProsima_user_DllExport MapShortDouble( const MapShortDouble& x) { - m_var_map_short_double = x.m_var_map_short_double; + m_var_map_short_double = x.m_var_map_short_double; } @@ -1035,7 +1021,7 @@ class MapShortDouble const MapShortDouble& x) { - m_var_map_short_double = x.m_var_map_short_double; + m_var_map_short_double = x.m_var_map_short_double; return *this; } @@ -1110,8 +1096,6 @@ class MapShortDouble return m_var_map_short_double; } - - private: std::map m_var_map_short_double; @@ -1146,7 +1130,7 @@ class MapShortLongDouble eProsima_user_DllExport MapShortLongDouble( const MapShortLongDouble& x) { - m_var_map_short_longdouble = x.m_var_map_short_longdouble; + m_var_map_short_longdouble = x.m_var_map_short_longdouble; } @@ -1168,7 +1152,7 @@ class MapShortLongDouble const MapShortLongDouble& x) { - m_var_map_short_longdouble = x.m_var_map_short_longdouble; + m_var_map_short_longdouble = x.m_var_map_short_longdouble; return *this; } @@ -1243,8 +1227,6 @@ class MapShortLongDouble return m_var_map_short_longdouble; } - - private: std::map m_var_map_short_longdouble; @@ -1279,7 +1261,7 @@ class MapShortBoolean eProsima_user_DllExport MapShortBoolean( const MapShortBoolean& x) { - m_var_map_short_boolean = x.m_var_map_short_boolean; + m_var_map_short_boolean = x.m_var_map_short_boolean; } @@ -1301,7 +1283,7 @@ class MapShortBoolean const MapShortBoolean& x) { - m_var_map_short_boolean = x.m_var_map_short_boolean; + m_var_map_short_boolean = x.m_var_map_short_boolean; return *this; } @@ -1376,8 +1358,6 @@ class MapShortBoolean return m_var_map_short_boolean; } - - private: std::map m_var_map_short_boolean; @@ -1412,7 +1392,7 @@ class MapShortOctet eProsima_user_DllExport MapShortOctet( const MapShortOctet& x) { - m_var_map_short_octet = x.m_var_map_short_octet; + m_var_map_short_octet = x.m_var_map_short_octet; } @@ -1434,7 +1414,7 @@ class MapShortOctet const MapShortOctet& x) { - m_var_map_short_octet = x.m_var_map_short_octet; + m_var_map_short_octet = x.m_var_map_short_octet; return *this; } @@ -1509,8 +1489,6 @@ class MapShortOctet return m_var_map_short_octet; } - - private: std::map m_var_map_short_octet; @@ -1545,7 +1523,7 @@ class MapShortChar eProsima_user_DllExport MapShortChar( const MapShortChar& x) { - m_var_map_short_char = x.m_var_map_short_char; + m_var_map_short_char = x.m_var_map_short_char; } @@ -1567,7 +1545,7 @@ class MapShortChar const MapShortChar& x) { - m_var_map_short_char = x.m_var_map_short_char; + m_var_map_short_char = x.m_var_map_short_char; return *this; } @@ -1642,8 +1620,6 @@ class MapShortChar return m_var_map_short_char; } - - private: std::map m_var_map_short_char; @@ -1678,7 +1654,7 @@ class MapShortWChar eProsima_user_DllExport MapShortWChar( const MapShortWChar& x) { - m_var_map_short_wchar = x.m_var_map_short_wchar; + m_var_map_short_wchar = x.m_var_map_short_wchar; } @@ -1700,7 +1676,7 @@ class MapShortWChar const MapShortWChar& x) { - m_var_map_short_wchar = x.m_var_map_short_wchar; + m_var_map_short_wchar = x.m_var_map_short_wchar; return *this; } @@ -1775,8 +1751,6 @@ class MapShortWChar return m_var_map_short_wchar; } - - private: std::map m_var_map_short_wchar; @@ -1811,7 +1785,7 @@ class MapShortString eProsima_user_DllExport MapShortString( const MapShortString& x) { - m_var_map_short_string = x.m_var_map_short_string; + m_var_map_short_string = x.m_var_map_short_string; } @@ -1833,7 +1807,7 @@ class MapShortString const MapShortString& x) { - m_var_map_short_string = x.m_var_map_short_string; + m_var_map_short_string = x.m_var_map_short_string; return *this; } @@ -1908,8 +1882,6 @@ class MapShortString return m_var_map_short_string; } - - private: std::map m_var_map_short_string; @@ -1944,7 +1916,7 @@ class MapShortWString eProsima_user_DllExport MapShortWString( const MapShortWString& x) { - m_var_map_short_wstring = x.m_var_map_short_wstring; + m_var_map_short_wstring = x.m_var_map_short_wstring; } @@ -1966,7 +1938,7 @@ class MapShortWString const MapShortWString& x) { - m_var_map_short_wstring = x.m_var_map_short_wstring; + m_var_map_short_wstring = x.m_var_map_short_wstring; return *this; } @@ -2041,8 +2013,6 @@ class MapShortWString return m_var_map_short_wstring; } - - private: std::map m_var_map_short_wstring; @@ -2077,7 +2047,7 @@ class MapShortInnerAliasBoundedStringHelper eProsima_user_DllExport MapShortInnerAliasBoundedStringHelper( const MapShortInnerAliasBoundedStringHelper& x) { - m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; + m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; } @@ -2099,7 +2069,7 @@ class MapShortInnerAliasBoundedStringHelper const MapShortInnerAliasBoundedStringHelper& x) { - m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; + m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; return *this; } @@ -2160,7 +2130,8 @@ class MapShortInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_short_inneraliasboundedstringhelper * @return Constant reference to member var_map_short_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedstringhelper() const { return m_var_map_short_inneraliasboundedstringhelper; } @@ -2169,13 +2140,12 @@ class MapShortInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_short_inneraliasboundedstringhelper * @return Reference to member var_map_short_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_short_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_short_inneraliasboundedstringhelper() { return m_var_map_short_inneraliasboundedstringhelper; } - - private: std::map m_var_map_short_inneraliasboundedstringhelper; @@ -2210,7 +2180,7 @@ class MapShortInnerAliasBoundedWStringHelper eProsima_user_DllExport MapShortInnerAliasBoundedWStringHelper( const MapShortInnerAliasBoundedWStringHelper& x) { - m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; + m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; } @@ -2232,7 +2202,7 @@ class MapShortInnerAliasBoundedWStringHelper const MapShortInnerAliasBoundedWStringHelper& x) { - m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; + m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; return *this; } @@ -2293,7 +2263,8 @@ class MapShortInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_short_inneraliasboundedwstringhelper * @return Constant reference to member var_map_short_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedwstringhelper() const { return m_var_map_short_inneraliasboundedwstringhelper; } @@ -2302,13 +2273,12 @@ class MapShortInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_short_inneraliasboundedwstringhelper * @return Reference to member var_map_short_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_short_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_short_inneraliasboundedwstringhelper() { return m_var_map_short_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_short_inneraliasboundedwstringhelper; @@ -2343,7 +2313,7 @@ class MapShortInnerEnumHelper eProsima_user_DllExport MapShortInnerEnumHelper( const MapShortInnerEnumHelper& x) { - m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; + m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; } @@ -2365,7 +2335,7 @@ class MapShortInnerEnumHelper const MapShortInnerEnumHelper& x) { - m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; + m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; return *this; } @@ -2440,8 +2410,6 @@ class MapShortInnerEnumHelper return m_var_map_short_innerenumhelper; } - - private: std::map m_var_map_short_innerenumhelper; @@ -2476,7 +2444,7 @@ class MapShortInnerBitMaskHelper eProsima_user_DllExport MapShortInnerBitMaskHelper( const MapShortInnerBitMaskHelper& x) { - m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; + m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; } @@ -2498,7 +2466,7 @@ class MapShortInnerBitMaskHelper const MapShortInnerBitMaskHelper& x) { - m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; + m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; return *this; } @@ -2573,8 +2541,6 @@ class MapShortInnerBitMaskHelper return m_var_map_short_innerbitmaskhelper; } - - private: std::map m_var_map_short_innerbitmaskhelper; @@ -2609,7 +2575,7 @@ class MapShortInnerAliasHelper eProsima_user_DllExport MapShortInnerAliasHelper( const MapShortInnerAliasHelper& x) { - m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; + m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; } @@ -2631,7 +2597,7 @@ class MapShortInnerAliasHelper const MapShortInnerAliasHelper& x) { - m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; + m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; return *this; } @@ -2706,8 +2672,6 @@ class MapShortInnerAliasHelper return m_var_map_short_inneraliashelper; } - - private: std::map m_var_map_short_inneraliashelper; @@ -2742,7 +2706,7 @@ class MapShortInnerAliasArrayHelper eProsima_user_DllExport MapShortInnerAliasArrayHelper( const MapShortInnerAliasArrayHelper& x) { - m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; + m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; } @@ -2764,7 +2728,7 @@ class MapShortInnerAliasArrayHelper const MapShortInnerAliasArrayHelper& x) { - m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; + m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; return *this; } @@ -2825,7 +2789,8 @@ class MapShortInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_short_inneraliasarrayhelper * @return Constant reference to member var_map_short_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasarrayhelper() const { return m_var_map_short_inneraliasarrayhelper; } @@ -2839,8 +2804,6 @@ class MapShortInnerAliasArrayHelper return m_var_map_short_inneraliasarrayhelper; } - - private: std::map m_var_map_short_inneraliasarrayhelper; @@ -2875,7 +2838,7 @@ class MapShortInnerAliasSequenceHelper eProsima_user_DllExport MapShortInnerAliasSequenceHelper( const MapShortInnerAliasSequenceHelper& x) { - m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; + m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; } @@ -2897,7 +2860,7 @@ class MapShortInnerAliasSequenceHelper const MapShortInnerAliasSequenceHelper& x) { - m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; + m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; return *this; } @@ -2958,7 +2921,8 @@ class MapShortInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_short_inneraliassequencehelper * @return Constant reference to member var_map_short_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliassequencehelper() const { return m_var_map_short_inneraliassequencehelper; } @@ -2972,8 +2936,6 @@ class MapShortInnerAliasSequenceHelper return m_var_map_short_inneraliassequencehelper; } - - private: std::map m_var_map_short_inneraliassequencehelper; @@ -3008,7 +2970,7 @@ class MapShortInnerAliasMapHelper eProsima_user_DllExport MapShortInnerAliasMapHelper( const MapShortInnerAliasMapHelper& x) { - m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; + m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; } @@ -3030,7 +2992,7 @@ class MapShortInnerAliasMapHelper const MapShortInnerAliasMapHelper& x) { - m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; + m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; return *this; } @@ -3105,8 +3067,6 @@ class MapShortInnerAliasMapHelper return m_var_map_short_inneraliasmaphelper; } - - private: std::map m_var_map_short_inneraliasmaphelper; @@ -3141,7 +3101,7 @@ class MapShortInnerUnionHelper eProsima_user_DllExport MapShortInnerUnionHelper( const MapShortInnerUnionHelper& x) { - m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; + m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; } @@ -3163,7 +3123,7 @@ class MapShortInnerUnionHelper const MapShortInnerUnionHelper& x) { - m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; + m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; return *this; } @@ -3238,8 +3198,6 @@ class MapShortInnerUnionHelper return m_var_map_short_innerunionhelper; } - - private: std::map m_var_map_short_innerunionhelper; @@ -3274,7 +3232,7 @@ class MapShortInnerStructureHelper eProsima_user_DllExport MapShortInnerStructureHelper( const MapShortInnerStructureHelper& x) { - m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; + m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; } @@ -3296,7 +3254,7 @@ class MapShortInnerStructureHelper const MapShortInnerStructureHelper& x) { - m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; + m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; return *this; } @@ -3371,8 +3329,6 @@ class MapShortInnerStructureHelper return m_var_map_short_innerstructurehelper; } - - private: std::map m_var_map_short_innerstructurehelper; @@ -3407,7 +3363,7 @@ class MapShortInnerBitsetHelper eProsima_user_DllExport MapShortInnerBitsetHelper( const MapShortInnerBitsetHelper& x) { - m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; + m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; } @@ -3429,7 +3385,7 @@ class MapShortInnerBitsetHelper const MapShortInnerBitsetHelper& x) { - m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; + m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; return *this; } @@ -3504,8 +3460,6 @@ class MapShortInnerBitsetHelper return m_var_map_short_innerbitsethelper; } - - private: std::map m_var_map_short_innerbitsethelper; @@ -3540,7 +3494,7 @@ class MapUShortShort eProsima_user_DllExport MapUShortShort( const MapUShortShort& x) { - m_var_map_ushort_short = x.m_var_map_ushort_short; + m_var_map_ushort_short = x.m_var_map_ushort_short; } @@ -3562,7 +3516,7 @@ class MapUShortShort const MapUShortShort& x) { - m_var_map_ushort_short = x.m_var_map_ushort_short; + m_var_map_ushort_short = x.m_var_map_ushort_short; return *this; } @@ -3637,8 +3591,6 @@ class MapUShortShort return m_var_map_ushort_short; } - - private: std::map m_var_map_ushort_short; @@ -3673,7 +3625,7 @@ class MapUShortUShort eProsima_user_DllExport MapUShortUShort( const MapUShortUShort& x) { - m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; + m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; } @@ -3695,7 +3647,7 @@ class MapUShortUShort const MapUShortUShort& x) { - m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; + m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; return *this; } @@ -3770,8 +3722,6 @@ class MapUShortUShort return m_var_map_ushort_ushort; } - - private: std::map m_var_map_ushort_ushort; @@ -3806,7 +3756,7 @@ class MapUShortLong eProsima_user_DllExport MapUShortLong( const MapUShortLong& x) { - m_var_map_ushort_long = x.m_var_map_ushort_long; + m_var_map_ushort_long = x.m_var_map_ushort_long; } @@ -3828,7 +3778,7 @@ class MapUShortLong const MapUShortLong& x) { - m_var_map_ushort_long = x.m_var_map_ushort_long; + m_var_map_ushort_long = x.m_var_map_ushort_long; return *this; } @@ -3903,8 +3853,6 @@ class MapUShortLong return m_var_map_ushort_long; } - - private: std::map m_var_map_ushort_long; @@ -3939,7 +3887,7 @@ class MapUShortULong eProsima_user_DllExport MapUShortULong( const MapUShortULong& x) { - m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; + m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; } @@ -3961,7 +3909,7 @@ class MapUShortULong const MapUShortULong& x) { - m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; + m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; return *this; } @@ -4036,8 +3984,6 @@ class MapUShortULong return m_var_map_ushort_ulong; } - - private: std::map m_var_map_ushort_ulong; @@ -4072,7 +4018,7 @@ class MapUShortLongLong eProsima_user_DllExport MapUShortLongLong( const MapUShortLongLong& x) { - m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; + m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; } @@ -4094,7 +4040,7 @@ class MapUShortLongLong const MapUShortLongLong& x) { - m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; + m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; return *this; } @@ -4169,8 +4115,6 @@ class MapUShortLongLong return m_var_map_ushort_longlong; } - - private: std::map m_var_map_ushort_longlong; @@ -4205,7 +4149,7 @@ class MapUShortULongLong eProsima_user_DllExport MapUShortULongLong( const MapUShortULongLong& x) { - m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; + m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; } @@ -4227,7 +4171,7 @@ class MapUShortULongLong const MapUShortULongLong& x) { - m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; + m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; return *this; } @@ -4302,8 +4246,6 @@ class MapUShortULongLong return m_var_map_ushort_ulonglong; } - - private: std::map m_var_map_ushort_ulonglong; @@ -4338,7 +4280,7 @@ class MapUShortFloat eProsima_user_DllExport MapUShortFloat( const MapUShortFloat& x) { - m_var_map_ushort_float = x.m_var_map_ushort_float; + m_var_map_ushort_float = x.m_var_map_ushort_float; } @@ -4360,7 +4302,7 @@ class MapUShortFloat const MapUShortFloat& x) { - m_var_map_ushort_float = x.m_var_map_ushort_float; + m_var_map_ushort_float = x.m_var_map_ushort_float; return *this; } @@ -4435,8 +4377,6 @@ class MapUShortFloat return m_var_map_ushort_float; } - - private: std::map m_var_map_ushort_float; @@ -4471,7 +4411,7 @@ class MapUShortDouble eProsima_user_DllExport MapUShortDouble( const MapUShortDouble& x) { - m_var_map_ushort_double = x.m_var_map_ushort_double; + m_var_map_ushort_double = x.m_var_map_ushort_double; } @@ -4493,7 +4433,7 @@ class MapUShortDouble const MapUShortDouble& x) { - m_var_map_ushort_double = x.m_var_map_ushort_double; + m_var_map_ushort_double = x.m_var_map_ushort_double; return *this; } @@ -4568,8 +4508,6 @@ class MapUShortDouble return m_var_map_ushort_double; } - - private: std::map m_var_map_ushort_double; @@ -4604,7 +4542,7 @@ class MapUShortLongDouble eProsima_user_DllExport MapUShortLongDouble( const MapUShortLongDouble& x) { - m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; + m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; } @@ -4626,7 +4564,7 @@ class MapUShortLongDouble const MapUShortLongDouble& x) { - m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; + m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; return *this; } @@ -4701,8 +4639,6 @@ class MapUShortLongDouble return m_var_map_ushort_longdouble; } - - private: std::map m_var_map_ushort_longdouble; @@ -4737,7 +4673,7 @@ class MapUShortBoolean eProsima_user_DllExport MapUShortBoolean( const MapUShortBoolean& x) { - m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; + m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; } @@ -4759,7 +4695,7 @@ class MapUShortBoolean const MapUShortBoolean& x) { - m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; + m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; return *this; } @@ -4834,8 +4770,6 @@ class MapUShortBoolean return m_var_map_ushort_boolean; } - - private: std::map m_var_map_ushort_boolean; @@ -4870,7 +4804,7 @@ class MapUShortOctet eProsima_user_DllExport MapUShortOctet( const MapUShortOctet& x) { - m_var_map_ushort_octet = x.m_var_map_ushort_octet; + m_var_map_ushort_octet = x.m_var_map_ushort_octet; } @@ -4892,7 +4826,7 @@ class MapUShortOctet const MapUShortOctet& x) { - m_var_map_ushort_octet = x.m_var_map_ushort_octet; + m_var_map_ushort_octet = x.m_var_map_ushort_octet; return *this; } @@ -4967,8 +4901,6 @@ class MapUShortOctet return m_var_map_ushort_octet; } - - private: std::map m_var_map_ushort_octet; @@ -5003,7 +4935,7 @@ class MapUShortChar eProsima_user_DllExport MapUShortChar( const MapUShortChar& x) { - m_var_map_ushort_char = x.m_var_map_ushort_char; + m_var_map_ushort_char = x.m_var_map_ushort_char; } @@ -5025,7 +4957,7 @@ class MapUShortChar const MapUShortChar& x) { - m_var_map_ushort_char = x.m_var_map_ushort_char; + m_var_map_ushort_char = x.m_var_map_ushort_char; return *this; } @@ -5100,8 +5032,6 @@ class MapUShortChar return m_var_map_ushort_char; } - - private: std::map m_var_map_ushort_char; @@ -5136,7 +5066,7 @@ class MapUShortWChar eProsima_user_DllExport MapUShortWChar( const MapUShortWChar& x) { - m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; + m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; } @@ -5158,7 +5088,7 @@ class MapUShortWChar const MapUShortWChar& x) { - m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; + m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; return *this; } @@ -5233,8 +5163,6 @@ class MapUShortWChar return m_var_map_ushort_wchar; } - - private: std::map m_var_map_ushort_wchar; @@ -5269,7 +5197,7 @@ class MapUShortString eProsima_user_DllExport MapUShortString( const MapUShortString& x) { - m_var_map_ushort_string = x.m_var_map_ushort_string; + m_var_map_ushort_string = x.m_var_map_ushort_string; } @@ -5291,7 +5219,7 @@ class MapUShortString const MapUShortString& x) { - m_var_map_ushort_string = x.m_var_map_ushort_string; + m_var_map_ushort_string = x.m_var_map_ushort_string; return *this; } @@ -5366,8 +5294,6 @@ class MapUShortString return m_var_map_ushort_string; } - - private: std::map m_var_map_ushort_string; @@ -5402,7 +5328,7 @@ class MapUShortWString eProsima_user_DllExport MapUShortWString( const MapUShortWString& x) { - m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; + m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; } @@ -5424,7 +5350,7 @@ class MapUShortWString const MapUShortWString& x) { - m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; + m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; return *this; } @@ -5499,8 +5425,6 @@ class MapUShortWString return m_var_map_ushort_wstring; } - - private: std::map m_var_map_ushort_wstring; @@ -5535,7 +5459,7 @@ class MapUShortInnerAliasBoundedStringHelper eProsima_user_DllExport MapUShortInnerAliasBoundedStringHelper( const MapUShortInnerAliasBoundedStringHelper& x) { - m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; + m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; } @@ -5557,7 +5481,7 @@ class MapUShortInnerAliasBoundedStringHelper const MapUShortInnerAliasBoundedStringHelper& x) { - m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; + m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; return *this; } @@ -5618,7 +5542,8 @@ class MapUShortInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasboundedstringhelper * @return Constant reference to member var_map_ushort_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedstringhelper() const { return m_var_map_ushort_inneraliasboundedstringhelper; } @@ -5627,13 +5552,12 @@ class MapUShortInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_ushort_inneraliasboundedstringhelper * @return Reference to member var_map_ushort_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedstringhelper() { return m_var_map_ushort_inneraliasboundedstringhelper; } - - private: std::map m_var_map_ushort_inneraliasboundedstringhelper; @@ -5668,7 +5592,7 @@ class MapUShortInnerAliasBoundedWStringHelper eProsima_user_DllExport MapUShortInnerAliasBoundedWStringHelper( const MapUShortInnerAliasBoundedWStringHelper& x) { - m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; + m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; } @@ -5690,7 +5614,7 @@ class MapUShortInnerAliasBoundedWStringHelper const MapUShortInnerAliasBoundedWStringHelper& x) { - m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; + m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; return *this; } @@ -5732,7 +5656,8 @@ class MapUShortInnerAliasBoundedWStringHelper * @param _var_map_ushort_inneraliasboundedwstringhelper New value to be copied in member var_map_ushort_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_ushort_inneraliasboundedwstringhelper( - const std::map& _var_map_ushort_inneraliasboundedwstringhelper) + const std::map& _var_map_ushort_inneraliasboundedwstringhelper) { m_var_map_ushort_inneraliasboundedwstringhelper = _var_map_ushort_inneraliasboundedwstringhelper; } @@ -5751,7 +5676,8 @@ class MapUShortInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasboundedwstringhelper * @return Constant reference to member var_map_ushort_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedwstringhelper() const { return m_var_map_ushort_inneraliasboundedwstringhelper; } @@ -5760,13 +5686,12 @@ class MapUShortInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_ushort_inneraliasboundedwstringhelper * @return Reference to member var_map_ushort_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedwstringhelper() { return m_var_map_ushort_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_ushort_inneraliasboundedwstringhelper; @@ -5801,7 +5726,7 @@ class MapUShortInnerEnumHelper eProsima_user_DllExport MapUShortInnerEnumHelper( const MapUShortInnerEnumHelper& x) { - m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; + m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; } @@ -5823,7 +5748,7 @@ class MapUShortInnerEnumHelper const MapUShortInnerEnumHelper& x) { - m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; + m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; return *this; } @@ -5898,8 +5823,6 @@ class MapUShortInnerEnumHelper return m_var_map_ushort_innerenumhelper; } - - private: std::map m_var_map_ushort_innerenumhelper; @@ -5934,7 +5857,7 @@ class MapUShortInnerBitMaskHelper eProsima_user_DllExport MapUShortInnerBitMaskHelper( const MapUShortInnerBitMaskHelper& x) { - m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; + m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; } @@ -5956,7 +5879,7 @@ class MapUShortInnerBitMaskHelper const MapUShortInnerBitMaskHelper& x) { - m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; + m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; return *this; } @@ -6031,8 +5954,6 @@ class MapUShortInnerBitMaskHelper return m_var_map_ushort_innerbitmaskhelper; } - - private: std::map m_var_map_ushort_innerbitmaskhelper; @@ -6067,7 +5988,7 @@ class MapUShortInnerAliasHelper eProsima_user_DllExport MapUShortInnerAliasHelper( const MapUShortInnerAliasHelper& x) { - m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; + m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; } @@ -6089,7 +6010,7 @@ class MapUShortInnerAliasHelper const MapUShortInnerAliasHelper& x) { - m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; + m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; return *this; } @@ -6164,8 +6085,6 @@ class MapUShortInnerAliasHelper return m_var_map_ushort_inneraliashelper; } - - private: std::map m_var_map_ushort_inneraliashelper; @@ -6200,7 +6119,7 @@ class MapUShortInnerAliasArrayHelper eProsima_user_DllExport MapUShortInnerAliasArrayHelper( const MapUShortInnerAliasArrayHelper& x) { - m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; + m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; } @@ -6222,7 +6141,7 @@ class MapUShortInnerAliasArrayHelper const MapUShortInnerAliasArrayHelper& x) { - m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; + m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; return *this; } @@ -6283,7 +6202,8 @@ class MapUShortInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasarrayhelper * @return Constant reference to member var_map_ushort_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasarrayhelper() const { return m_var_map_ushort_inneraliasarrayhelper; } @@ -6297,8 +6217,6 @@ class MapUShortInnerAliasArrayHelper return m_var_map_ushort_inneraliasarrayhelper; } - - private: std::map m_var_map_ushort_inneraliasarrayhelper; @@ -6333,7 +6251,7 @@ class MapUShortInnerAliasSequenceHelper eProsima_user_DllExport MapUShortInnerAliasSequenceHelper( const MapUShortInnerAliasSequenceHelper& x) { - m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; + m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; } @@ -6355,7 +6273,7 @@ class MapUShortInnerAliasSequenceHelper const MapUShortInnerAliasSequenceHelper& x) { - m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; + m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; return *this; } @@ -6416,7 +6334,8 @@ class MapUShortInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliassequencehelper * @return Constant reference to member var_map_ushort_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliassequencehelper() const { return m_var_map_ushort_inneraliassequencehelper; } @@ -6430,8 +6349,6 @@ class MapUShortInnerAliasSequenceHelper return m_var_map_ushort_inneraliassequencehelper; } - - private: std::map m_var_map_ushort_inneraliassequencehelper; @@ -6466,7 +6383,7 @@ class MapUShortInnerAliasMapHelper eProsima_user_DllExport MapUShortInnerAliasMapHelper( const MapUShortInnerAliasMapHelper& x) { - m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; + m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; } @@ -6488,7 +6405,7 @@ class MapUShortInnerAliasMapHelper const MapUShortInnerAliasMapHelper& x) { - m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; + m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; return *this; } @@ -6563,8 +6480,6 @@ class MapUShortInnerAliasMapHelper return m_var_map_ushort_inneraliasmaphelper; } - - private: std::map m_var_map_ushort_inneraliasmaphelper; @@ -6599,7 +6514,7 @@ class MapUShortInnerUnionHelper eProsima_user_DllExport MapUShortInnerUnionHelper( const MapUShortInnerUnionHelper& x) { - m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; + m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; } @@ -6621,7 +6536,7 @@ class MapUShortInnerUnionHelper const MapUShortInnerUnionHelper& x) { - m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; + m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; return *this; } @@ -6696,8 +6611,6 @@ class MapUShortInnerUnionHelper return m_var_map_ushort_innerunionhelper; } - - private: std::map m_var_map_ushort_innerunionhelper; @@ -6732,7 +6645,7 @@ class MapUShortInnerStructureHelper eProsima_user_DllExport MapUShortInnerStructureHelper( const MapUShortInnerStructureHelper& x) { - m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; + m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; } @@ -6754,7 +6667,7 @@ class MapUShortInnerStructureHelper const MapUShortInnerStructureHelper& x) { - m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; + m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; return *this; } @@ -6829,8 +6742,6 @@ class MapUShortInnerStructureHelper return m_var_map_ushort_innerstructurehelper; } - - private: std::map m_var_map_ushort_innerstructurehelper; @@ -6865,7 +6776,7 @@ class MapUShortInnerBitsetHelper eProsima_user_DllExport MapUShortInnerBitsetHelper( const MapUShortInnerBitsetHelper& x) { - m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; + m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; } @@ -6887,7 +6798,7 @@ class MapUShortInnerBitsetHelper const MapUShortInnerBitsetHelper& x) { - m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; + m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; return *this; } @@ -6962,8 +6873,6 @@ class MapUShortInnerBitsetHelper return m_var_map_ushort_innerbitsethelper; } - - private: std::map m_var_map_ushort_innerbitsethelper; @@ -6998,7 +6907,7 @@ class MapLongShort eProsima_user_DllExport MapLongShort( const MapLongShort& x) { - m_var_map_long_short = x.m_var_map_long_short; + m_var_map_long_short = x.m_var_map_long_short; } @@ -7020,7 +6929,7 @@ class MapLongShort const MapLongShort& x) { - m_var_map_long_short = x.m_var_map_long_short; + m_var_map_long_short = x.m_var_map_long_short; return *this; } @@ -7095,8 +7004,6 @@ class MapLongShort return m_var_map_long_short; } - - private: std::map m_var_map_long_short; @@ -7131,7 +7038,7 @@ class MapLongUShort eProsima_user_DllExport MapLongUShort( const MapLongUShort& x) { - m_var_map_long_ushort = x.m_var_map_long_ushort; + m_var_map_long_ushort = x.m_var_map_long_ushort; } @@ -7153,7 +7060,7 @@ class MapLongUShort const MapLongUShort& x) { - m_var_map_long_ushort = x.m_var_map_long_ushort; + m_var_map_long_ushort = x.m_var_map_long_ushort; return *this; } @@ -7228,8 +7135,6 @@ class MapLongUShort return m_var_map_long_ushort; } - - private: std::map m_var_map_long_ushort; @@ -7264,7 +7169,7 @@ class MapLongLong eProsima_user_DllExport MapLongLong( const MapLongLong& x) { - m_var_map_long_long = x.m_var_map_long_long; + m_var_map_long_long = x.m_var_map_long_long; } @@ -7286,7 +7191,7 @@ class MapLongLong const MapLongLong& x) { - m_var_map_long_long = x.m_var_map_long_long; + m_var_map_long_long = x.m_var_map_long_long; return *this; } @@ -7361,8 +7266,6 @@ class MapLongLong return m_var_map_long_long; } - - private: std::map m_var_map_long_long; @@ -7397,7 +7300,7 @@ class MapLongULong eProsima_user_DllExport MapLongULong( const MapLongULong& x) { - m_var_map_long_ulong = x.m_var_map_long_ulong; + m_var_map_long_ulong = x.m_var_map_long_ulong; } @@ -7419,7 +7322,7 @@ class MapLongULong const MapLongULong& x) { - m_var_map_long_ulong = x.m_var_map_long_ulong; + m_var_map_long_ulong = x.m_var_map_long_ulong; return *this; } @@ -7494,8 +7397,6 @@ class MapLongULong return m_var_map_long_ulong; } - - private: std::map m_var_map_long_ulong; @@ -7530,7 +7431,7 @@ class MapLongKeyLongLongValue eProsima_user_DllExport MapLongKeyLongLongValue( const MapLongKeyLongLongValue& x) { - m_var_map_long_longlong = x.m_var_map_long_longlong; + m_var_map_long_longlong = x.m_var_map_long_longlong; } @@ -7552,7 +7453,7 @@ class MapLongKeyLongLongValue const MapLongKeyLongLongValue& x) { - m_var_map_long_longlong = x.m_var_map_long_longlong; + m_var_map_long_longlong = x.m_var_map_long_longlong; return *this; } @@ -7627,8 +7528,6 @@ class MapLongKeyLongLongValue return m_var_map_long_longlong; } - - private: std::map m_var_map_long_longlong; @@ -7663,7 +7562,7 @@ class MapLongULongLong eProsima_user_DllExport MapLongULongLong( const MapLongULongLong& x) { - m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; + m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; } @@ -7685,7 +7584,7 @@ class MapLongULongLong const MapLongULongLong& x) { - m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; + m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; return *this; } @@ -7760,8 +7659,6 @@ class MapLongULongLong return m_var_map_long_ulonglong; } - - private: std::map m_var_map_long_ulonglong; @@ -7796,7 +7693,7 @@ class MapLongFloat eProsima_user_DllExport MapLongFloat( const MapLongFloat& x) { - m_var_map_long_float = x.m_var_map_long_float; + m_var_map_long_float = x.m_var_map_long_float; } @@ -7818,7 +7715,7 @@ class MapLongFloat const MapLongFloat& x) { - m_var_map_long_float = x.m_var_map_long_float; + m_var_map_long_float = x.m_var_map_long_float; return *this; } @@ -7893,8 +7790,6 @@ class MapLongFloat return m_var_map_long_float; } - - private: std::map m_var_map_long_float; @@ -7929,7 +7824,7 @@ class MapLongDouble eProsima_user_DllExport MapLongDouble( const MapLongDouble& x) { - m_var_map_long_double = x.m_var_map_long_double; + m_var_map_long_double = x.m_var_map_long_double; } @@ -7951,7 +7846,7 @@ class MapLongDouble const MapLongDouble& x) { - m_var_map_long_double = x.m_var_map_long_double; + m_var_map_long_double = x.m_var_map_long_double; return *this; } @@ -8026,8 +7921,6 @@ class MapLongDouble return m_var_map_long_double; } - - private: std::map m_var_map_long_double; @@ -8062,7 +7955,7 @@ class MapLongKeyLongDoubleValue eProsima_user_DllExport MapLongKeyLongDoubleValue( const MapLongKeyLongDoubleValue& x) { - m_var_map_long_longdouble = x.m_var_map_long_longdouble; + m_var_map_long_longdouble = x.m_var_map_long_longdouble; } @@ -8084,7 +7977,7 @@ class MapLongKeyLongDoubleValue const MapLongKeyLongDoubleValue& x) { - m_var_map_long_longdouble = x.m_var_map_long_longdouble; + m_var_map_long_longdouble = x.m_var_map_long_longdouble; return *this; } @@ -8159,8 +8052,6 @@ class MapLongKeyLongDoubleValue return m_var_map_long_longdouble; } - - private: std::map m_var_map_long_longdouble; @@ -8195,7 +8086,7 @@ class MapLongBoolean eProsima_user_DllExport MapLongBoolean( const MapLongBoolean& x) { - m_var_map_long_boolean = x.m_var_map_long_boolean; + m_var_map_long_boolean = x.m_var_map_long_boolean; } @@ -8217,7 +8108,7 @@ class MapLongBoolean const MapLongBoolean& x) { - m_var_map_long_boolean = x.m_var_map_long_boolean; + m_var_map_long_boolean = x.m_var_map_long_boolean; return *this; } @@ -8292,8 +8183,6 @@ class MapLongBoolean return m_var_map_long_boolean; } - - private: std::map m_var_map_long_boolean; @@ -8328,7 +8217,7 @@ class MapLongOctet eProsima_user_DllExport MapLongOctet( const MapLongOctet& x) { - m_var_map_long_octet = x.m_var_map_long_octet; + m_var_map_long_octet = x.m_var_map_long_octet; } @@ -8350,7 +8239,7 @@ class MapLongOctet const MapLongOctet& x) { - m_var_map_long_octet = x.m_var_map_long_octet; + m_var_map_long_octet = x.m_var_map_long_octet; return *this; } @@ -8425,8 +8314,6 @@ class MapLongOctet return m_var_map_long_octet; } - - private: std::map m_var_map_long_octet; @@ -8461,7 +8348,7 @@ class MapLongChar eProsima_user_DllExport MapLongChar( const MapLongChar& x) { - m_var_map_long_char = x.m_var_map_long_char; + m_var_map_long_char = x.m_var_map_long_char; } @@ -8483,7 +8370,7 @@ class MapLongChar const MapLongChar& x) { - m_var_map_long_char = x.m_var_map_long_char; + m_var_map_long_char = x.m_var_map_long_char; return *this; } @@ -8558,8 +8445,6 @@ class MapLongChar return m_var_map_long_char; } - - private: std::map m_var_map_long_char; @@ -8594,7 +8479,7 @@ class MapLongWChar eProsima_user_DllExport MapLongWChar( const MapLongWChar& x) { - m_var_map_long_wchar = x.m_var_map_long_wchar; + m_var_map_long_wchar = x.m_var_map_long_wchar; } @@ -8616,7 +8501,7 @@ class MapLongWChar const MapLongWChar& x) { - m_var_map_long_wchar = x.m_var_map_long_wchar; + m_var_map_long_wchar = x.m_var_map_long_wchar; return *this; } @@ -8691,8 +8576,6 @@ class MapLongWChar return m_var_map_long_wchar; } - - private: std::map m_var_map_long_wchar; @@ -8727,7 +8610,7 @@ class MapLongString eProsima_user_DllExport MapLongString( const MapLongString& x) { - m_var_map_long_string = x.m_var_map_long_string; + m_var_map_long_string = x.m_var_map_long_string; } @@ -8749,7 +8632,7 @@ class MapLongString const MapLongString& x) { - m_var_map_long_string = x.m_var_map_long_string; + m_var_map_long_string = x.m_var_map_long_string; return *this; } @@ -8824,8 +8707,6 @@ class MapLongString return m_var_map_long_string; } - - private: std::map m_var_map_long_string; @@ -8860,7 +8741,7 @@ class MapLongWString eProsima_user_DllExport MapLongWString( const MapLongWString& x) { - m_var_map_long_wstring = x.m_var_map_long_wstring; + m_var_map_long_wstring = x.m_var_map_long_wstring; } @@ -8882,7 +8763,7 @@ class MapLongWString const MapLongWString& x) { - m_var_map_long_wstring = x.m_var_map_long_wstring; + m_var_map_long_wstring = x.m_var_map_long_wstring; return *this; } @@ -8957,8 +8838,6 @@ class MapLongWString return m_var_map_long_wstring; } - - private: std::map m_var_map_long_wstring; @@ -8993,7 +8872,7 @@ class MapLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongInnerAliasBoundedStringHelper( const MapLongInnerAliasBoundedStringHelper& x) { - m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; + m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; } @@ -9015,7 +8894,7 @@ class MapLongInnerAliasBoundedStringHelper const MapLongInnerAliasBoundedStringHelper& x) { - m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; + m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; return *this; } @@ -9076,7 +8955,8 @@ class MapLongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_long_inneraliasboundedstringhelper * @return Constant reference to member var_map_long_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedstringhelper() const { return m_var_map_long_inneraliasboundedstringhelper; } @@ -9085,13 +8965,12 @@ class MapLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_long_inneraliasboundedstringhelper * @return Reference to member var_map_long_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_long_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_long_inneraliasboundedstringhelper() { return m_var_map_long_inneraliasboundedstringhelper; } - - private: std::map m_var_map_long_inneraliasboundedstringhelper; @@ -9126,7 +9005,7 @@ class MapLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongInnerAliasBoundedWStringHelper( const MapLongInnerAliasBoundedWStringHelper& x) { - m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; + m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; } @@ -9148,7 +9027,7 @@ class MapLongInnerAliasBoundedWStringHelper const MapLongInnerAliasBoundedWStringHelper& x) { - m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; + m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; return *this; } @@ -9209,7 +9088,8 @@ class MapLongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_long_inneraliasboundedwstringhelper * @return Constant reference to member var_map_long_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedwstringhelper() const { return m_var_map_long_inneraliasboundedwstringhelper; } @@ -9218,13 +9098,12 @@ class MapLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_long_inneraliasboundedwstringhelper * @return Reference to member var_map_long_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_long_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_long_inneraliasboundedwstringhelper() { return m_var_map_long_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_long_inneraliasboundedwstringhelper; @@ -9259,7 +9138,7 @@ class MapLongInnerEnumHelper eProsima_user_DllExport MapLongInnerEnumHelper( const MapLongInnerEnumHelper& x) { - m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; + m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; } @@ -9281,7 +9160,7 @@ class MapLongInnerEnumHelper const MapLongInnerEnumHelper& x) { - m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; + m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; return *this; } @@ -9356,8 +9235,6 @@ class MapLongInnerEnumHelper return m_var_map_long_innerenumhelper; } - - private: std::map m_var_map_long_innerenumhelper; @@ -9392,7 +9269,7 @@ class MapLongInnerBitMaskHelper eProsima_user_DllExport MapLongInnerBitMaskHelper( const MapLongInnerBitMaskHelper& x) { - m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; + m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; } @@ -9414,7 +9291,7 @@ class MapLongInnerBitMaskHelper const MapLongInnerBitMaskHelper& x) { - m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; + m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; return *this; } @@ -9489,8 +9366,6 @@ class MapLongInnerBitMaskHelper return m_var_map_long_innerbitmaskhelper; } - - private: std::map m_var_map_long_innerbitmaskhelper; @@ -9525,7 +9400,7 @@ class MapLongInnerAliasHelper eProsima_user_DllExport MapLongInnerAliasHelper( const MapLongInnerAliasHelper& x) { - m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; + m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; } @@ -9547,7 +9422,7 @@ class MapLongInnerAliasHelper const MapLongInnerAliasHelper& x) { - m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; + m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; return *this; } @@ -9622,8 +9497,6 @@ class MapLongInnerAliasHelper return m_var_map_long_inneraliashelper; } - - private: std::map m_var_map_long_inneraliashelper; @@ -9658,7 +9531,7 @@ class MapLongInnerAliasArrayHelper eProsima_user_DllExport MapLongInnerAliasArrayHelper( const MapLongInnerAliasArrayHelper& x) { - m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; + m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; } @@ -9680,7 +9553,7 @@ class MapLongInnerAliasArrayHelper const MapLongInnerAliasArrayHelper& x) { - m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; + m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; return *this; } @@ -9741,7 +9614,8 @@ class MapLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_long_inneraliasarrayhelper * @return Constant reference to member var_map_long_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasarrayhelper() const { return m_var_map_long_inneraliasarrayhelper; } @@ -9755,8 +9629,6 @@ class MapLongInnerAliasArrayHelper return m_var_map_long_inneraliasarrayhelper; } - - private: std::map m_var_map_long_inneraliasarrayhelper; @@ -9791,7 +9663,7 @@ class MapLongInnerAliasSequenceHelper eProsima_user_DllExport MapLongInnerAliasSequenceHelper( const MapLongInnerAliasSequenceHelper& x) { - m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; + m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; } @@ -9813,7 +9685,7 @@ class MapLongInnerAliasSequenceHelper const MapLongInnerAliasSequenceHelper& x) { - m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; + m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; return *this; } @@ -9874,7 +9746,8 @@ class MapLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_long_inneraliassequencehelper * @return Constant reference to member var_map_long_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliassequencehelper() const { return m_var_map_long_inneraliassequencehelper; } @@ -9888,8 +9761,6 @@ class MapLongInnerAliasSequenceHelper return m_var_map_long_inneraliassequencehelper; } - - private: std::map m_var_map_long_inneraliassequencehelper; @@ -9924,7 +9795,7 @@ class MapLongInnerAliasMapHelper eProsima_user_DllExport MapLongInnerAliasMapHelper( const MapLongInnerAliasMapHelper& x) { - m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; + m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; } @@ -9946,7 +9817,7 @@ class MapLongInnerAliasMapHelper const MapLongInnerAliasMapHelper& x) { - m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; + m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; return *this; } @@ -10021,8 +9892,6 @@ class MapLongInnerAliasMapHelper return m_var_map_long_inneraliasmaphelper; } - - private: std::map m_var_map_long_inneraliasmaphelper; @@ -10057,7 +9926,7 @@ class MapLongInnerUnionHelper eProsima_user_DllExport MapLongInnerUnionHelper( const MapLongInnerUnionHelper& x) { - m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; + m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; } @@ -10079,7 +9948,7 @@ class MapLongInnerUnionHelper const MapLongInnerUnionHelper& x) { - m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; + m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; return *this; } @@ -10154,8 +10023,6 @@ class MapLongInnerUnionHelper return m_var_map_long_innerunionhelper; } - - private: std::map m_var_map_long_innerunionhelper; @@ -10190,7 +10057,7 @@ class MapLongInnerStructureHelper eProsima_user_DllExport MapLongInnerStructureHelper( const MapLongInnerStructureHelper& x) { - m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; + m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; } @@ -10212,7 +10079,7 @@ class MapLongInnerStructureHelper const MapLongInnerStructureHelper& x) { - m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; + m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; return *this; } @@ -10287,8 +10154,6 @@ class MapLongInnerStructureHelper return m_var_map_long_innerstructurehelper; } - - private: std::map m_var_map_long_innerstructurehelper; @@ -10323,7 +10188,7 @@ class MapLongInnerBitsetHelper eProsima_user_DllExport MapLongInnerBitsetHelper( const MapLongInnerBitsetHelper& x) { - m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; + m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; } @@ -10345,7 +10210,7 @@ class MapLongInnerBitsetHelper const MapLongInnerBitsetHelper& x) { - m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; + m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; return *this; } @@ -10420,8 +10285,6 @@ class MapLongInnerBitsetHelper return m_var_map_long_innerbitsethelper; } - - private: std::map m_var_map_long_innerbitsethelper; @@ -10456,7 +10319,7 @@ class MapULongShort eProsima_user_DllExport MapULongShort( const MapULongShort& x) { - m_var_map_ulong_short = x.m_var_map_ulong_short; + m_var_map_ulong_short = x.m_var_map_ulong_short; } @@ -10478,7 +10341,7 @@ class MapULongShort const MapULongShort& x) { - m_var_map_ulong_short = x.m_var_map_ulong_short; + m_var_map_ulong_short = x.m_var_map_ulong_short; return *this; } @@ -10553,8 +10416,6 @@ class MapULongShort return m_var_map_ulong_short; } - - private: std::map m_var_map_ulong_short; @@ -10589,7 +10450,7 @@ class MapULongUShort eProsima_user_DllExport MapULongUShort( const MapULongUShort& x) { - m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; + m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; } @@ -10611,7 +10472,7 @@ class MapULongUShort const MapULongUShort& x) { - m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; + m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; return *this; } @@ -10686,8 +10547,6 @@ class MapULongUShort return m_var_map_ulong_ushort; } - - private: std::map m_var_map_ulong_ushort; @@ -10722,7 +10581,7 @@ class MapULongLong eProsima_user_DllExport MapULongLong( const MapULongLong& x) { - m_var_map_ulong_long = x.m_var_map_ulong_long; + m_var_map_ulong_long = x.m_var_map_ulong_long; } @@ -10744,7 +10603,7 @@ class MapULongLong const MapULongLong& x) { - m_var_map_ulong_long = x.m_var_map_ulong_long; + m_var_map_ulong_long = x.m_var_map_ulong_long; return *this; } @@ -10819,8 +10678,6 @@ class MapULongLong return m_var_map_ulong_long; } - - private: std::map m_var_map_ulong_long; @@ -10855,7 +10712,7 @@ class MapULongULong eProsima_user_DllExport MapULongULong( const MapULongULong& x) { - m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; + m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; } @@ -10877,7 +10734,7 @@ class MapULongULong const MapULongULong& x) { - m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; + m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; return *this; } @@ -10952,8 +10809,6 @@ class MapULongULong return m_var_map_ulong_ulong; } - - private: std::map m_var_map_ulong_ulong; @@ -10988,7 +10843,7 @@ class MapKeyULongValueLongLong eProsima_user_DllExport MapKeyULongValueLongLong( const MapKeyULongValueLongLong& x) { - m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; + m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; } @@ -11010,7 +10865,7 @@ class MapKeyULongValueLongLong const MapKeyULongValueLongLong& x) { - m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; + m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; return *this; } @@ -11085,8 +10940,6 @@ class MapKeyULongValueLongLong return m_var_map_ulong_longlong; } - - private: std::map m_var_map_ulong_longlong; @@ -11121,7 +10974,7 @@ class MapULongULongLong eProsima_user_DllExport MapULongULongLong( const MapULongULongLong& x) { - m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; + m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; } @@ -11143,7 +10996,7 @@ class MapULongULongLong const MapULongULongLong& x) { - m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; + m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; return *this; } @@ -11218,8 +11071,6 @@ class MapULongULongLong return m_var_map_ulong_ulonglong; } - - private: std::map m_var_map_ulong_ulonglong; @@ -11254,7 +11105,7 @@ class MapULongFloat eProsima_user_DllExport MapULongFloat( const MapULongFloat& x) { - m_var_map_ulong_float = x.m_var_map_ulong_float; + m_var_map_ulong_float = x.m_var_map_ulong_float; } @@ -11276,7 +11127,7 @@ class MapULongFloat const MapULongFloat& x) { - m_var_map_ulong_float = x.m_var_map_ulong_float; + m_var_map_ulong_float = x.m_var_map_ulong_float; return *this; } @@ -11351,8 +11202,6 @@ class MapULongFloat return m_var_map_ulong_float; } - - private: std::map m_var_map_ulong_float; @@ -11387,7 +11236,7 @@ class MapULongDouble eProsima_user_DllExport MapULongDouble( const MapULongDouble& x) { - m_var_map_ulong_double = x.m_var_map_ulong_double; + m_var_map_ulong_double = x.m_var_map_ulong_double; } @@ -11409,7 +11258,7 @@ class MapULongDouble const MapULongDouble& x) { - m_var_map_ulong_double = x.m_var_map_ulong_double; + m_var_map_ulong_double = x.m_var_map_ulong_double; return *this; } @@ -11484,8 +11333,6 @@ class MapULongDouble return m_var_map_ulong_double; } - - private: std::map m_var_map_ulong_double; @@ -11520,7 +11367,7 @@ class MapKeyULongValueLongDouble eProsima_user_DllExport MapKeyULongValueLongDouble( const MapKeyULongValueLongDouble& x) { - m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; + m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; } @@ -11542,7 +11389,7 @@ class MapKeyULongValueLongDouble const MapKeyULongValueLongDouble& x) { - m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; + m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; return *this; } @@ -11617,8 +11464,6 @@ class MapKeyULongValueLongDouble return m_var_map_ulong_longdouble; } - - private: std::map m_var_map_ulong_longdouble; @@ -11653,7 +11498,7 @@ class MapULongBoolean eProsima_user_DllExport MapULongBoolean( const MapULongBoolean& x) { - m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; + m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; } @@ -11675,7 +11520,7 @@ class MapULongBoolean const MapULongBoolean& x) { - m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; + m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; return *this; } @@ -11750,8 +11595,6 @@ class MapULongBoolean return m_var_map_ulong_boolean; } - - private: std::map m_var_map_ulong_boolean; @@ -11786,7 +11629,7 @@ class MapULongOctet eProsima_user_DllExport MapULongOctet( const MapULongOctet& x) { - m_var_map_ulong_octet = x.m_var_map_ulong_octet; + m_var_map_ulong_octet = x.m_var_map_ulong_octet; } @@ -11808,7 +11651,7 @@ class MapULongOctet const MapULongOctet& x) { - m_var_map_ulong_octet = x.m_var_map_ulong_octet; + m_var_map_ulong_octet = x.m_var_map_ulong_octet; return *this; } @@ -11883,8 +11726,6 @@ class MapULongOctet return m_var_map_ulong_octet; } - - private: std::map m_var_map_ulong_octet; @@ -11919,7 +11760,7 @@ class MapULongChar eProsima_user_DllExport MapULongChar( const MapULongChar& x) { - m_var_map_ulong_char = x.m_var_map_ulong_char; + m_var_map_ulong_char = x.m_var_map_ulong_char; } @@ -11941,7 +11782,7 @@ class MapULongChar const MapULongChar& x) { - m_var_map_ulong_char = x.m_var_map_ulong_char; + m_var_map_ulong_char = x.m_var_map_ulong_char; return *this; } @@ -12016,8 +11857,6 @@ class MapULongChar return m_var_map_ulong_char; } - - private: std::map m_var_map_ulong_char; @@ -12052,7 +11891,7 @@ class MapULongWChar eProsima_user_DllExport MapULongWChar( const MapULongWChar& x) { - m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; + m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; } @@ -12074,7 +11913,7 @@ class MapULongWChar const MapULongWChar& x) { - m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; + m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; return *this; } @@ -12149,8 +11988,6 @@ class MapULongWChar return m_var_map_ulong_wchar; } - - private: std::map m_var_map_ulong_wchar; @@ -12185,7 +12022,7 @@ class MapULongString eProsima_user_DllExport MapULongString( const MapULongString& x) { - m_var_map_ulong_string = x.m_var_map_ulong_string; + m_var_map_ulong_string = x.m_var_map_ulong_string; } @@ -12207,7 +12044,7 @@ class MapULongString const MapULongString& x) { - m_var_map_ulong_string = x.m_var_map_ulong_string; + m_var_map_ulong_string = x.m_var_map_ulong_string; return *this; } @@ -12282,8 +12119,6 @@ class MapULongString return m_var_map_ulong_string; } - - private: std::map m_var_map_ulong_string; @@ -12318,7 +12153,7 @@ class MapULongWString eProsima_user_DllExport MapULongWString( const MapULongWString& x) { - m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; + m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; } @@ -12340,7 +12175,7 @@ class MapULongWString const MapULongWString& x) { - m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; + m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; return *this; } @@ -12415,8 +12250,6 @@ class MapULongWString return m_var_map_ulong_wstring; } - - private: std::map m_var_map_ulong_wstring; @@ -12451,7 +12284,7 @@ class MapULongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongInnerAliasBoundedStringHelper( const MapULongInnerAliasBoundedStringHelper& x) { - m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; + m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; } @@ -12473,7 +12306,7 @@ class MapULongInnerAliasBoundedStringHelper const MapULongInnerAliasBoundedStringHelper& x) { - m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; + m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; return *this; } @@ -12534,7 +12367,8 @@ class MapULongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasboundedstringhelper * @return Constant reference to member var_map_ulong_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedstringhelper() const { return m_var_map_ulong_inneraliasboundedstringhelper; } @@ -12543,13 +12377,12 @@ class MapULongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_ulong_inneraliasboundedstringhelper * @return Reference to member var_map_ulong_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedstringhelper() { return m_var_map_ulong_inneraliasboundedstringhelper; } - - private: std::map m_var_map_ulong_inneraliasboundedstringhelper; @@ -12584,7 +12417,7 @@ class MapULongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongInnerAliasBoundedWStringHelper( const MapULongInnerAliasBoundedWStringHelper& x) { - m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; + m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; } @@ -12606,7 +12439,7 @@ class MapULongInnerAliasBoundedWStringHelper const MapULongInnerAliasBoundedWStringHelper& x) { - m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; + m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; return *this; } @@ -12667,7 +12500,8 @@ class MapULongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasboundedwstringhelper * @return Constant reference to member var_map_ulong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedwstringhelper() const { return m_var_map_ulong_inneraliasboundedwstringhelper; } @@ -12676,13 +12510,12 @@ class MapULongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_ulong_inneraliasboundedwstringhelper * @return Reference to member var_map_ulong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedwstringhelper() { return m_var_map_ulong_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_ulong_inneraliasboundedwstringhelper; @@ -12717,7 +12550,7 @@ class MapULongInnerEnumHelper eProsima_user_DllExport MapULongInnerEnumHelper( const MapULongInnerEnumHelper& x) { - m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; + m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; } @@ -12739,7 +12572,7 @@ class MapULongInnerEnumHelper const MapULongInnerEnumHelper& x) { - m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; + m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; return *this; } @@ -12814,8 +12647,6 @@ class MapULongInnerEnumHelper return m_var_map_ulong_innerenumhelper; } - - private: std::map m_var_map_ulong_innerenumhelper; @@ -12850,7 +12681,7 @@ class MapULongInnerBitMaskHelper eProsima_user_DllExport MapULongInnerBitMaskHelper( const MapULongInnerBitMaskHelper& x) { - m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; + m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; } @@ -12872,7 +12703,7 @@ class MapULongInnerBitMaskHelper const MapULongInnerBitMaskHelper& x) { - m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; + m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; return *this; } @@ -12947,8 +12778,6 @@ class MapULongInnerBitMaskHelper return m_var_map_ulong_innerbitmaskhelper; } - - private: std::map m_var_map_ulong_innerbitmaskhelper; @@ -12983,7 +12812,7 @@ class MapULongInnerAliasHelper eProsima_user_DllExport MapULongInnerAliasHelper( const MapULongInnerAliasHelper& x) { - m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; + m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; } @@ -13005,7 +12834,7 @@ class MapULongInnerAliasHelper const MapULongInnerAliasHelper& x) { - m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; + m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; return *this; } @@ -13080,8 +12909,6 @@ class MapULongInnerAliasHelper return m_var_map_ulong_inneraliashelper; } - - private: std::map m_var_map_ulong_inneraliashelper; @@ -13116,7 +12943,7 @@ class MapULongInnerAliasArrayHelper eProsima_user_DllExport MapULongInnerAliasArrayHelper( const MapULongInnerAliasArrayHelper& x) { - m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; + m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; } @@ -13138,7 +12965,7 @@ class MapULongInnerAliasArrayHelper const MapULongInnerAliasArrayHelper& x) { - m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; + m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; return *this; } @@ -13199,7 +13026,8 @@ class MapULongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasarrayhelper * @return Constant reference to member var_map_ulong_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasarrayhelper() const { return m_var_map_ulong_inneraliasarrayhelper; } @@ -13213,8 +13041,6 @@ class MapULongInnerAliasArrayHelper return m_var_map_ulong_inneraliasarrayhelper; } - - private: std::map m_var_map_ulong_inneraliasarrayhelper; @@ -13249,7 +13075,7 @@ class MapULongInnerAliasSequenceHelper eProsima_user_DllExport MapULongInnerAliasSequenceHelper( const MapULongInnerAliasSequenceHelper& x) { - m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; + m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; } @@ -13271,7 +13097,7 @@ class MapULongInnerAliasSequenceHelper const MapULongInnerAliasSequenceHelper& x) { - m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; + m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; return *this; } @@ -13332,7 +13158,8 @@ class MapULongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliassequencehelper * @return Constant reference to member var_map_ulong_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliassequencehelper() const { return m_var_map_ulong_inneraliassequencehelper; } @@ -13346,8 +13173,6 @@ class MapULongInnerAliasSequenceHelper return m_var_map_ulong_inneraliassequencehelper; } - - private: std::map m_var_map_ulong_inneraliassequencehelper; @@ -13382,7 +13207,7 @@ class MapULongInnerAliasMapHelper eProsima_user_DllExport MapULongInnerAliasMapHelper( const MapULongInnerAliasMapHelper& x) { - m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; + m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; } @@ -13404,7 +13229,7 @@ class MapULongInnerAliasMapHelper const MapULongInnerAliasMapHelper& x) { - m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; + m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; return *this; } @@ -13479,8 +13304,6 @@ class MapULongInnerAliasMapHelper return m_var_map_ulong_inneraliasmaphelper; } - - private: std::map m_var_map_ulong_inneraliasmaphelper; @@ -13515,7 +13338,7 @@ class MapULongInnerUnionHelper eProsima_user_DllExport MapULongInnerUnionHelper( const MapULongInnerUnionHelper& x) { - m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; + m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; } @@ -13537,7 +13360,7 @@ class MapULongInnerUnionHelper const MapULongInnerUnionHelper& x) { - m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; + m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; return *this; } @@ -13612,8 +13435,6 @@ class MapULongInnerUnionHelper return m_var_map_ulong_innerunionhelper; } - - private: std::map m_var_map_ulong_innerunionhelper; @@ -13648,7 +13469,7 @@ class MapULongInnerStructureHelper eProsima_user_DllExport MapULongInnerStructureHelper( const MapULongInnerStructureHelper& x) { - m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; + m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; } @@ -13670,7 +13491,7 @@ class MapULongInnerStructureHelper const MapULongInnerStructureHelper& x) { - m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; + m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; return *this; } @@ -13745,8 +13566,6 @@ class MapULongInnerStructureHelper return m_var_map_ulong_innerstructurehelper; } - - private: std::map m_var_map_ulong_innerstructurehelper; @@ -13781,7 +13600,7 @@ class MapULongInnerBitsetHelper eProsima_user_DllExport MapULongInnerBitsetHelper( const MapULongInnerBitsetHelper& x) { - m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; + m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; } @@ -13803,7 +13622,7 @@ class MapULongInnerBitsetHelper const MapULongInnerBitsetHelper& x) { - m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; + m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; return *this; } @@ -13878,8 +13697,6 @@ class MapULongInnerBitsetHelper return m_var_map_ulong_innerbitsethelper; } - - private: std::map m_var_map_ulong_innerbitsethelper; @@ -13914,7 +13731,7 @@ class MapLongLongShort eProsima_user_DllExport MapLongLongShort( const MapLongLongShort& x) { - m_var_map_longlong_short = x.m_var_map_longlong_short; + m_var_map_longlong_short = x.m_var_map_longlong_short; } @@ -13936,7 +13753,7 @@ class MapLongLongShort const MapLongLongShort& x) { - m_var_map_longlong_short = x.m_var_map_longlong_short; + m_var_map_longlong_short = x.m_var_map_longlong_short; return *this; } @@ -14011,8 +13828,6 @@ class MapLongLongShort return m_var_map_longlong_short; } - - private: std::map m_var_map_longlong_short; @@ -14047,7 +13862,7 @@ class MapLongLongUShort eProsima_user_DllExport MapLongLongUShort( const MapLongLongUShort& x) { - m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; + m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; } @@ -14069,7 +13884,7 @@ class MapLongLongUShort const MapLongLongUShort& x) { - m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; + m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; return *this; } @@ -14144,8 +13959,6 @@ class MapLongLongUShort return m_var_map_longlong_ushort; } - - private: std::map m_var_map_longlong_ushort; @@ -14180,7 +13993,7 @@ class MapLongLongKeyLongValue eProsima_user_DllExport MapLongLongKeyLongValue( const MapLongLongKeyLongValue& x) { - m_var_map_longlong_long = x.m_var_map_longlong_long; + m_var_map_longlong_long = x.m_var_map_longlong_long; } @@ -14202,7 +14015,7 @@ class MapLongLongKeyLongValue const MapLongLongKeyLongValue& x) { - m_var_map_longlong_long = x.m_var_map_longlong_long; + m_var_map_longlong_long = x.m_var_map_longlong_long; return *this; } @@ -14277,8 +14090,6 @@ class MapLongLongKeyLongValue return m_var_map_longlong_long; } - - private: std::map m_var_map_longlong_long; @@ -14313,7 +14124,7 @@ class MapLongLongULong eProsima_user_DllExport MapLongLongULong( const MapLongLongULong& x) { - m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; + m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; } @@ -14335,7 +14146,7 @@ class MapLongLongULong const MapLongLongULong& x) { - m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; + m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; return *this; } @@ -14410,8 +14221,6 @@ class MapLongLongULong return m_var_map_longlong_ulong; } - - private: std::map m_var_map_longlong_ulong; @@ -14446,7 +14255,7 @@ class MapLongLongLongLong eProsima_user_DllExport MapLongLongLongLong( const MapLongLongLongLong& x) { - m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; + m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; } @@ -14468,7 +14277,7 @@ class MapLongLongLongLong const MapLongLongLongLong& x) { - m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; + m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; return *this; } @@ -14543,8 +14352,6 @@ class MapLongLongLongLong return m_var_map_longlong_longlong; } - - private: std::map m_var_map_longlong_longlong; @@ -14579,7 +14386,7 @@ class MapLongLongULongLong eProsima_user_DllExport MapLongLongULongLong( const MapLongLongULongLong& x) { - m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; + m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; } @@ -14601,7 +14408,7 @@ class MapLongLongULongLong const MapLongLongULongLong& x) { - m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; + m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; return *this; } @@ -14676,8 +14483,6 @@ class MapLongLongULongLong return m_var_map_longlong_ulonglong; } - - private: std::map m_var_map_longlong_ulonglong; @@ -14712,7 +14517,7 @@ class MapLongLongFloat eProsima_user_DllExport MapLongLongFloat( const MapLongLongFloat& x) { - m_var_map_longlong_float = x.m_var_map_longlong_float; + m_var_map_longlong_float = x.m_var_map_longlong_float; } @@ -14734,7 +14539,7 @@ class MapLongLongFloat const MapLongLongFloat& x) { - m_var_map_longlong_float = x.m_var_map_longlong_float; + m_var_map_longlong_float = x.m_var_map_longlong_float; return *this; } @@ -14809,8 +14614,6 @@ class MapLongLongFloat return m_var_map_longlong_float; } - - private: std::map m_var_map_longlong_float; @@ -14845,7 +14648,7 @@ class MapLongLongKeyDoubleValue eProsima_user_DllExport MapLongLongKeyDoubleValue( const MapLongLongKeyDoubleValue& x) { - m_var_map_longlong_double = x.m_var_map_longlong_double; + m_var_map_longlong_double = x.m_var_map_longlong_double; } @@ -14867,7 +14670,7 @@ class MapLongLongKeyDoubleValue const MapLongLongKeyDoubleValue& x) { - m_var_map_longlong_double = x.m_var_map_longlong_double; + m_var_map_longlong_double = x.m_var_map_longlong_double; return *this; } @@ -14942,8 +14745,6 @@ class MapLongLongKeyDoubleValue return m_var_map_longlong_double; } - - private: std::map m_var_map_longlong_double; @@ -14978,7 +14779,7 @@ class MapLongLongLongDouble eProsima_user_DllExport MapLongLongLongDouble( const MapLongLongLongDouble& x) { - m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; + m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; } @@ -15000,7 +14801,7 @@ class MapLongLongLongDouble const MapLongLongLongDouble& x) { - m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; + m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; return *this; } @@ -15075,8 +14876,6 @@ class MapLongLongLongDouble return m_var_map_longlong_longdouble; } - - private: std::map m_var_map_longlong_longdouble; @@ -15111,7 +14910,7 @@ class MapLongLongBoolean eProsima_user_DllExport MapLongLongBoolean( const MapLongLongBoolean& x) { - m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; + m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; } @@ -15133,7 +14932,7 @@ class MapLongLongBoolean const MapLongLongBoolean& x) { - m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; + m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; return *this; } @@ -15208,8 +15007,6 @@ class MapLongLongBoolean return m_var_map_longlong_boolean; } - - private: std::map m_var_map_longlong_boolean; @@ -15244,7 +15041,7 @@ class MapLongLongOctet eProsima_user_DllExport MapLongLongOctet( const MapLongLongOctet& x) { - m_var_map_longlong_octet = x.m_var_map_longlong_octet; + m_var_map_longlong_octet = x.m_var_map_longlong_octet; } @@ -15266,7 +15063,7 @@ class MapLongLongOctet const MapLongLongOctet& x) { - m_var_map_longlong_octet = x.m_var_map_longlong_octet; + m_var_map_longlong_octet = x.m_var_map_longlong_octet; return *this; } @@ -15341,8 +15138,6 @@ class MapLongLongOctet return m_var_map_longlong_octet; } - - private: std::map m_var_map_longlong_octet; @@ -15377,7 +15172,7 @@ class MapLongLongChar eProsima_user_DllExport MapLongLongChar( const MapLongLongChar& x) { - m_var_map_longlong_char = x.m_var_map_longlong_char; + m_var_map_longlong_char = x.m_var_map_longlong_char; } @@ -15399,7 +15194,7 @@ class MapLongLongChar const MapLongLongChar& x) { - m_var_map_longlong_char = x.m_var_map_longlong_char; + m_var_map_longlong_char = x.m_var_map_longlong_char; return *this; } @@ -15474,8 +15269,6 @@ class MapLongLongChar return m_var_map_longlong_char; } - - private: std::map m_var_map_longlong_char; @@ -15510,7 +15303,7 @@ class MapLongLongWChar eProsima_user_DllExport MapLongLongWChar( const MapLongLongWChar& x) { - m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; + m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; } @@ -15532,7 +15325,7 @@ class MapLongLongWChar const MapLongLongWChar& x) { - m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; + m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; return *this; } @@ -15607,8 +15400,6 @@ class MapLongLongWChar return m_var_map_longlong_wchar; } - - private: std::map m_var_map_longlong_wchar; @@ -15643,7 +15434,7 @@ class MapLongLongString eProsima_user_DllExport MapLongLongString( const MapLongLongString& x) { - m_var_map_longlong_string = x.m_var_map_longlong_string; + m_var_map_longlong_string = x.m_var_map_longlong_string; } @@ -15665,7 +15456,7 @@ class MapLongLongString const MapLongLongString& x) { - m_var_map_longlong_string = x.m_var_map_longlong_string; + m_var_map_longlong_string = x.m_var_map_longlong_string; return *this; } @@ -15740,8 +15531,6 @@ class MapLongLongString return m_var_map_longlong_string; } - - private: std::map m_var_map_longlong_string; @@ -15776,7 +15565,7 @@ class MapLongLongWString eProsima_user_DllExport MapLongLongWString( const MapLongLongWString& x) { - m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; + m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; } @@ -15798,7 +15587,7 @@ class MapLongLongWString const MapLongLongWString& x) { - m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; + m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; return *this; } @@ -15873,8 +15662,6 @@ class MapLongLongWString return m_var_map_longlong_wstring; } - - private: std::map m_var_map_longlong_wstring; @@ -15909,7 +15696,7 @@ class MapLongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedStringHelper( const MapLongLongInnerAliasBoundedStringHelper& x) { - m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; + m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; } @@ -15920,7 +15707,8 @@ class MapLongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedStringHelper( MapLongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); + m_var_map_longlong_inneraliasboundedstringhelper = + std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); } /*! @@ -15931,7 +15719,7 @@ class MapLongLongInnerAliasBoundedStringHelper const MapLongLongInnerAliasBoundedStringHelper& x) { - m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; + m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; return *this; } @@ -15944,7 +15732,8 @@ class MapLongLongInnerAliasBoundedStringHelper MapLongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); + m_var_map_longlong_inneraliasboundedstringhelper = + std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); return *this; } @@ -15992,7 +15781,8 @@ class MapLongLongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasboundedstringhelper * @return Constant reference to member var_map_longlong_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedstringhelper() const { return m_var_map_longlong_inneraliasboundedstringhelper; } @@ -16001,13 +15791,12 @@ class MapLongLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_longlong_inneraliasboundedstringhelper * @return Reference to member var_map_longlong_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedstringhelper() { return m_var_map_longlong_inneraliasboundedstringhelper; } - - private: std::map m_var_map_longlong_inneraliasboundedstringhelper; @@ -16042,7 +15831,7 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedWStringHelper( const MapLongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; + m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; } @@ -16053,7 +15842,8 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedWStringHelper( MapLongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedwstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); + m_var_map_longlong_inneraliasboundedwstringhelper = + std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); } /*! @@ -16064,7 +15854,7 @@ class MapLongLongInnerAliasBoundedWStringHelper const MapLongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; + m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; return *this; } @@ -16077,7 +15867,8 @@ class MapLongLongInnerAliasBoundedWStringHelper MapLongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedwstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); + m_var_map_longlong_inneraliasboundedwstringhelper = + std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); return *this; } @@ -16088,7 +15879,8 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapLongLongInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_longlong_inneraliasboundedwstringhelper == x.m_var_map_longlong_inneraliasboundedwstringhelper); + return (m_var_map_longlong_inneraliasboundedwstringhelper == + x.m_var_map_longlong_inneraliasboundedwstringhelper); } /*! @@ -16106,7 +15898,8 @@ class MapLongLongInnerAliasBoundedWStringHelper * @param _var_map_longlong_inneraliasboundedwstringhelper New value to be copied in member var_map_longlong_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_longlong_inneraliasboundedwstringhelper( - const std::map& _var_map_longlong_inneraliasboundedwstringhelper) + const std::map& _var_map_longlong_inneraliasboundedwstringhelper) { m_var_map_longlong_inneraliasboundedwstringhelper = _var_map_longlong_inneraliasboundedwstringhelper; } @@ -16125,7 +15918,8 @@ class MapLongLongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasboundedwstringhelper * @return Constant reference to member var_map_longlong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedwstringhelper() const { return m_var_map_longlong_inneraliasboundedwstringhelper; } @@ -16134,13 +15928,12 @@ class MapLongLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_longlong_inneraliasboundedwstringhelper * @return Reference to member var_map_longlong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedwstringhelper() { return m_var_map_longlong_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_longlong_inneraliasboundedwstringhelper; @@ -16175,7 +15968,7 @@ class MapLongLongInnerEnumHelper eProsima_user_DllExport MapLongLongInnerEnumHelper( const MapLongLongInnerEnumHelper& x) { - m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; + m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; } @@ -16197,7 +15990,7 @@ class MapLongLongInnerEnumHelper const MapLongLongInnerEnumHelper& x) { - m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; + m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; return *this; } @@ -16272,8 +16065,6 @@ class MapLongLongInnerEnumHelper return m_var_map_longlong_innerenumhelper; } - - private: std::map m_var_map_longlong_innerenumhelper; @@ -16308,7 +16099,7 @@ class MapLongLongInnerBitMaskHelper eProsima_user_DllExport MapLongLongInnerBitMaskHelper( const MapLongLongInnerBitMaskHelper& x) { - m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; + m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; } @@ -16330,7 +16121,7 @@ class MapLongLongInnerBitMaskHelper const MapLongLongInnerBitMaskHelper& x) { - m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; + m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; return *this; } @@ -16405,8 +16196,6 @@ class MapLongLongInnerBitMaskHelper return m_var_map_longlong_innerbitmaskhelper; } - - private: std::map m_var_map_longlong_innerbitmaskhelper; @@ -16441,7 +16230,7 @@ class MapLongLongInnerAliasHelper eProsima_user_DllExport MapLongLongInnerAliasHelper( const MapLongLongInnerAliasHelper& x) { - m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; + m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; } @@ -16463,7 +16252,7 @@ class MapLongLongInnerAliasHelper const MapLongLongInnerAliasHelper& x) { - m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; + m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; return *this; } @@ -16538,8 +16327,6 @@ class MapLongLongInnerAliasHelper return m_var_map_longlong_inneraliashelper; } - - private: std::map m_var_map_longlong_inneraliashelper; @@ -16574,7 +16361,7 @@ class MapLongLongInnerAliasArrayHelper eProsima_user_DllExport MapLongLongInnerAliasArrayHelper( const MapLongLongInnerAliasArrayHelper& x) { - m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; + m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; } @@ -16596,7 +16383,7 @@ class MapLongLongInnerAliasArrayHelper const MapLongLongInnerAliasArrayHelper& x) { - m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; + m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; return *this; } @@ -16657,7 +16444,8 @@ class MapLongLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasarrayhelper * @return Constant reference to member var_map_longlong_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasarrayhelper() const { return m_var_map_longlong_inneraliasarrayhelper; } @@ -16671,8 +16459,6 @@ class MapLongLongInnerAliasArrayHelper return m_var_map_longlong_inneraliasarrayhelper; } - - private: std::map m_var_map_longlong_inneraliasarrayhelper; @@ -16707,7 +16493,7 @@ class MapLongLongInnerAliasSequenceHelper eProsima_user_DllExport MapLongLongInnerAliasSequenceHelper( const MapLongLongInnerAliasSequenceHelper& x) { - m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; + m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; } @@ -16729,7 +16515,7 @@ class MapLongLongInnerAliasSequenceHelper const MapLongLongInnerAliasSequenceHelper& x) { - m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; + m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; return *this; } @@ -16790,7 +16576,8 @@ class MapLongLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliassequencehelper * @return Constant reference to member var_map_longlong_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliassequencehelper() const { return m_var_map_longlong_inneraliassequencehelper; } @@ -16804,8 +16591,6 @@ class MapLongLongInnerAliasSequenceHelper return m_var_map_longlong_inneraliassequencehelper; } - - private: std::map m_var_map_longlong_inneraliassequencehelper; @@ -16840,7 +16625,7 @@ class MapLongLongInnerAliasMapHelper eProsima_user_DllExport MapLongLongInnerAliasMapHelper( const MapLongLongInnerAliasMapHelper& x) { - m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; + m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; } @@ -16862,7 +16647,7 @@ class MapLongLongInnerAliasMapHelper const MapLongLongInnerAliasMapHelper& x) { - m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; + m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; return *this; } @@ -16923,7 +16708,8 @@ class MapLongLongInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasmaphelper * @return Constant reference to member var_map_longlong_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasmaphelper() const { return m_var_map_longlong_inneraliasmaphelper; } @@ -16937,8 +16723,6 @@ class MapLongLongInnerAliasMapHelper return m_var_map_longlong_inneraliasmaphelper; } - - private: std::map m_var_map_longlong_inneraliasmaphelper; @@ -16973,7 +16757,7 @@ class MapLongLongInnerUnionHelper eProsima_user_DllExport MapLongLongInnerUnionHelper( const MapLongLongInnerUnionHelper& x) { - m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; + m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; } @@ -16995,7 +16779,7 @@ class MapLongLongInnerUnionHelper const MapLongLongInnerUnionHelper& x) { - m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; + m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; return *this; } @@ -17070,8 +16854,6 @@ class MapLongLongInnerUnionHelper return m_var_map_longlong_innerunionhelper; } - - private: std::map m_var_map_longlong_innerunionhelper; @@ -17106,7 +16888,7 @@ class MapLongLongInnerStructureHelper eProsima_user_DllExport MapLongLongInnerStructureHelper( const MapLongLongInnerStructureHelper& x) { - m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; + m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; } @@ -17128,7 +16910,7 @@ class MapLongLongInnerStructureHelper const MapLongLongInnerStructureHelper& x) { - m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; + m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; return *this; } @@ -17203,8 +16985,6 @@ class MapLongLongInnerStructureHelper return m_var_map_longlong_innerstructurehelper; } - - private: std::map m_var_map_longlong_innerstructurehelper; @@ -17239,7 +17019,7 @@ class MapLongLongInnerBitsetHelper eProsima_user_DllExport MapLongLongInnerBitsetHelper( const MapLongLongInnerBitsetHelper& x) { - m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; + m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; } @@ -17261,7 +17041,7 @@ class MapLongLongInnerBitsetHelper const MapLongLongInnerBitsetHelper& x) { - m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; + m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; return *this; } @@ -17336,8 +17116,6 @@ class MapLongLongInnerBitsetHelper return m_var_map_longlong_innerbitsethelper; } - - private: std::map m_var_map_longlong_innerbitsethelper; @@ -17372,7 +17150,7 @@ class MapULongLongShort eProsima_user_DllExport MapULongLongShort( const MapULongLongShort& x) { - m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; + m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; } @@ -17394,7 +17172,7 @@ class MapULongLongShort const MapULongLongShort& x) { - m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; + m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; return *this; } @@ -17469,8 +17247,6 @@ class MapULongLongShort return m_var_map_u_long_long_short; } - - private: std::map m_var_map_u_long_long_short; @@ -17505,7 +17281,7 @@ class MapULongLongUShort eProsima_user_DllExport MapULongLongUShort( const MapULongLongUShort& x) { - m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; + m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; } @@ -17527,7 +17303,7 @@ class MapULongLongUShort const MapULongLongUShort& x) { - m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; + m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; return *this; } @@ -17602,8 +17378,6 @@ class MapULongLongUShort return m_var_map_u_long_long_u_short; } - - private: std::map m_var_map_u_long_long_u_short; @@ -17638,7 +17412,7 @@ class MapULongLongLong eProsima_user_DllExport MapULongLongLong( const MapULongLongLong& x) { - m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; + m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; } @@ -17660,7 +17434,7 @@ class MapULongLongLong const MapULongLongLong& x) { - m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; + m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; return *this; } @@ -17735,8 +17509,6 @@ class MapULongLongLong return m_var_map_u_long_long_long; } - - private: std::map m_var_map_u_long_long_long; @@ -17771,7 +17543,7 @@ class MapULongLongULong eProsima_user_DllExport MapULongLongULong( const MapULongLongULong& x) { - m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; + m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; } @@ -17793,7 +17565,7 @@ class MapULongLongULong const MapULongLongULong& x) { - m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; + m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; return *this; } @@ -17868,8 +17640,6 @@ class MapULongLongULong return m_var_map_u_long_long_u_long; } - - private: std::map m_var_map_u_long_long_u_long; @@ -17904,7 +17674,7 @@ class MapULongLongLongLong eProsima_user_DllExport MapULongLongLongLong( const MapULongLongLongLong& x) { - m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; + m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; } @@ -17926,7 +17696,7 @@ class MapULongLongLongLong const MapULongLongLongLong& x) { - m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; + m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; return *this; } @@ -18001,8 +17771,6 @@ class MapULongLongLongLong return m_var_map_u_long_long_long_long; } - - private: std::map m_var_map_u_long_long_long_long; @@ -18037,7 +17805,7 @@ class MapULongLongULongLong eProsima_user_DllExport MapULongLongULongLong( const MapULongLongULongLong& x) { - m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; + m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; } @@ -18059,7 +17827,7 @@ class MapULongLongULongLong const MapULongLongULongLong& x) { - m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; + m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; return *this; } @@ -18134,8 +17902,6 @@ class MapULongLongULongLong return m_var_map_u_long_long_u_long_long; } - - private: std::map m_var_map_u_long_long_u_long_long; @@ -18170,7 +17936,7 @@ class MapULongLongFloat eProsima_user_DllExport MapULongLongFloat( const MapULongLongFloat& x) { - m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; + m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; } @@ -18192,7 +17958,7 @@ class MapULongLongFloat const MapULongLongFloat& x) { - m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; + m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; return *this; } @@ -18267,8 +18033,6 @@ class MapULongLongFloat return m_var_map_u_long_long_float; } - - private: std::map m_var_map_u_long_long_float; @@ -18303,7 +18067,7 @@ class MapKeyULongLongValueDouble eProsima_user_DllExport MapKeyULongLongValueDouble( const MapKeyULongLongValueDouble& x) { - m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; + m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; } @@ -18325,7 +18089,7 @@ class MapKeyULongLongValueDouble const MapKeyULongLongValueDouble& x) { - m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; + m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; return *this; } @@ -18400,8 +18164,6 @@ class MapKeyULongLongValueDouble return m_var_map_u_long_long_double; } - - private: std::map m_var_map_u_long_long_double; @@ -18436,7 +18198,7 @@ class MapULongLongLongDouble eProsima_user_DllExport MapULongLongLongDouble( const MapULongLongLongDouble& x) { - m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; + m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; } @@ -18458,7 +18220,7 @@ class MapULongLongLongDouble const MapULongLongLongDouble& x) { - m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; + m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; return *this; } @@ -18533,8 +18295,6 @@ class MapULongLongLongDouble return m_var_map_u_long_long_long_double; } - - private: std::map m_var_map_u_long_long_long_double; @@ -18569,7 +18329,7 @@ class MapULongLongBoolean eProsima_user_DllExport MapULongLongBoolean( const MapULongLongBoolean& x) { - m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; + m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; } @@ -18591,7 +18351,7 @@ class MapULongLongBoolean const MapULongLongBoolean& x) { - m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; + m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; return *this; } @@ -18666,8 +18426,6 @@ class MapULongLongBoolean return m_var_map_u_long_long_boolean; } - - private: std::map m_var_map_u_long_long_boolean; @@ -18702,7 +18460,7 @@ class MapULongLongOctet eProsima_user_DllExport MapULongLongOctet( const MapULongLongOctet& x) { - m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; + m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; } @@ -18724,7 +18482,7 @@ class MapULongLongOctet const MapULongLongOctet& x) { - m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; + m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; return *this; } @@ -18799,8 +18557,6 @@ class MapULongLongOctet return m_var_map_u_long_long_octet; } - - private: std::map m_var_map_u_long_long_octet; @@ -18835,7 +18591,7 @@ class MapULongLongChar eProsima_user_DllExport MapULongLongChar( const MapULongLongChar& x) { - m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; + m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; } @@ -18857,7 +18613,7 @@ class MapULongLongChar const MapULongLongChar& x) { - m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; + m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; return *this; } @@ -18932,8 +18688,6 @@ class MapULongLongChar return m_var_map_u_long_long_char; } - - private: std::map m_var_map_u_long_long_char; @@ -18968,7 +18722,7 @@ class MapULongLongWChar eProsima_user_DllExport MapULongLongWChar( const MapULongLongWChar& x) { - m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; + m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; } @@ -18990,7 +18744,7 @@ class MapULongLongWChar const MapULongLongWChar& x) { - m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; + m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; return *this; } @@ -19065,8 +18819,6 @@ class MapULongLongWChar return m_var_map_u_long_long_wchar; } - - private: std::map m_var_map_u_long_long_wchar; @@ -19101,7 +18853,7 @@ class MapULongLongString eProsima_user_DllExport MapULongLongString( const MapULongLongString& x) { - m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; + m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; } @@ -19123,7 +18875,7 @@ class MapULongLongString const MapULongLongString& x) { - m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; + m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; return *this; } @@ -19198,8 +18950,6 @@ class MapULongLongString return m_var_map_u_long_long_string; } - - private: std::map m_var_map_u_long_long_string; @@ -19234,7 +18984,7 @@ class MapULongLongWString eProsima_user_DllExport MapULongLongWString( const MapULongLongWString& x) { - m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; + m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; } @@ -19256,7 +19006,7 @@ class MapULongLongWString const MapULongLongWString& x) { - m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; + m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; return *this; } @@ -19331,8 +19081,6 @@ class MapULongLongWString return m_var_map_u_long_long_wstring; } - - private: std::map m_var_map_u_long_long_wstring; @@ -19367,7 +19115,8 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedStringHelper( const MapULongLongInnerAliasBoundedStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = x.m_var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = + x.m_var_map_u_long_long_inner_alias_bounded_string_helper; } @@ -19378,7 +19127,8 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedStringHelper( MapULongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = + std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! @@ -19389,7 +19139,8 @@ class MapULongLongInnerAliasBoundedStringHelper const MapULongLongInnerAliasBoundedStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = x.m_var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = + x.m_var_map_u_long_long_inner_alias_bounded_string_helper; return *this; } @@ -19402,7 +19153,8 @@ class MapULongLongInnerAliasBoundedStringHelper MapULongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = + std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); return *this; } @@ -19413,7 +19165,8 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasBoundedStringHelper& x) const { - return (m_var_map_u_long_long_inner_alias_bounded_string_helper == x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + return (m_var_map_u_long_long_inner_alias_bounded_string_helper == + x.m_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! @@ -19431,9 +19184,11 @@ class MapULongLongInnerAliasBoundedStringHelper * @param _var_map_u_long_long_inner_alias_bounded_string_helper New value to be copied in member var_map_u_long_long_inner_alias_bounded_string_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_string_helper( - const std::map& _var_map_u_long_long_inner_alias_bounded_string_helper) + const std::map& _var_map_u_long_long_inner_alias_bounded_string_helper) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = _var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = + _var_map_u_long_long_inner_alias_bounded_string_helper; } /*! @@ -19441,16 +19196,19 @@ class MapULongLongInnerAliasBoundedStringHelper * @param _var_map_u_long_long_inner_alias_bounded_string_helper New value to be moved in member var_map_u_long_long_inner_alias_bounded_string_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_string_helper( - std::map&& _var_map_u_long_long_inner_alias_bounded_string_helper) + std::map&& _var_map_u_long_long_inner_alias_bounded_string_helper) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = + std::move(_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_bounded_string_helper * @return Constant reference to member var_map_u_long_long_inner_alias_bounded_string_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_string_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_string_helper() const { return m_var_map_u_long_long_inner_alias_bounded_string_helper; } @@ -19459,13 +19217,12 @@ class MapULongLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_bounded_string_helper * @return Reference to member var_map_u_long_long_inner_alias_bounded_string_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_string_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_string_helper() { return m_var_map_u_long_long_inner_alias_bounded_string_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_bounded_string_helper; @@ -19500,7 +19257,8 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedWStringHelper( const MapULongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } @@ -19511,7 +19269,8 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedWStringHelper( MapULongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! @@ -19522,7 +19281,8 @@ class MapULongLongInnerAliasBoundedWStringHelper const MapULongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; return *this; } @@ -19535,7 +19295,8 @@ class MapULongLongInnerAliasBoundedWStringHelper MapULongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); return *this; } @@ -19546,7 +19307,8 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_u_long_long_inner_alias_bounded_wstring_helper == x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + return (m_var_map_u_long_long_inner_alias_bounded_wstring_helper == + x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! @@ -19564,9 +19326,11 @@ class MapULongLongInnerAliasBoundedWStringHelper * @param _var_map_u_long_long_inner_alias_bounded_wstring_helper New value to be copied in member var_map_u_long_long_inner_alias_bounded_wstring_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_wstring_helper( - const std::map& _var_map_u_long_long_inner_alias_bounded_wstring_helper) + const std::map& _var_map_u_long_long_inner_alias_bounded_wstring_helper) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = _var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + _var_map_u_long_long_inner_alias_bounded_wstring_helper; } /*! @@ -19574,16 +19338,19 @@ class MapULongLongInnerAliasBoundedWStringHelper * @param _var_map_u_long_long_inner_alias_bounded_wstring_helper New value to be moved in member var_map_u_long_long_inner_alias_bounded_wstring_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_wstring_helper( - std::map&& _var_map_u_long_long_inner_alias_bounded_wstring_helper) + std::map&& _var_map_u_long_long_inner_alias_bounded_wstring_helper) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = + std::move(_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper * @return Constant reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() const { return m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } @@ -19592,13 +19359,12 @@ class MapULongLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper * @return Reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() { return m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_bounded_wstring_helper; @@ -19633,7 +19399,7 @@ class MapULongLongInnerEnumHelper eProsima_user_DllExport MapULongLongInnerEnumHelper( const MapULongLongInnerEnumHelper& x) { - m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; + m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; } @@ -19655,7 +19421,7 @@ class MapULongLongInnerEnumHelper const MapULongLongInnerEnumHelper& x) { - m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; + m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; return *this; } @@ -19730,8 +19496,6 @@ class MapULongLongInnerEnumHelper return m_var_map_u_long_long_inner_enum_helper; } - - private: std::map m_var_map_u_long_long_inner_enum_helper; @@ -19766,7 +19530,7 @@ class MapULongLongInnerBitMaskHelper eProsima_user_DllExport MapULongLongInnerBitMaskHelper( const MapULongLongInnerBitMaskHelper& x) { - m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; + m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; } @@ -19788,7 +19552,7 @@ class MapULongLongInnerBitMaskHelper const MapULongLongInnerBitMaskHelper& x) { - m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; + m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; return *this; } @@ -19849,7 +19613,8 @@ class MapULongLongInnerBitMaskHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_bit_mask_helper * @return Constant reference to member var_map_u_long_long_inner_bit_mask_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_bit_mask_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_bit_mask_helper() const { return m_var_map_u_long_long_inner_bit_mask_helper; } @@ -19863,8 +19628,6 @@ class MapULongLongInnerBitMaskHelper return m_var_map_u_long_long_inner_bit_mask_helper; } - - private: std::map m_var_map_u_long_long_inner_bit_mask_helper; @@ -19899,7 +19662,7 @@ class MapULongLongInnerAliasHelper eProsima_user_DllExport MapULongLongInnerAliasHelper( const MapULongLongInnerAliasHelper& x) { - m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; + m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; } @@ -19921,7 +19684,7 @@ class MapULongLongInnerAliasHelper const MapULongLongInnerAliasHelper& x) { - m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; + m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; return *this; } @@ -19996,8 +19759,6 @@ class MapULongLongInnerAliasHelper return m_var_map_u_long_long_inner_alias_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_helper; @@ -20032,7 +19793,7 @@ class MapULongLongInnerAliasArrayHelper eProsima_user_DllExport MapULongLongInnerAliasArrayHelper( const MapULongLongInnerAliasArrayHelper& x) { - m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; + m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; } @@ -20054,7 +19815,7 @@ class MapULongLongInnerAliasArrayHelper const MapULongLongInnerAliasArrayHelper& x) { - m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; + m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; return *this; } @@ -20115,7 +19876,8 @@ class MapULongLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_array_helper * @return Constant reference to member var_map_u_long_long_inner_alias_array_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_array_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_array_helper() const { return m_var_map_u_long_long_inner_alias_array_helper; } @@ -20129,8 +19891,6 @@ class MapULongLongInnerAliasArrayHelper return m_var_map_u_long_long_inner_alias_array_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_array_helper; @@ -20165,7 +19925,7 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport MapULongLongInnerAliasSequenceHelper( const MapULongLongInnerAliasSequenceHelper& x) { - m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; + m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; } @@ -20176,7 +19936,8 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport MapULongLongInnerAliasSequenceHelper( MapULongLongInnerAliasSequenceHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_sequence_helper = std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); + m_var_map_u_long_long_inner_alias_sequence_helper = + std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); } /*! @@ -20187,7 +19948,7 @@ class MapULongLongInnerAliasSequenceHelper const MapULongLongInnerAliasSequenceHelper& x) { - m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; + m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; return *this; } @@ -20200,7 +19961,8 @@ class MapULongLongInnerAliasSequenceHelper MapULongLongInnerAliasSequenceHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_sequence_helper = std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); + m_var_map_u_long_long_inner_alias_sequence_helper = + std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); return *this; } @@ -20211,7 +19973,8 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasSequenceHelper& x) const { - return (m_var_map_u_long_long_inner_alias_sequence_helper == x.m_var_map_u_long_long_inner_alias_sequence_helper); + return (m_var_map_u_long_long_inner_alias_sequence_helper == + x.m_var_map_u_long_long_inner_alias_sequence_helper); } /*! @@ -20248,7 +20011,8 @@ class MapULongLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_sequence_helper * @return Constant reference to member var_map_u_long_long_inner_alias_sequence_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_sequence_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_sequence_helper() const { return m_var_map_u_long_long_inner_alias_sequence_helper; } @@ -20257,13 +20021,12 @@ class MapULongLongInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_sequence_helper * @return Reference to member var_map_u_long_long_inner_alias_sequence_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_sequence_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_sequence_helper() { return m_var_map_u_long_long_inner_alias_sequence_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_sequence_helper; @@ -20298,7 +20061,7 @@ class MapULongLongInnerAliasMapHelper eProsima_user_DllExport MapULongLongInnerAliasMapHelper( const MapULongLongInnerAliasMapHelper& x) { - m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; + m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; } @@ -20320,7 +20083,7 @@ class MapULongLongInnerAliasMapHelper const MapULongLongInnerAliasMapHelper& x) { - m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; + m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; return *this; } @@ -20381,7 +20144,8 @@ class MapULongLongInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_map_helper * @return Constant reference to member var_map_u_long_long_inner_alias_map_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_map_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_map_helper() const { return m_var_map_u_long_long_inner_alias_map_helper; } @@ -20395,8 +20159,6 @@ class MapULongLongInnerAliasMapHelper return m_var_map_u_long_long_inner_alias_map_helper; } - - private: std::map m_var_map_u_long_long_inner_alias_map_helper; @@ -20431,7 +20193,7 @@ class MapULongLongInnerUnionHelper eProsima_user_DllExport MapULongLongInnerUnionHelper( const MapULongLongInnerUnionHelper& x) { - m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; + m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; } @@ -20453,7 +20215,7 @@ class MapULongLongInnerUnionHelper const MapULongLongInnerUnionHelper& x) { - m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; + m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; return *this; } @@ -20528,8 +20290,6 @@ class MapULongLongInnerUnionHelper return m_var_map_u_long_long_inner_union_helper; } - - private: std::map m_var_map_u_long_long_inner_union_helper; @@ -20564,7 +20324,7 @@ class MapULongLongInnerStructureHelper eProsima_user_DllExport MapULongLongInnerStructureHelper( const MapULongLongInnerStructureHelper& x) { - m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; + m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; } @@ -20586,7 +20346,7 @@ class MapULongLongInnerStructureHelper const MapULongLongInnerStructureHelper& x) { - m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; + m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; return *this; } @@ -20647,7 +20407,8 @@ class MapULongLongInnerStructureHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_structure_helper * @return Constant reference to member var_map_u_long_long_inner_structure_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_structure_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_structure_helper() const { return m_var_map_u_long_long_inner_structure_helper; } @@ -20661,8 +20422,6 @@ class MapULongLongInnerStructureHelper return m_var_map_u_long_long_inner_structure_helper; } - - private: std::map m_var_map_u_long_long_inner_structure_helper; @@ -20697,7 +20456,7 @@ class MapULongLongInnerBitsetHelper eProsima_user_DllExport MapULongLongInnerBitsetHelper( const MapULongLongInnerBitsetHelper& x) { - m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; + m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; } @@ -20719,7 +20478,7 @@ class MapULongLongInnerBitsetHelper const MapULongLongInnerBitsetHelper& x) { - m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; + m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; return *this; } @@ -20794,8 +20553,6 @@ class MapULongLongInnerBitsetHelper return m_var_map_u_long_long_inner_bitset_helper; } - - private: std::map m_var_map_u_long_long_inner_bitset_helper; @@ -20830,7 +20587,7 @@ class MapStringShort eProsima_user_DllExport MapStringShort( const MapStringShort& x) { - m_var_map_string_short = x.m_var_map_string_short; + m_var_map_string_short = x.m_var_map_string_short; } @@ -20852,7 +20609,7 @@ class MapStringShort const MapStringShort& x) { - m_var_map_string_short = x.m_var_map_string_short; + m_var_map_string_short = x.m_var_map_string_short; return *this; } @@ -20927,8 +20684,6 @@ class MapStringShort return m_var_map_string_short; } - - private: std::map m_var_map_string_short; @@ -20963,7 +20718,7 @@ class MapStringUShort eProsima_user_DllExport MapStringUShort( const MapStringUShort& x) { - m_var_map_string_ushort = x.m_var_map_string_ushort; + m_var_map_string_ushort = x.m_var_map_string_ushort; } @@ -20985,7 +20740,7 @@ class MapStringUShort const MapStringUShort& x) { - m_var_map_string_ushort = x.m_var_map_string_ushort; + m_var_map_string_ushort = x.m_var_map_string_ushort; return *this; } @@ -21060,8 +20815,6 @@ class MapStringUShort return m_var_map_string_ushort; } - - private: std::map m_var_map_string_ushort; @@ -21096,7 +20849,7 @@ class MapStringLong eProsima_user_DllExport MapStringLong( const MapStringLong& x) { - m_var_map_string_long = x.m_var_map_string_long; + m_var_map_string_long = x.m_var_map_string_long; } @@ -21118,7 +20871,7 @@ class MapStringLong const MapStringLong& x) { - m_var_map_string_long = x.m_var_map_string_long; + m_var_map_string_long = x.m_var_map_string_long; return *this; } @@ -21193,8 +20946,6 @@ class MapStringLong return m_var_map_string_long; } - - private: std::map m_var_map_string_long; @@ -21229,7 +20980,7 @@ class MapStringULong eProsima_user_DllExport MapStringULong( const MapStringULong& x) { - m_var_map_string_ulong = x.m_var_map_string_ulong; + m_var_map_string_ulong = x.m_var_map_string_ulong; } @@ -21251,7 +21002,7 @@ class MapStringULong const MapStringULong& x) { - m_var_map_string_ulong = x.m_var_map_string_ulong; + m_var_map_string_ulong = x.m_var_map_string_ulong; return *this; } @@ -21326,8 +21077,6 @@ class MapStringULong return m_var_map_string_ulong; } - - private: std::map m_var_map_string_ulong; @@ -21362,7 +21111,7 @@ class MapStringLongLong eProsima_user_DllExport MapStringLongLong( const MapStringLongLong& x) { - m_var_map_string_longlong = x.m_var_map_string_longlong; + m_var_map_string_longlong = x.m_var_map_string_longlong; } @@ -21384,7 +21133,7 @@ class MapStringLongLong const MapStringLongLong& x) { - m_var_map_string_longlong = x.m_var_map_string_longlong; + m_var_map_string_longlong = x.m_var_map_string_longlong; return *this; } @@ -21459,8 +21208,6 @@ class MapStringLongLong return m_var_map_string_longlong; } - - private: std::map m_var_map_string_longlong; @@ -21495,7 +21242,7 @@ class MapStringULongLong eProsima_user_DllExport MapStringULongLong( const MapStringULongLong& x) { - m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; + m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; } @@ -21517,7 +21264,7 @@ class MapStringULongLong const MapStringULongLong& x) { - m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; + m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; return *this; } @@ -21592,8 +21339,6 @@ class MapStringULongLong return m_var_map_string_ulonglong; } - - private: std::map m_var_map_string_ulonglong; @@ -21628,7 +21373,7 @@ class MapStringFloat eProsima_user_DllExport MapStringFloat( const MapStringFloat& x) { - m_var_map_string_float = x.m_var_map_string_float; + m_var_map_string_float = x.m_var_map_string_float; } @@ -21650,7 +21395,7 @@ class MapStringFloat const MapStringFloat& x) { - m_var_map_string_float = x.m_var_map_string_float; + m_var_map_string_float = x.m_var_map_string_float; return *this; } @@ -21725,8 +21470,6 @@ class MapStringFloat return m_var_map_string_float; } - - private: std::map m_var_map_string_float; @@ -21761,7 +21504,7 @@ class MapStringDouble eProsima_user_DllExport MapStringDouble( const MapStringDouble& x) { - m_var_map_string_double = x.m_var_map_string_double; + m_var_map_string_double = x.m_var_map_string_double; } @@ -21783,7 +21526,7 @@ class MapStringDouble const MapStringDouble& x) { - m_var_map_string_double = x.m_var_map_string_double; + m_var_map_string_double = x.m_var_map_string_double; return *this; } @@ -21858,8 +21601,6 @@ class MapStringDouble return m_var_map_string_double; } - - private: std::map m_var_map_string_double; @@ -21894,7 +21635,7 @@ class MapStringLongDouble eProsima_user_DllExport MapStringLongDouble( const MapStringLongDouble& x) { - m_var_map_string_longdouble = x.m_var_map_string_longdouble; + m_var_map_string_longdouble = x.m_var_map_string_longdouble; } @@ -21916,7 +21657,7 @@ class MapStringLongDouble const MapStringLongDouble& x) { - m_var_map_string_longdouble = x.m_var_map_string_longdouble; + m_var_map_string_longdouble = x.m_var_map_string_longdouble; return *this; } @@ -21991,8 +21732,6 @@ class MapStringLongDouble return m_var_map_string_longdouble; } - - private: std::map m_var_map_string_longdouble; @@ -22027,7 +21766,7 @@ class MapStringBoolean eProsima_user_DllExport MapStringBoolean( const MapStringBoolean& x) { - m_var_map_string_boolean = x.m_var_map_string_boolean; + m_var_map_string_boolean = x.m_var_map_string_boolean; } @@ -22049,7 +21788,7 @@ class MapStringBoolean const MapStringBoolean& x) { - m_var_map_string_boolean = x.m_var_map_string_boolean; + m_var_map_string_boolean = x.m_var_map_string_boolean; return *this; } @@ -22124,8 +21863,6 @@ class MapStringBoolean return m_var_map_string_boolean; } - - private: std::map m_var_map_string_boolean; @@ -22160,7 +21897,7 @@ class MapStringOctet eProsima_user_DllExport MapStringOctet( const MapStringOctet& x) { - m_var_map_string_octet = x.m_var_map_string_octet; + m_var_map_string_octet = x.m_var_map_string_octet; } @@ -22182,7 +21919,7 @@ class MapStringOctet const MapStringOctet& x) { - m_var_map_string_octet = x.m_var_map_string_octet; + m_var_map_string_octet = x.m_var_map_string_octet; return *this; } @@ -22257,8 +21994,6 @@ class MapStringOctet return m_var_map_string_octet; } - - private: std::map m_var_map_string_octet; @@ -22293,7 +22028,7 @@ class MapStringChar eProsima_user_DllExport MapStringChar( const MapStringChar& x) { - m_var_map_string_char = x.m_var_map_string_char; + m_var_map_string_char = x.m_var_map_string_char; } @@ -22315,7 +22050,7 @@ class MapStringChar const MapStringChar& x) { - m_var_map_string_char = x.m_var_map_string_char; + m_var_map_string_char = x.m_var_map_string_char; return *this; } @@ -22390,8 +22125,6 @@ class MapStringChar return m_var_map_string_char; } - - private: std::map m_var_map_string_char; @@ -22426,7 +22159,7 @@ class MapStringWChar eProsima_user_DllExport MapStringWChar( const MapStringWChar& x) { - m_var_map_string_wchar = x.m_var_map_string_wchar; + m_var_map_string_wchar = x.m_var_map_string_wchar; } @@ -22448,7 +22181,7 @@ class MapStringWChar const MapStringWChar& x) { - m_var_map_string_wchar = x.m_var_map_string_wchar; + m_var_map_string_wchar = x.m_var_map_string_wchar; return *this; } @@ -22523,8 +22256,6 @@ class MapStringWChar return m_var_map_string_wchar; } - - private: std::map m_var_map_string_wchar; @@ -22559,7 +22290,7 @@ class MapStringString eProsima_user_DllExport MapStringString( const MapStringString& x) { - m_var_map_string_string = x.m_var_map_string_string; + m_var_map_string_string = x.m_var_map_string_string; } @@ -22581,7 +22312,7 @@ class MapStringString const MapStringString& x) { - m_var_map_string_string = x.m_var_map_string_string; + m_var_map_string_string = x.m_var_map_string_string; return *this; } @@ -22656,8 +22387,6 @@ class MapStringString return m_var_map_string_string; } - - private: std::map m_var_map_string_string; @@ -22692,7 +22421,7 @@ class MapStringWString eProsima_user_DllExport MapStringWString( const MapStringWString& x) { - m_var_map_string_wstring = x.m_var_map_string_wstring; + m_var_map_string_wstring = x.m_var_map_string_wstring; } @@ -22714,7 +22443,7 @@ class MapStringWString const MapStringWString& x) { - m_var_map_string_wstring = x.m_var_map_string_wstring; + m_var_map_string_wstring = x.m_var_map_string_wstring; return *this; } @@ -22789,8 +22518,6 @@ class MapStringWString return m_var_map_string_wstring; } - - private: std::map m_var_map_string_wstring; @@ -22825,7 +22552,7 @@ class MapStringInnerAliasBoundedStringHelper eProsima_user_DllExport MapStringInnerAliasBoundedStringHelper( const MapStringInnerAliasBoundedStringHelper& x) { - m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; + m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; } @@ -22847,7 +22574,7 @@ class MapStringInnerAliasBoundedStringHelper const MapStringInnerAliasBoundedStringHelper& x) { - m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; + m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; return *this; } @@ -22889,7 +22616,8 @@ class MapStringInnerAliasBoundedStringHelper * @param _var_map_string_inneraliasboundedstringhelper New value to be copied in member var_map_string_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_string_inneraliasboundedstringhelper( - const std::map& _var_map_string_inneraliasboundedstringhelper) + const std::map& _var_map_string_inneraliasboundedstringhelper) { m_var_map_string_inneraliasboundedstringhelper = _var_map_string_inneraliasboundedstringhelper; } @@ -22908,7 +22636,8 @@ class MapStringInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_string_inneraliasboundedstringhelper * @return Constant reference to member var_map_string_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedstringhelper() const { return m_var_map_string_inneraliasboundedstringhelper; } @@ -22917,13 +22646,12 @@ class MapStringInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_string_inneraliasboundedstringhelper * @return Reference to member var_map_string_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_string_inneraliasboundedstringhelper() { return m_var_map_string_inneraliasboundedstringhelper; } - - private: std::map m_var_map_string_inneraliasboundedstringhelper; @@ -22958,7 +22686,7 @@ class MapStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapStringInnerAliasBoundedWStringHelper( const MapStringInnerAliasBoundedWStringHelper& x) { - m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; + m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; } @@ -22980,7 +22708,7 @@ class MapStringInnerAliasBoundedWStringHelper const MapStringInnerAliasBoundedWStringHelper& x) { - m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; + m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; return *this; } @@ -23022,7 +22750,8 @@ class MapStringInnerAliasBoundedWStringHelper * @param _var_map_string_inneraliasboundedwstringhelper New value to be copied in member var_map_string_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_string_inneraliasboundedwstringhelper( - const std::map& _var_map_string_inneraliasboundedwstringhelper) + const std::map& _var_map_string_inneraliasboundedwstringhelper) { m_var_map_string_inneraliasboundedwstringhelper = _var_map_string_inneraliasboundedwstringhelper; } @@ -23041,7 +22770,8 @@ class MapStringInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_string_inneraliasboundedwstringhelper * @return Constant reference to member var_map_string_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedwstringhelper() const { return m_var_map_string_inneraliasboundedwstringhelper; } @@ -23050,13 +22780,12 @@ class MapStringInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_string_inneraliasboundedwstringhelper * @return Reference to member var_map_string_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_string_inneraliasboundedwstringhelper() { return m_var_map_string_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_string_inneraliasboundedwstringhelper; @@ -23091,7 +22820,7 @@ class MapStringInnerEnumHelper eProsima_user_DllExport MapStringInnerEnumHelper( const MapStringInnerEnumHelper& x) { - m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; + m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; } @@ -23113,7 +22842,7 @@ class MapStringInnerEnumHelper const MapStringInnerEnumHelper& x) { - m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; + m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; return *this; } @@ -23188,8 +22917,6 @@ class MapStringInnerEnumHelper return m_var_map_string_innerenumhelper; } - - private: std::map m_var_map_string_innerenumhelper; @@ -23224,7 +22951,7 @@ class MapStringInnerBitMaskHelper eProsima_user_DllExport MapStringInnerBitMaskHelper( const MapStringInnerBitMaskHelper& x) { - m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; + m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; } @@ -23246,7 +22973,7 @@ class MapStringInnerBitMaskHelper const MapStringInnerBitMaskHelper& x) { - m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; + m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; return *this; } @@ -23321,8 +23048,6 @@ class MapStringInnerBitMaskHelper return m_var_map_string_innerbitmaskhelper; } - - private: std::map m_var_map_string_innerbitmaskhelper; @@ -23357,7 +23082,7 @@ class MapStringInnerAliasHelper eProsima_user_DllExport MapStringInnerAliasHelper( const MapStringInnerAliasHelper& x) { - m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; + m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; } @@ -23379,7 +23104,7 @@ class MapStringInnerAliasHelper const MapStringInnerAliasHelper& x) { - m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; + m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; return *this; } @@ -23454,8 +23179,6 @@ class MapStringInnerAliasHelper return m_var_map_string_inneraliashelper; } - - private: std::map m_var_map_string_inneraliashelper; @@ -23490,7 +23213,7 @@ class MapStringInnerAliasArrayHelper eProsima_user_DllExport MapStringInnerAliasArrayHelper( const MapStringInnerAliasArrayHelper& x) { - m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; + m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; } @@ -23512,7 +23235,7 @@ class MapStringInnerAliasArrayHelper const MapStringInnerAliasArrayHelper& x) { - m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; + m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; return *this; } @@ -23573,7 +23296,8 @@ class MapStringInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_string_inneraliasarrayhelper * @return Constant reference to member var_map_string_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasarrayhelper() const { return m_var_map_string_inneraliasarrayhelper; } @@ -23587,8 +23311,6 @@ class MapStringInnerAliasArrayHelper return m_var_map_string_inneraliasarrayhelper; } - - private: std::map m_var_map_string_inneraliasarrayhelper; @@ -23623,7 +23345,7 @@ class MapStringInnerAliasSequenceHelper eProsima_user_DllExport MapStringInnerAliasSequenceHelper( const MapStringInnerAliasSequenceHelper& x) { - m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; + m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; } @@ -23645,7 +23367,7 @@ class MapStringInnerAliasSequenceHelper const MapStringInnerAliasSequenceHelper& x) { - m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; + m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; return *this; } @@ -23706,7 +23428,8 @@ class MapStringInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_string_inneraliassequencehelper * @return Constant reference to member var_map_string_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliassequencehelper() const { return m_var_map_string_inneraliassequencehelper; } @@ -23715,13 +23438,12 @@ class MapStringInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_string_inneraliassequencehelper * @return Reference to member var_map_string_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_string_inneraliassequencehelper() { return m_var_map_string_inneraliassequencehelper; } - - private: std::map m_var_map_string_inneraliassequencehelper; @@ -23756,7 +23478,7 @@ class MapStringInnerAliasMapHelper eProsima_user_DllExport MapStringInnerAliasMapHelper( const MapStringInnerAliasMapHelper& x) { - m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; + m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; } @@ -23778,7 +23500,7 @@ class MapStringInnerAliasMapHelper const MapStringInnerAliasMapHelper& x) { - m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; + m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; return *this; } @@ -23839,7 +23561,8 @@ class MapStringInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_string_inneraliasmaphelper * @return Constant reference to member var_map_string_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasmaphelper() const { return m_var_map_string_inneraliasmaphelper; } @@ -23853,8 +23576,6 @@ class MapStringInnerAliasMapHelper return m_var_map_string_inneraliasmaphelper; } - - private: std::map m_var_map_string_inneraliasmaphelper; @@ -23889,7 +23610,7 @@ class MapStringInnerUnionHelper eProsima_user_DllExport MapStringInnerUnionHelper( const MapStringInnerUnionHelper& x) { - m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; + m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; } @@ -23911,7 +23632,7 @@ class MapStringInnerUnionHelper const MapStringInnerUnionHelper& x) { - m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; + m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; return *this; } @@ -23986,8 +23707,6 @@ class MapStringInnerUnionHelper return m_var_map_string_innerunionhelper; } - - private: std::map m_var_map_string_innerunionhelper; @@ -24022,7 +23741,7 @@ class MapStringInnerStructureHelper eProsima_user_DllExport MapStringInnerStructureHelper( const MapStringInnerStructureHelper& x) { - m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; + m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; } @@ -24044,7 +23763,7 @@ class MapStringInnerStructureHelper const MapStringInnerStructureHelper& x) { - m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; + m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; return *this; } @@ -24105,7 +23824,8 @@ class MapStringInnerStructureHelper * @brief This function returns a constant reference to member var_map_string_innerstructurehelper * @return Constant reference to member var_map_string_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_string_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_string_innerstructurehelper() const { return m_var_map_string_innerstructurehelper; } @@ -24119,8 +23839,6 @@ class MapStringInnerStructureHelper return m_var_map_string_innerstructurehelper; } - - private: std::map m_var_map_string_innerstructurehelper; @@ -24155,7 +23873,7 @@ class MapStringInnerBitsetHelper eProsima_user_DllExport MapStringInnerBitsetHelper( const MapStringInnerBitsetHelper& x) { - m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; + m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; } @@ -24177,7 +23895,7 @@ class MapStringInnerBitsetHelper const MapStringInnerBitsetHelper& x) { - m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; + m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; return *this; } @@ -24252,8 +23970,6 @@ class MapStringInnerBitsetHelper return m_var_map_string_innerbitsethelper; } - - private: std::map m_var_map_string_innerbitsethelper; @@ -24288,7 +24004,7 @@ class MapWStringShort eProsima_user_DllExport MapWStringShort( const MapWStringShort& x) { - m_var_map_wstring_short = x.m_var_map_wstring_short; + m_var_map_wstring_short = x.m_var_map_wstring_short; } @@ -24310,7 +24026,7 @@ class MapWStringShort const MapWStringShort& x) { - m_var_map_wstring_short = x.m_var_map_wstring_short; + m_var_map_wstring_short = x.m_var_map_wstring_short; return *this; } @@ -24385,8 +24101,6 @@ class MapWStringShort return m_var_map_wstring_short; } - - private: std::map m_var_map_wstring_short; @@ -24421,7 +24135,7 @@ class MapWStringUShort eProsima_user_DllExport MapWStringUShort( const MapWStringUShort& x) { - m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; + m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; } @@ -24443,7 +24157,7 @@ class MapWStringUShort const MapWStringUShort& x) { - m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; + m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; return *this; } @@ -24518,8 +24232,6 @@ class MapWStringUShort return m_var_map_wstring_ushort; } - - private: std::map m_var_map_wstring_ushort; @@ -24554,7 +24266,7 @@ class MapWStringLong eProsima_user_DllExport MapWStringLong( const MapWStringLong& x) { - m_var_map_wstring_long = x.m_var_map_wstring_long; + m_var_map_wstring_long = x.m_var_map_wstring_long; } @@ -24576,7 +24288,7 @@ class MapWStringLong const MapWStringLong& x) { - m_var_map_wstring_long = x.m_var_map_wstring_long; + m_var_map_wstring_long = x.m_var_map_wstring_long; return *this; } @@ -24651,8 +24363,6 @@ class MapWStringLong return m_var_map_wstring_long; } - - private: std::map m_var_map_wstring_long; @@ -24687,7 +24397,7 @@ class MapWStringULong eProsima_user_DllExport MapWStringULong( const MapWStringULong& x) { - m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; + m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; } @@ -24709,7 +24419,7 @@ class MapWStringULong const MapWStringULong& x) { - m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; + m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; return *this; } @@ -24784,8 +24494,6 @@ class MapWStringULong return m_var_map_wstring_ulong; } - - private: std::map m_var_map_wstring_ulong; @@ -24820,7 +24528,7 @@ class MapWStringLongLong eProsima_user_DllExport MapWStringLongLong( const MapWStringLongLong& x) { - m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; + m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; } @@ -24842,7 +24550,7 @@ class MapWStringLongLong const MapWStringLongLong& x) { - m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; + m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; return *this; } @@ -24917,8 +24625,6 @@ class MapWStringLongLong return m_var_map_wstring_longlong; } - - private: std::map m_var_map_wstring_longlong; @@ -24953,7 +24659,7 @@ class MapWStringULongLong eProsima_user_DllExport MapWStringULongLong( const MapWStringULongLong& x) { - m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; + m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; } @@ -24975,7 +24681,7 @@ class MapWStringULongLong const MapWStringULongLong& x) { - m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; + m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; return *this; } @@ -25050,8 +24756,6 @@ class MapWStringULongLong return m_var_map_wstring_ulonglong; } - - private: std::map m_var_map_wstring_ulonglong; @@ -25086,7 +24790,7 @@ class MapWStringFloat eProsima_user_DllExport MapWStringFloat( const MapWStringFloat& x) { - m_var_map_wstring_float = x.m_var_map_wstring_float; + m_var_map_wstring_float = x.m_var_map_wstring_float; } @@ -25108,7 +24812,7 @@ class MapWStringFloat const MapWStringFloat& x) { - m_var_map_wstring_float = x.m_var_map_wstring_float; + m_var_map_wstring_float = x.m_var_map_wstring_float; return *this; } @@ -25183,8 +24887,6 @@ class MapWStringFloat return m_var_map_wstring_float; } - - private: std::map m_var_map_wstring_float; @@ -25219,7 +24921,7 @@ class MapWStringDouble eProsima_user_DllExport MapWStringDouble( const MapWStringDouble& x) { - m_var_map_wstring_double = x.m_var_map_wstring_double; + m_var_map_wstring_double = x.m_var_map_wstring_double; } @@ -25241,7 +24943,7 @@ class MapWStringDouble const MapWStringDouble& x) { - m_var_map_wstring_double = x.m_var_map_wstring_double; + m_var_map_wstring_double = x.m_var_map_wstring_double; return *this; } @@ -25316,8 +25018,6 @@ class MapWStringDouble return m_var_map_wstring_double; } - - private: std::map m_var_map_wstring_double; @@ -25352,7 +25052,7 @@ class MapWStringLongDouble eProsima_user_DllExport MapWStringLongDouble( const MapWStringLongDouble& x) { - m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; + m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; } @@ -25374,7 +25074,7 @@ class MapWStringLongDouble const MapWStringLongDouble& x) { - m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; + m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; return *this; } @@ -25449,8 +25149,6 @@ class MapWStringLongDouble return m_var_map_wstring_longdouble; } - - private: std::map m_var_map_wstring_longdouble; @@ -25485,7 +25183,7 @@ class MapWStringBoolean eProsima_user_DllExport MapWStringBoolean( const MapWStringBoolean& x) { - m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; + m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; } @@ -25507,7 +25205,7 @@ class MapWStringBoolean const MapWStringBoolean& x) { - m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; + m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; return *this; } @@ -25582,8 +25280,6 @@ class MapWStringBoolean return m_var_map_wstring_boolean; } - - private: std::map m_var_map_wstring_boolean; @@ -25618,7 +25314,7 @@ class MapWStringOctet eProsima_user_DllExport MapWStringOctet( const MapWStringOctet& x) { - m_var_map_wstring_octet = x.m_var_map_wstring_octet; + m_var_map_wstring_octet = x.m_var_map_wstring_octet; } @@ -25640,7 +25336,7 @@ class MapWStringOctet const MapWStringOctet& x) { - m_var_map_wstring_octet = x.m_var_map_wstring_octet; + m_var_map_wstring_octet = x.m_var_map_wstring_octet; return *this; } @@ -25715,8 +25411,6 @@ class MapWStringOctet return m_var_map_wstring_octet; } - - private: std::map m_var_map_wstring_octet; @@ -25751,7 +25445,7 @@ class MapWStringChar eProsima_user_DllExport MapWStringChar( const MapWStringChar& x) { - m_var_map_wstring_char = x.m_var_map_wstring_char; + m_var_map_wstring_char = x.m_var_map_wstring_char; } @@ -25773,7 +25467,7 @@ class MapWStringChar const MapWStringChar& x) { - m_var_map_wstring_char = x.m_var_map_wstring_char; + m_var_map_wstring_char = x.m_var_map_wstring_char; return *this; } @@ -25848,8 +25542,6 @@ class MapWStringChar return m_var_map_wstring_char; } - - private: std::map m_var_map_wstring_char; @@ -25884,7 +25576,7 @@ class MapWStringWChar eProsima_user_DllExport MapWStringWChar( const MapWStringWChar& x) { - m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; + m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; } @@ -25906,7 +25598,7 @@ class MapWStringWChar const MapWStringWChar& x) { - m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; + m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; return *this; } @@ -25981,8 +25673,6 @@ class MapWStringWChar return m_var_map_wstring_wchar; } - - private: std::map m_var_map_wstring_wchar; @@ -26017,7 +25707,7 @@ class MapWStringString eProsima_user_DllExport MapWStringString( const MapWStringString& x) { - m_var_map_wstring_string = x.m_var_map_wstring_string; + m_var_map_wstring_string = x.m_var_map_wstring_string; } @@ -26039,7 +25729,7 @@ class MapWStringString const MapWStringString& x) { - m_var_map_wstring_string = x.m_var_map_wstring_string; + m_var_map_wstring_string = x.m_var_map_wstring_string; return *this; } @@ -26114,8 +25804,6 @@ class MapWStringString return m_var_map_wstring_string; } - - private: std::map m_var_map_wstring_string; @@ -26150,7 +25838,7 @@ class MapWStringWString eProsima_user_DllExport MapWStringWString( const MapWStringWString& x) { - m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; + m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; } @@ -26172,7 +25860,7 @@ class MapWStringWString const MapWStringWString& x) { - m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; + m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; return *this; } @@ -26247,8 +25935,6 @@ class MapWStringWString return m_var_map_wstring_wstring; } - - private: std::map m_var_map_wstring_wstring; @@ -26283,7 +25969,7 @@ class MapWStringInnerAliasBoundedStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedStringHelper( const MapWStringInnerAliasBoundedStringHelper& x) { - m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; + m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; } @@ -26305,7 +25991,7 @@ class MapWStringInnerAliasBoundedStringHelper const MapWStringInnerAliasBoundedStringHelper& x) { - m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; + m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; return *this; } @@ -26347,7 +26033,8 @@ class MapWStringInnerAliasBoundedStringHelper * @param _var_map_wstring_inneraliasboundedstringhelper New value to be copied in member var_map_wstring_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedstringhelper( - const std::map& _var_map_wstring_inneraliasboundedstringhelper) + const std::map& _var_map_wstring_inneraliasboundedstringhelper) { m_var_map_wstring_inneraliasboundedstringhelper = _var_map_wstring_inneraliasboundedstringhelper; } @@ -26366,7 +26053,8 @@ class MapWStringInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasboundedstringhelper * @return Constant reference to member var_map_wstring_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedstringhelper() const { return m_var_map_wstring_inneraliasboundedstringhelper; } @@ -26375,13 +26063,12 @@ class MapWStringInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_wstring_inneraliasboundedstringhelper * @return Reference to member var_map_wstring_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedstringhelper() { return m_var_map_wstring_inneraliasboundedstringhelper; } - - private: std::map m_var_map_wstring_inneraliasboundedstringhelper; @@ -26416,7 +26103,7 @@ class MapWStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedWStringHelper( const MapWStringInnerAliasBoundedWStringHelper& x) { - m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; + m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; } @@ -26427,7 +26114,8 @@ class MapWStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedWStringHelper( MapWStringInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_wstring_inneraliasboundedwstringhelper = std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); + m_var_map_wstring_inneraliasboundedwstringhelper = + std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); } /*! @@ -26438,7 +26126,7 @@ class MapWStringInnerAliasBoundedWStringHelper const MapWStringInnerAliasBoundedWStringHelper& x) { - m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; + m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; return *this; } @@ -26451,7 +26139,8 @@ class MapWStringInnerAliasBoundedWStringHelper MapWStringInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_wstring_inneraliasboundedwstringhelper = std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); + m_var_map_wstring_inneraliasboundedwstringhelper = + std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); return *this; } @@ -26480,7 +26169,8 @@ class MapWStringInnerAliasBoundedWStringHelper * @param _var_map_wstring_inneraliasboundedwstringhelper New value to be copied in member var_map_wstring_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedwstringhelper( - const std::map& _var_map_wstring_inneraliasboundedwstringhelper) + const std::map& _var_map_wstring_inneraliasboundedwstringhelper) { m_var_map_wstring_inneraliasboundedwstringhelper = _var_map_wstring_inneraliasboundedwstringhelper; } @@ -26490,7 +26180,8 @@ class MapWStringInnerAliasBoundedWStringHelper * @param _var_map_wstring_inneraliasboundedwstringhelper New value to be moved in member var_map_wstring_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedwstringhelper( - std::map&& _var_map_wstring_inneraliasboundedwstringhelper) + std::map&& _var_map_wstring_inneraliasboundedwstringhelper) { m_var_map_wstring_inneraliasboundedwstringhelper = std::move(_var_map_wstring_inneraliasboundedwstringhelper); } @@ -26499,7 +26190,8 @@ class MapWStringInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasboundedwstringhelper * @return Constant reference to member var_map_wstring_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedwstringhelper() const { return m_var_map_wstring_inneraliasboundedwstringhelper; } @@ -26508,13 +26200,12 @@ class MapWStringInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_wstring_inneraliasboundedwstringhelper * @return Reference to member var_map_wstring_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedwstringhelper() { return m_var_map_wstring_inneraliasboundedwstringhelper; } - - private: std::map m_var_map_wstring_inneraliasboundedwstringhelper; @@ -26549,7 +26240,7 @@ class MapWStringInnerEnumHelper eProsima_user_DllExport MapWStringInnerEnumHelper( const MapWStringInnerEnumHelper& x) { - m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; + m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; } @@ -26571,7 +26262,7 @@ class MapWStringInnerEnumHelper const MapWStringInnerEnumHelper& x) { - m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; + m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; return *this; } @@ -26646,8 +26337,6 @@ class MapWStringInnerEnumHelper return m_var_map_wstring_innerenumhelper; } - - private: std::map m_var_map_wstring_innerenumhelper; @@ -26682,7 +26371,7 @@ class MapWStringInnerBitMaskHelper eProsima_user_DllExport MapWStringInnerBitMaskHelper( const MapWStringInnerBitMaskHelper& x) { - m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; + m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; } @@ -26704,7 +26393,7 @@ class MapWStringInnerBitMaskHelper const MapWStringInnerBitMaskHelper& x) { - m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; + m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; return *this; } @@ -26779,8 +26468,6 @@ class MapWStringInnerBitMaskHelper return m_var_map_wstring_innerbitmaskhelper; } - - private: std::map m_var_map_wstring_innerbitmaskhelper; @@ -26815,7 +26502,7 @@ class MapWStringInnerAliasHelper eProsima_user_DllExport MapWStringInnerAliasHelper( const MapWStringInnerAliasHelper& x) { - m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; + m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; } @@ -26837,7 +26524,7 @@ class MapWStringInnerAliasHelper const MapWStringInnerAliasHelper& x) { - m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; + m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; return *this; } @@ -26912,8 +26599,6 @@ class MapWStringInnerAliasHelper return m_var_map_wstring_inneraliashelper; } - - private: std::map m_var_map_wstring_inneraliashelper; @@ -26948,7 +26633,7 @@ class MapWStringInnerAliasArrayHelper eProsima_user_DllExport MapWStringInnerAliasArrayHelper( const MapWStringInnerAliasArrayHelper& x) { - m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; + m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; } @@ -26970,7 +26655,7 @@ class MapWStringInnerAliasArrayHelper const MapWStringInnerAliasArrayHelper& x) { - m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; + m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; return *this; } @@ -27031,7 +26716,8 @@ class MapWStringInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasarrayhelper * @return Constant reference to member var_map_wstring_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasarrayhelper() const { return m_var_map_wstring_inneraliasarrayhelper; } @@ -27045,8 +26731,6 @@ class MapWStringInnerAliasArrayHelper return m_var_map_wstring_inneraliasarrayhelper; } - - private: std::map m_var_map_wstring_inneraliasarrayhelper; @@ -27081,7 +26765,7 @@ class MapWStringInnerAliasSequenceHelper eProsima_user_DllExport MapWStringInnerAliasSequenceHelper( const MapWStringInnerAliasSequenceHelper& x) { - m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; + m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; } @@ -27103,7 +26787,7 @@ class MapWStringInnerAliasSequenceHelper const MapWStringInnerAliasSequenceHelper& x) { - m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; + m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; return *this; } @@ -27164,7 +26848,8 @@ class MapWStringInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliassequencehelper * @return Constant reference to member var_map_wstring_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliassequencehelper() const { return m_var_map_wstring_inneraliassequencehelper; } @@ -27173,13 +26858,12 @@ class MapWStringInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_wstring_inneraliassequencehelper * @return Reference to member var_map_wstring_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliassequencehelper() { return m_var_map_wstring_inneraliassequencehelper; } - - private: std::map m_var_map_wstring_inneraliassequencehelper; @@ -27214,7 +26898,7 @@ class MapWStringInnerAliasMapHelper eProsima_user_DllExport MapWStringInnerAliasMapHelper( const MapWStringInnerAliasMapHelper& x) { - m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; + m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; } @@ -27236,7 +26920,7 @@ class MapWStringInnerAliasMapHelper const MapWStringInnerAliasMapHelper& x) { - m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; + m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; return *this; } @@ -27297,7 +26981,8 @@ class MapWStringInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasmaphelper * @return Constant reference to member var_map_wstring_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasmaphelper() const { return m_var_map_wstring_inneraliasmaphelper; } @@ -27311,8 +26996,6 @@ class MapWStringInnerAliasMapHelper return m_var_map_wstring_inneraliasmaphelper; } - - private: std::map m_var_map_wstring_inneraliasmaphelper; @@ -27347,7 +27030,7 @@ class MapWStringInnerUnionHelper eProsima_user_DllExport MapWStringInnerUnionHelper( const MapWStringInnerUnionHelper& x) { - m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; + m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; } @@ -27369,7 +27052,7 @@ class MapWStringInnerUnionHelper const MapWStringInnerUnionHelper& x) { - m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; + m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; return *this; } @@ -27444,8 +27127,6 @@ class MapWStringInnerUnionHelper return m_var_map_wstring_innerunionhelper; } - - private: std::map m_var_map_wstring_innerunionhelper; @@ -27480,7 +27161,7 @@ class MapWStringInnerStructureHelper eProsima_user_DllExport MapWStringInnerStructureHelper( const MapWStringInnerStructureHelper& x) { - m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; + m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; } @@ -27502,7 +27183,7 @@ class MapWStringInnerStructureHelper const MapWStringInnerStructureHelper& x) { - m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; + m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; return *this; } @@ -27563,7 +27244,8 @@ class MapWStringInnerStructureHelper * @brief This function returns a constant reference to member var_map_wstring_innerstructurehelper * @return Constant reference to member var_map_wstring_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_wstring_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_wstring_innerstructurehelper() const { return m_var_map_wstring_innerstructurehelper; } @@ -27577,8 +27259,6 @@ class MapWStringInnerStructureHelper return m_var_map_wstring_innerstructurehelper; } - - private: std::map m_var_map_wstring_innerstructurehelper; @@ -27613,7 +27293,7 @@ class MapWStringInnerBitsetHelper eProsima_user_DllExport MapWStringInnerBitsetHelper( const MapWStringInnerBitsetHelper& x) { - m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; + m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; } @@ -27635,7 +27315,7 @@ class MapWStringInnerBitsetHelper const MapWStringInnerBitsetHelper& x) { - m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; + m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; return *this; } @@ -27710,8 +27390,6 @@ class MapWStringInnerBitsetHelper return m_var_map_wstring_innerbitsethelper; } - - private: std::map m_var_map_wstring_innerbitsethelper; @@ -27746,7 +27424,7 @@ class MapInnerAliasBoundedStringHelperShort eProsima_user_DllExport MapInnerAliasBoundedStringHelperShort( const MapInnerAliasBoundedStringHelperShort& x) { - m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; + m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; } @@ -27768,7 +27446,7 @@ class MapInnerAliasBoundedStringHelperShort const MapInnerAliasBoundedStringHelperShort& x) { - m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; + m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; return *this; } @@ -27829,7 +27507,8 @@ class MapInnerAliasBoundedStringHelperShort * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_short * @return Constant reference to member var_map_inneraliasboundedstringhelper_short */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_short() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_short() const { return m_var_map_inneraliasboundedstringhelper_short; } @@ -27838,13 +27517,12 @@ class MapInnerAliasBoundedStringHelperShort * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_short * @return Reference to member var_map_inneraliasboundedstringhelper_short */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_short() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_short() { return m_var_map_inneraliasboundedstringhelper_short; } - - private: std::map m_var_map_inneraliasboundedstringhelper_short; @@ -27879,7 +27557,7 @@ class MapInnerAliasBoundedStringHelperUShort eProsima_user_DllExport MapInnerAliasBoundedStringHelperUShort( const MapInnerAliasBoundedStringHelperUShort& x) { - m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; + m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; } @@ -27901,7 +27579,7 @@ class MapInnerAliasBoundedStringHelperUShort const MapInnerAliasBoundedStringHelperUShort& x) { - m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; + m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; return *this; } @@ -27962,7 +27640,8 @@ class MapInnerAliasBoundedStringHelperUShort * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ushort * @return Constant reference to member var_map_inneraliasboundedstringhelper_ushort */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ushort() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ushort() const { return m_var_map_inneraliasboundedstringhelper_ushort; } @@ -27971,13 +27650,12 @@ class MapInnerAliasBoundedStringHelperUShort * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ushort * @return Reference to member var_map_inneraliasboundedstringhelper_ushort */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ushort() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ushort() { return m_var_map_inneraliasboundedstringhelper_ushort; } - - private: std::map m_var_map_inneraliasboundedstringhelper_ushort; @@ -28012,7 +27690,7 @@ class MapInnerAliasBoundedStringHelperLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLong( const MapInnerAliasBoundedStringHelperLong& x) { - m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; + m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; } @@ -28034,7 +27712,7 @@ class MapInnerAliasBoundedStringHelperLong const MapInnerAliasBoundedStringHelperLong& x) { - m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; + m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; return *this; } @@ -28095,7 +27773,8 @@ class MapInnerAliasBoundedStringHelperLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_long * @return Constant reference to member var_map_inneraliasboundedstringhelper_long */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_long() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_long() const { return m_var_map_inneraliasboundedstringhelper_long; } @@ -28104,13 +27783,12 @@ class MapInnerAliasBoundedStringHelperLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_long * @return Reference to member var_map_inneraliasboundedstringhelper_long */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_long() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_long() { return m_var_map_inneraliasboundedstringhelper_long; } - - private: std::map m_var_map_inneraliasboundedstringhelper_long; @@ -28145,7 +27823,7 @@ class MapInnerAliasBoundedStringHelperULong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULong( const MapInnerAliasBoundedStringHelperULong& x) { - m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; + m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; } @@ -28167,7 +27845,7 @@ class MapInnerAliasBoundedStringHelperULong const MapInnerAliasBoundedStringHelperULong& x) { - m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; + m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; return *this; } @@ -28228,7 +27906,8 @@ class MapInnerAliasBoundedStringHelperULong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ulong * @return Constant reference to member var_map_inneraliasboundedstringhelper_ulong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulong() const { return m_var_map_inneraliasboundedstringhelper_ulong; } @@ -28237,13 +27916,12 @@ class MapInnerAliasBoundedStringHelperULong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ulong * @return Reference to member var_map_inneraliasboundedstringhelper_ulong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulong() { return m_var_map_inneraliasboundedstringhelper_ulong; } - - private: std::map m_var_map_inneraliasboundedstringhelper_ulong; @@ -28278,7 +27956,7 @@ class MapInnerAliasBoundedStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongLong( const MapInnerAliasBoundedStringHelperLongLong& x) { - m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; + m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; } @@ -28289,7 +27967,8 @@ class MapInnerAliasBoundedStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongLong( MapInnerAliasBoundedStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); + m_var_map_inneraliasboundedstringhelper_longlong = + std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); } /*! @@ -28300,7 +27979,7 @@ class MapInnerAliasBoundedStringHelperLongLong const MapInnerAliasBoundedStringHelperLongLong& x) { - m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; + m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; return *this; } @@ -28313,7 +27992,8 @@ class MapInnerAliasBoundedStringHelperLongLong MapInnerAliasBoundedStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); + m_var_map_inneraliasboundedstringhelper_longlong = + std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); return *this; } @@ -28361,7 +28041,8 @@ class MapInnerAliasBoundedStringHelperLongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_longlong * @return Constant reference to member var_map_inneraliasboundedstringhelper_longlong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longlong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longlong() const { return m_var_map_inneraliasboundedstringhelper_longlong; } @@ -28370,13 +28051,12 @@ class MapInnerAliasBoundedStringHelperLongLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_longlong * @return Reference to member var_map_inneraliasboundedstringhelper_longlong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longlong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longlong() { return m_var_map_inneraliasboundedstringhelper_longlong; } - - private: std::map m_var_map_inneraliasboundedstringhelper_longlong; @@ -28411,7 +28091,7 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULongLong( const MapInnerAliasBoundedStringHelperULongLong& x) { - m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; + m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28422,7 +28102,8 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULongLong( MapInnerAliasBoundedStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); + m_var_map_inneraliasboundedstringhelper_ulonglong = + std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); } /*! @@ -28433,7 +28114,7 @@ class MapInnerAliasBoundedStringHelperULongLong const MapInnerAliasBoundedStringHelperULongLong& x) { - m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; + m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; return *this; } @@ -28446,7 +28127,8 @@ class MapInnerAliasBoundedStringHelperULongLong MapInnerAliasBoundedStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); + m_var_map_inneraliasboundedstringhelper_ulonglong = + std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); return *this; } @@ -28457,7 +28139,8 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperULongLong& x) const { - return (m_var_map_inneraliasboundedstringhelper_ulonglong == x.m_var_map_inneraliasboundedstringhelper_ulonglong); + return (m_var_map_inneraliasboundedstringhelper_ulonglong == + x.m_var_map_inneraliasboundedstringhelper_ulonglong); } /*! @@ -28475,7 +28158,8 @@ class MapInnerAliasBoundedStringHelperULongLong * @param _var_map_inneraliasboundedstringhelper_ulonglong New value to be copied in member var_map_inneraliasboundedstringhelper_ulonglong */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_ulonglong( - const std::map& _var_map_inneraliasboundedstringhelper_ulonglong) + const std::map& _var_map_inneraliasboundedstringhelper_ulonglong) { m_var_map_inneraliasboundedstringhelper_ulonglong = _var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28494,7 +28178,8 @@ class MapInnerAliasBoundedStringHelperULongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ulonglong * @return Constant reference to member var_map_inneraliasboundedstringhelper_ulonglong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulonglong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulonglong() const { return m_var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28503,13 +28188,12 @@ class MapInnerAliasBoundedStringHelperULongLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ulonglong * @return Reference to member var_map_inneraliasboundedstringhelper_ulonglong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulonglong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulonglong() { return m_var_map_inneraliasboundedstringhelper_ulonglong; } - - private: std::map m_var_map_inneraliasboundedstringhelper_ulonglong; @@ -28544,7 +28228,7 @@ class MapInnerAliasBoundedStringHelperFloat eProsima_user_DllExport MapInnerAliasBoundedStringHelperFloat( const MapInnerAliasBoundedStringHelperFloat& x) { - m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; + m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; } @@ -28566,7 +28250,7 @@ class MapInnerAliasBoundedStringHelperFloat const MapInnerAliasBoundedStringHelperFloat& x) { - m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; + m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; return *this; } @@ -28627,7 +28311,8 @@ class MapInnerAliasBoundedStringHelperFloat * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_float * @return Constant reference to member var_map_inneraliasboundedstringhelper_float */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_float() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_float() const { return m_var_map_inneraliasboundedstringhelper_float; } @@ -28636,13 +28321,12 @@ class MapInnerAliasBoundedStringHelperFloat * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_float * @return Reference to member var_map_inneraliasboundedstringhelper_float */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_float() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_float() { return m_var_map_inneraliasboundedstringhelper_float; } - - private: std::map m_var_map_inneraliasboundedstringhelper_float; @@ -28677,7 +28361,7 @@ class MapInnerAliasBoundedStringHelperDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperDouble( const MapInnerAliasBoundedStringHelperDouble& x) { - m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; + m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; } @@ -28699,7 +28383,7 @@ class MapInnerAliasBoundedStringHelperDouble const MapInnerAliasBoundedStringHelperDouble& x) { - m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; + m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; return *this; } @@ -28760,7 +28444,8 @@ class MapInnerAliasBoundedStringHelperDouble * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_double * @return Constant reference to member var_map_inneraliasboundedstringhelper_double */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_double() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_double() const { return m_var_map_inneraliasboundedstringhelper_double; } @@ -28769,13 +28454,12 @@ class MapInnerAliasBoundedStringHelperDouble * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_double * @return Reference to member var_map_inneraliasboundedstringhelper_double */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_double() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_double() { return m_var_map_inneraliasboundedstringhelper_double; } - - private: std::map m_var_map_inneraliasboundedstringhelper_double; @@ -28810,7 +28494,7 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongDouble( const MapInnerAliasBoundedStringHelperLongDouble& x) { - m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; + m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; } @@ -28821,7 +28505,8 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongDouble( MapInnerAliasBoundedStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = + std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); } /*! @@ -28832,7 +28517,7 @@ class MapInnerAliasBoundedStringHelperLongDouble const MapInnerAliasBoundedStringHelperLongDouble& x) { - m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; + m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; return *this; } @@ -28845,7 +28530,8 @@ class MapInnerAliasBoundedStringHelperLongDouble MapInnerAliasBoundedStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = + std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); return *this; } @@ -28856,7 +28542,8 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperLongDouble& x) const { - return (m_var_map_inneraliasboundedstringhelper_longdouble == x.m_var_map_inneraliasboundedstringhelper_longdouble); + return (m_var_map_inneraliasboundedstringhelper_longdouble == + x.m_var_map_inneraliasboundedstringhelper_longdouble); } /*! @@ -28874,7 +28561,8 @@ class MapInnerAliasBoundedStringHelperLongDouble * @param _var_map_inneraliasboundedstringhelper_longdouble New value to be copied in member var_map_inneraliasboundedstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_longdouble( - const std::map& _var_map_inneraliasboundedstringhelper_longdouble) + const std::map& _var_map_inneraliasboundedstringhelper_longdouble) { m_var_map_inneraliasboundedstringhelper_longdouble = _var_map_inneraliasboundedstringhelper_longdouble; } @@ -28884,16 +28572,19 @@ class MapInnerAliasBoundedStringHelperLongDouble * @param _var_map_inneraliasboundedstringhelper_longdouble New value to be moved in member var_map_inneraliasboundedstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_longdouble( - std::map&& _var_map_inneraliasboundedstringhelper_longdouble) + std::map&& _var_map_inneraliasboundedstringhelper_longdouble) { - m_var_map_inneraliasboundedstringhelper_longdouble = std::move(_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = + std::move(_var_map_inneraliasboundedstringhelper_longdouble); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_longdouble * @return Constant reference to member var_map_inneraliasboundedstringhelper_longdouble */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longdouble() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longdouble() const { return m_var_map_inneraliasboundedstringhelper_longdouble; } @@ -28902,13 +28593,12 @@ class MapInnerAliasBoundedStringHelperLongDouble * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_longdouble * @return Reference to member var_map_inneraliasboundedstringhelper_longdouble */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longdouble() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longdouble() { return m_var_map_inneraliasboundedstringhelper_longdouble; } - - private: std::map m_var_map_inneraliasboundedstringhelper_longdouble; @@ -28943,7 +28633,7 @@ class MapInnerAliasBoundedStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedStringHelperBoolean( const MapInnerAliasBoundedStringHelperBoolean& x) { - m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; + m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; } @@ -28965,7 +28655,7 @@ class MapInnerAliasBoundedStringHelperBoolean const MapInnerAliasBoundedStringHelperBoolean& x) { - m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; + m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; return *this; } @@ -29026,7 +28716,8 @@ class MapInnerAliasBoundedStringHelperBoolean * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_boolean * @return Constant reference to member var_map_inneraliasboundedstringhelper_boolean */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_boolean() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_boolean() const { return m_var_map_inneraliasboundedstringhelper_boolean; } @@ -29035,13 +28726,12 @@ class MapInnerAliasBoundedStringHelperBoolean * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_boolean * @return Reference to member var_map_inneraliasboundedstringhelper_boolean */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_boolean() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_boolean() { return m_var_map_inneraliasboundedstringhelper_boolean; } - - private: std::map m_var_map_inneraliasboundedstringhelper_boolean; @@ -29076,7 +28766,7 @@ class MapInnerAliasBoundedStringHelperOctet eProsima_user_DllExport MapInnerAliasBoundedStringHelperOctet( const MapInnerAliasBoundedStringHelperOctet& x) { - m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; + m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; } @@ -29098,7 +28788,7 @@ class MapInnerAliasBoundedStringHelperOctet const MapInnerAliasBoundedStringHelperOctet& x) { - m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; + m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; return *this; } @@ -29159,7 +28849,8 @@ class MapInnerAliasBoundedStringHelperOctet * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_octet * @return Constant reference to member var_map_inneraliasboundedstringhelper_octet */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_octet() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_octet() const { return m_var_map_inneraliasboundedstringhelper_octet; } @@ -29168,13 +28859,12 @@ class MapInnerAliasBoundedStringHelperOctet * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_octet * @return Reference to member var_map_inneraliasboundedstringhelper_octet */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_octet() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_octet() { return m_var_map_inneraliasboundedstringhelper_octet; } - - private: std::map m_var_map_inneraliasboundedstringhelper_octet; @@ -29209,7 +28899,7 @@ class MapInnerAliasBoundedStringHelperChar eProsima_user_DllExport MapInnerAliasBoundedStringHelperChar( const MapInnerAliasBoundedStringHelperChar& x) { - m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; + m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; } @@ -29231,7 +28921,7 @@ class MapInnerAliasBoundedStringHelperChar const MapInnerAliasBoundedStringHelperChar& x) { - m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; + m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; return *this; } @@ -29292,7 +28982,8 @@ class MapInnerAliasBoundedStringHelperChar * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_char * @return Constant reference to member var_map_inneraliasboundedstringhelper_char */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_char() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_char() const { return m_var_map_inneraliasboundedstringhelper_char; } @@ -29301,13 +28992,12 @@ class MapInnerAliasBoundedStringHelperChar * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_char * @return Reference to member var_map_inneraliasboundedstringhelper_char */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_char() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_char() { return m_var_map_inneraliasboundedstringhelper_char; } - - private: std::map m_var_map_inneraliasboundedstringhelper_char; @@ -29342,7 +29032,7 @@ class MapInnerAliasBoundedStringHelperWChar eProsima_user_DllExport MapInnerAliasBoundedStringHelperWChar( const MapInnerAliasBoundedStringHelperWChar& x) { - m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; + m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; } @@ -29364,7 +29054,7 @@ class MapInnerAliasBoundedStringHelperWChar const MapInnerAliasBoundedStringHelperWChar& x) { - m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; + m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; return *this; } @@ -29425,7 +29115,8 @@ class MapInnerAliasBoundedStringHelperWChar * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_wchar * @return Constant reference to member var_map_inneraliasboundedstringhelper_wchar */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wchar() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wchar() const { return m_var_map_inneraliasboundedstringhelper_wchar; } @@ -29434,13 +29125,12 @@ class MapInnerAliasBoundedStringHelperWChar * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_wchar * @return Reference to member var_map_inneraliasboundedstringhelper_wchar */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wchar() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wchar() { return m_var_map_inneraliasboundedstringhelper_wchar; } - - private: std::map m_var_map_inneraliasboundedstringhelper_wchar; @@ -29475,7 +29165,7 @@ class MapInnerAliasBoundedStringHelperString eProsima_user_DllExport MapInnerAliasBoundedStringHelperString( const MapInnerAliasBoundedStringHelperString& x) { - m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; + m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; } @@ -29497,7 +29187,7 @@ class MapInnerAliasBoundedStringHelperString const MapInnerAliasBoundedStringHelperString& x) { - m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; + m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; return *this; } @@ -29539,7 +29229,8 @@ class MapInnerAliasBoundedStringHelperString * @param _var_map_inneraliasboundedstringhelper_string New value to be copied in member var_map_inneraliasboundedstringhelper_string */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_string( - const std::map& _var_map_inneraliasboundedstringhelper_string) + const std::map& _var_map_inneraliasboundedstringhelper_string) { m_var_map_inneraliasboundedstringhelper_string = _var_map_inneraliasboundedstringhelper_string; } @@ -29558,7 +29249,8 @@ class MapInnerAliasBoundedStringHelperString * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_string * @return Constant reference to member var_map_inneraliasboundedstringhelper_string */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_string() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_string() const { return m_var_map_inneraliasboundedstringhelper_string; } @@ -29567,13 +29259,12 @@ class MapInnerAliasBoundedStringHelperString * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_string * @return Reference to member var_map_inneraliasboundedstringhelper_string */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_string() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_string() { return m_var_map_inneraliasboundedstringhelper_string; } - - private: std::map m_var_map_inneraliasboundedstringhelper_string; @@ -29608,7 +29299,7 @@ class MapInnerAliasBoundedStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedStringHelperWString( const MapInnerAliasBoundedStringHelperWString& x) { - m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; + m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; } @@ -29630,7 +29321,7 @@ class MapInnerAliasBoundedStringHelperWString const MapInnerAliasBoundedStringHelperWString& x) { - m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; + m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; return *this; } @@ -29672,7 +29363,8 @@ class MapInnerAliasBoundedStringHelperWString * @param _var_map_inneraliasboundedstringhelper_wstring New value to be copied in member var_map_inneraliasboundedstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_wstring( - const std::map& _var_map_inneraliasboundedstringhelper_wstring) + const std::map& _var_map_inneraliasboundedstringhelper_wstring) { m_var_map_inneraliasboundedstringhelper_wstring = _var_map_inneraliasboundedstringhelper_wstring; } @@ -29691,7 +29383,8 @@ class MapInnerAliasBoundedStringHelperWString * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_wstring * @return Constant reference to member var_map_inneraliasboundedstringhelper_wstring */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wstring() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wstring() const { return m_var_map_inneraliasboundedstringhelper_wstring; } @@ -29700,13 +29393,12 @@ class MapInnerAliasBoundedStringHelperWString * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_wstring * @return Reference to member var_map_inneraliasboundedstringhelper_wstring */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wstring() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wstring() { return m_var_map_inneraliasboundedstringhelper_wstring; } - - private: std::map m_var_map_inneraliasboundedstringhelper_wstring; @@ -29741,7 +29433,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper( const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } @@ -29752,7 +29445,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper( MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! @@ -29763,7 +29457,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; return *this; } @@ -29776,7 +29471,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); return *this; } @@ -29787,7 +29483,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! @@ -29805,9 +29502,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } /*! @@ -29815,16 +29514,20 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() + const { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } @@ -29833,16 +29536,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; }; /*! @@ -29874,7 +29577,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper( const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } @@ -29885,7 +29589,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper( MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! @@ -29896,7 +29601,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; return *this; } @@ -29909,7 +29615,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); return *this; } @@ -29920,7 +29627,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! @@ -29938,9 +29646,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } /*! @@ -29948,16 +29658,20 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() + const { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } @@ -29966,16 +29680,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; }; /*! @@ -30007,7 +29721,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerEnumHelper( const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; } @@ -30018,7 +29733,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerEnumHelper( MapInnerAliasBoundedStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! @@ -30029,7 +29745,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; return *this; } @@ -30042,7 +29759,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper MapInnerAliasBoundedStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); return *this; } @@ -30053,7 +29771,8 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerenumhelper == x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + return (m_var_map_inneraliasboundedstringhelper_innerenumhelper == + x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! @@ -30071,9 +29790,11 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedstringhelper_innerenumhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerenumhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerenumhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = _var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + _var_map_inneraliasboundedstringhelper_innerenumhelper; } /*! @@ -30081,16 +29802,19 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedstringhelper_innerenumhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerenumhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerenumhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = + std::move(_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerenumhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerenumhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() const { return m_var_map_inneraliasboundedstringhelper_innerenumhelper; } @@ -30099,16 +29823,16 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerenumhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerenumhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() { return m_var_map_inneraliasboundedstringhelper_innerenumhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_innerenumhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerenumhelper; }; /*! @@ -30140,7 +29864,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitMaskHelper( const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } @@ -30151,7 +29876,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitMaskHelper( MapInnerAliasBoundedStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! @@ -30162,7 +29888,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; return *this; } @@ -30175,7 +29902,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper MapInnerAliasBoundedStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); return *this; } @@ -30186,7 +29914,8 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper == x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + return (m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper == + x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! @@ -30204,9 +29933,11 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedstringhelper_innerbitmaskhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitmaskhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = _var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + _var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } /*! @@ -30214,16 +29945,19 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedstringhelper_innerbitmaskhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitmaskhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = + std::move(_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() const { return m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } @@ -30232,16 +29966,16 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() { return m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; }; /*! @@ -30273,7 +30007,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasHelper( const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; } @@ -30284,7 +30019,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasHelper( MapInnerAliasBoundedStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! @@ -30295,7 +30031,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; return *this; } @@ -30308,7 +30045,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper MapInnerAliasBoundedStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); return *this; } @@ -30319,7 +30057,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliashelper == x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliashelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! @@ -30337,9 +30076,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedstringhelper_inneraliashelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliashelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliashelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = _var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + _var_map_inneraliasboundedstringhelper_inneraliashelper; } /*! @@ -30347,16 +30088,19 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedstringhelper_inneraliashelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliashelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliashelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliashelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliashelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliashelper; } @@ -30365,16 +30109,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliashelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliashelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() { return m_var_map_inneraliasboundedstringhelper_inneraliashelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliashelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliashelper; }; /*! @@ -30406,7 +30150,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasArrayHelper( const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } @@ -30417,7 +30162,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasArrayHelper( MapInnerAliasBoundedStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! @@ -30428,7 +30174,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; return *this; } @@ -30441,7 +30188,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper MapInnerAliasBoundedStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); return *this; } @@ -30452,7 +30200,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! @@ -30470,9 +30219,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasarrayhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } /*! @@ -30480,16 +30231,19 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasarrayhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } @@ -30498,16 +30252,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; }; /*! @@ -30539,7 +30293,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper( const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } @@ -30550,7 +30305,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper( MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! @@ -30561,7 +30317,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; return *this; } @@ -30574,7 +30331,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); return *this; } @@ -30585,7 +30343,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper == x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! @@ -30603,9 +30362,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedstringhelper_inneraliassequencehelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliassequencehelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = _var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + _var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } /*! @@ -30613,16 +30374,19 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedstringhelper_inneraliassequencehelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliassequencehelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } @@ -30631,16 +30395,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() { return m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; }; /*! @@ -30672,7 +30436,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasMapHelper( const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } @@ -30683,7 +30448,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasMapHelper( MapInnerAliasBoundedStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! @@ -30694,7 +30460,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; return *this; } @@ -30707,7 +30474,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper MapInnerAliasBoundedStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); return *this; } @@ -30718,7 +30486,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper == + x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! @@ -30736,9 +30505,11 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasmaphelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasmaphelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = _var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + _var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } /*! @@ -30746,16 +30517,19 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasmaphelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasmaphelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = + std::move(_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } @@ -30764,16 +30538,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; }; /*! @@ -30805,7 +30579,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerUnionHelper( const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; } @@ -30816,7 +30591,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerUnionHelper( MapInnerAliasBoundedStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! @@ -30827,7 +30603,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; return *this; } @@ -30840,7 +30617,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper MapInnerAliasBoundedStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); return *this; } @@ -30851,7 +30629,8 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerunionhelper == x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + return (m_var_map_inneraliasboundedstringhelper_innerunionhelper == + x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! @@ -30869,9 +30648,11 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedstringhelper_innerunionhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerunionhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerunionhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = _var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + _var_map_inneraliasboundedstringhelper_innerunionhelper; } /*! @@ -30879,16 +30660,19 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedstringhelper_innerunionhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerunionhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerunionhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = + std::move(_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerunionhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerunionhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() const { return m_var_map_inneraliasboundedstringhelper_innerunionhelper; } @@ -30897,16 +30681,16 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerunionhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerunionhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() { return m_var_map_inneraliasboundedstringhelper_innerunionhelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_innerunionhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerunionhelper; }; /*! @@ -30938,7 +30722,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerStructureHelper( const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } @@ -30949,7 +30734,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerStructureHelper( MapInnerAliasBoundedStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! @@ -30960,7 +30746,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; return *this; } @@ -30973,7 +30760,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper MapInnerAliasBoundedStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); return *this; } @@ -30984,7 +30772,8 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerstructurehelper == x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + return (m_var_map_inneraliasboundedstringhelper_innerstructurehelper == + x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! @@ -31002,9 +30791,11 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedstringhelper_innerstructurehelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerstructurehelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerstructurehelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = _var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + _var_map_inneraliasboundedstringhelper_innerstructurehelper; } /*! @@ -31012,16 +30803,19 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedstringhelper_innerstructurehelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerstructurehelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerstructurehelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = + std::move(_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() const { return m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } @@ -31030,16 +30824,16 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() { return m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + std::map m_var_map_inneraliasboundedstringhelper_innerstructurehelper; }; /*! @@ -31071,7 +30865,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitsetHelper( const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } @@ -31082,7 +30877,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitsetHelper( MapInnerAliasBoundedStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! @@ -31093,7 +30889,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; return *this; } @@ -31106,7 +30903,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper MapInnerAliasBoundedStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); return *this; } @@ -31117,7 +30915,8 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerbitsethelper == x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + return (m_var_map_inneraliasboundedstringhelper_innerbitsethelper == + x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! @@ -31135,9 +30934,11 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedstringhelper_innerbitsethelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitsethelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerbitsethelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = _var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + _var_map_inneraliasboundedstringhelper_innerbitsethelper; } /*! @@ -31145,16 +30946,19 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedstringhelper_innerbitsethelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitsethelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerbitsethelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = + std::move(_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() const { return m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } @@ -31163,16 +30967,16 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() { return m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } - - private: - std::map m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + std::map m_var_map_inneraliasboundedstringhelper_innerbitsethelper; }; /*! @@ -31204,7 +31008,7 @@ class MapInnerAliasBoundedWStringHelperShort eProsima_user_DllExport MapInnerAliasBoundedWStringHelperShort( const MapInnerAliasBoundedWStringHelperShort& x) { - m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; + m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; } @@ -31226,7 +31030,7 @@ class MapInnerAliasBoundedWStringHelperShort const MapInnerAliasBoundedWStringHelperShort& x) { - m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; + m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; return *this; } @@ -31287,7 +31091,8 @@ class MapInnerAliasBoundedWStringHelperShort * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_short * @return Constant reference to member var_map_inneraliasboundedwstringhelper_short */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_short() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_short() const { return m_var_map_inneraliasboundedwstringhelper_short; } @@ -31296,13 +31101,12 @@ class MapInnerAliasBoundedWStringHelperShort * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_short * @return Reference to member var_map_inneraliasboundedwstringhelper_short */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_short() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_short() { return m_var_map_inneraliasboundedwstringhelper_short; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_short; @@ -31337,7 +31141,7 @@ class MapInnerAliasBoundedWStringHelperUShort eProsima_user_DllExport MapInnerAliasBoundedWStringHelperUShort( const MapInnerAliasBoundedWStringHelperUShort& x) { - m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; + m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; } @@ -31359,7 +31163,7 @@ class MapInnerAliasBoundedWStringHelperUShort const MapInnerAliasBoundedWStringHelperUShort& x) { - m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; + m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; return *this; } @@ -31401,7 +31205,8 @@ class MapInnerAliasBoundedWStringHelperUShort * @param _var_map_inneraliasboundedwstringhelper_ushort New value to be copied in member var_map_inneraliasboundedwstringhelper_ushort */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ushort( - const std::map& _var_map_inneraliasboundedwstringhelper_ushort) + const std::map& _var_map_inneraliasboundedwstringhelper_ushort) { m_var_map_inneraliasboundedwstringhelper_ushort = _var_map_inneraliasboundedwstringhelper_ushort; } @@ -31420,7 +31225,8 @@ class MapInnerAliasBoundedWStringHelperUShort * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ushort * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ushort */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ushort() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ushort() const { return m_var_map_inneraliasboundedwstringhelper_ushort; } @@ -31429,13 +31235,12 @@ class MapInnerAliasBoundedWStringHelperUShort * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ushort * @return Reference to member var_map_inneraliasboundedwstringhelper_ushort */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ushort() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ushort() { return m_var_map_inneraliasboundedwstringhelper_ushort; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_ushort; @@ -31470,7 +31275,7 @@ class MapInnerAliasBoundedWStringHelperLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLong( const MapInnerAliasBoundedWStringHelperLong& x) { - m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; + m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; } @@ -31492,7 +31297,7 @@ class MapInnerAliasBoundedWStringHelperLong const MapInnerAliasBoundedWStringHelperLong& x) { - m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; + m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; return *this; } @@ -31553,7 +31358,8 @@ class MapInnerAliasBoundedWStringHelperLong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_long * @return Constant reference to member var_map_inneraliasboundedwstringhelper_long */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_long() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_long() const { return m_var_map_inneraliasboundedwstringhelper_long; } @@ -31562,13 +31368,12 @@ class MapInnerAliasBoundedWStringHelperLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_long * @return Reference to member var_map_inneraliasboundedwstringhelper_long */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_long() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_long() { return m_var_map_inneraliasboundedwstringhelper_long; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_long; @@ -31603,7 +31408,7 @@ class MapInnerAliasBoundedWStringHelperULong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULong( const MapInnerAliasBoundedWStringHelperULong& x) { - m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; + m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; } @@ -31625,7 +31430,7 @@ class MapInnerAliasBoundedWStringHelperULong const MapInnerAliasBoundedWStringHelperULong& x) { - m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; + m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; return *this; } @@ -31686,7 +31491,8 @@ class MapInnerAliasBoundedWStringHelperULong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ulong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ulong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulong() const { return m_var_map_inneraliasboundedwstringhelper_ulong; } @@ -31695,13 +31501,12 @@ class MapInnerAliasBoundedWStringHelperULong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ulong * @return Reference to member var_map_inneraliasboundedwstringhelper_ulong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulong() { return m_var_map_inneraliasboundedwstringhelper_ulong; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_ulong; @@ -31736,7 +31541,7 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongLong( const MapInnerAliasBoundedWStringHelperLongLong& x) { - m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; + m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; } @@ -31747,7 +31552,8 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongLong( MapInnerAliasBoundedWStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); + m_var_map_inneraliasboundedwstringhelper_longlong = + std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); } /*! @@ -31758,7 +31564,7 @@ class MapInnerAliasBoundedWStringHelperLongLong const MapInnerAliasBoundedWStringHelperLongLong& x) { - m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; + m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; return *this; } @@ -31771,7 +31577,8 @@ class MapInnerAliasBoundedWStringHelperLongLong MapInnerAliasBoundedWStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); + m_var_map_inneraliasboundedwstringhelper_longlong = + std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); return *this; } @@ -31782,7 +31589,8 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperLongLong& x) const { - return (m_var_map_inneraliasboundedwstringhelper_longlong == x.m_var_map_inneraliasboundedwstringhelper_longlong); + return (m_var_map_inneraliasboundedwstringhelper_longlong == + x.m_var_map_inneraliasboundedwstringhelper_longlong); } /*! @@ -31800,7 +31608,8 @@ class MapInnerAliasBoundedWStringHelperLongLong * @param _var_map_inneraliasboundedwstringhelper_longlong New value to be copied in member var_map_inneraliasboundedwstringhelper_longlong */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longlong( - const std::map& _var_map_inneraliasboundedwstringhelper_longlong) + const std::map& _var_map_inneraliasboundedwstringhelper_longlong) { m_var_map_inneraliasboundedwstringhelper_longlong = _var_map_inneraliasboundedwstringhelper_longlong; } @@ -31819,7 +31628,8 @@ class MapInnerAliasBoundedWStringHelperLongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_longlong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_longlong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longlong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longlong() const { return m_var_map_inneraliasboundedwstringhelper_longlong; } @@ -31828,13 +31638,12 @@ class MapInnerAliasBoundedWStringHelperLongLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_longlong * @return Reference to member var_map_inneraliasboundedwstringhelper_longlong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longlong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longlong() { return m_var_map_inneraliasboundedwstringhelper_longlong; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_longlong; @@ -31869,7 +31678,7 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULongLong( const MapInnerAliasBoundedWStringHelperULongLong& x) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; + m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31880,7 +31689,8 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULongLong( MapInnerAliasBoundedWStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = + std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! @@ -31891,7 +31701,7 @@ class MapInnerAliasBoundedWStringHelperULongLong const MapInnerAliasBoundedWStringHelperULongLong& x) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; + m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; return *this; } @@ -31904,7 +31714,8 @@ class MapInnerAliasBoundedWStringHelperULongLong MapInnerAliasBoundedWStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = + std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); return *this; } @@ -31915,7 +31726,8 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperULongLong& x) const { - return (m_var_map_inneraliasboundedwstringhelper_ulonglong == x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + return (m_var_map_inneraliasboundedwstringhelper_ulonglong == + x.m_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! @@ -31933,7 +31745,8 @@ class MapInnerAliasBoundedWStringHelperULongLong * @param _var_map_inneraliasboundedwstringhelper_ulonglong New value to be copied in member var_map_inneraliasboundedwstringhelper_ulonglong */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ulonglong( - const std::map& _var_map_inneraliasboundedwstringhelper_ulonglong) + const std::map& _var_map_inneraliasboundedwstringhelper_ulonglong) { m_var_map_inneraliasboundedwstringhelper_ulonglong = _var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31945,14 +31758,16 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ulonglong( std::map&& _var_map_inneraliasboundedwstringhelper_ulonglong) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = + std::move(_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ulonglong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ulonglong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulonglong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulonglong() const { return m_var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31961,13 +31776,12 @@ class MapInnerAliasBoundedWStringHelperULongLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ulonglong * @return Reference to member var_map_inneraliasboundedwstringhelper_ulonglong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulonglong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulonglong() { return m_var_map_inneraliasboundedwstringhelper_ulonglong; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_ulonglong; @@ -32002,7 +31816,7 @@ class MapInnerAliasBoundedWStringHelperFloat eProsima_user_DllExport MapInnerAliasBoundedWStringHelperFloat( const MapInnerAliasBoundedWStringHelperFloat& x) { - m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; + m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; } @@ -32024,7 +31838,7 @@ class MapInnerAliasBoundedWStringHelperFloat const MapInnerAliasBoundedWStringHelperFloat& x) { - m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; + m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; return *this; } @@ -32085,7 +31899,8 @@ class MapInnerAliasBoundedWStringHelperFloat * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_float * @return Constant reference to member var_map_inneraliasboundedwstringhelper_float */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_float() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_float() const { return m_var_map_inneraliasboundedwstringhelper_float; } @@ -32094,13 +31909,12 @@ class MapInnerAliasBoundedWStringHelperFloat * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_float * @return Reference to member var_map_inneraliasboundedwstringhelper_float */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_float() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_float() { return m_var_map_inneraliasboundedwstringhelper_float; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_float; @@ -32135,7 +31949,7 @@ class MapInnerAliasBoundedWStringHelperDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperDouble( const MapInnerAliasBoundedWStringHelperDouble& x) { - m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; + m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; } @@ -32157,7 +31971,7 @@ class MapInnerAliasBoundedWStringHelperDouble const MapInnerAliasBoundedWStringHelperDouble& x) { - m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; + m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; return *this; } @@ -32218,7 +32032,8 @@ class MapInnerAliasBoundedWStringHelperDouble * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_double * @return Constant reference to member var_map_inneraliasboundedwstringhelper_double */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_double() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_double() const { return m_var_map_inneraliasboundedwstringhelper_double; } @@ -32227,13 +32042,12 @@ class MapInnerAliasBoundedWStringHelperDouble * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_double * @return Reference to member var_map_inneraliasboundedwstringhelper_double */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_double() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_double() { return m_var_map_inneraliasboundedwstringhelper_double; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_double; @@ -32268,7 +32082,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongDouble( const MapInnerAliasBoundedWStringHelperLongDouble& x) { - m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; + m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32279,7 +32093,8 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongDouble( MapInnerAliasBoundedWStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = + std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); } /*! @@ -32290,7 +32105,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble const MapInnerAliasBoundedWStringHelperLongDouble& x) { - m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; + m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; return *this; } @@ -32303,7 +32118,8 @@ class MapInnerAliasBoundedWStringHelperLongDouble MapInnerAliasBoundedWStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = + std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); return *this; } @@ -32314,7 +32130,8 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperLongDouble& x) const { - return (m_var_map_inneraliasboundedwstringhelper_longdouble == x.m_var_map_inneraliasboundedwstringhelper_longdouble); + return (m_var_map_inneraliasboundedwstringhelper_longdouble == + x.m_var_map_inneraliasboundedwstringhelper_longdouble); } /*! @@ -32332,7 +32149,8 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @param _var_map_inneraliasboundedwstringhelper_longdouble New value to be copied in member var_map_inneraliasboundedwstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longdouble( - const std::map& _var_map_inneraliasboundedwstringhelper_longdouble) + const std::map& _var_map_inneraliasboundedwstringhelper_longdouble) { m_var_map_inneraliasboundedwstringhelper_longdouble = _var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32342,16 +32160,19 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @param _var_map_inneraliasboundedwstringhelper_longdouble New value to be moved in member var_map_inneraliasboundedwstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longdouble( - std::map&& _var_map_inneraliasboundedwstringhelper_longdouble) + std::map&& _var_map_inneraliasboundedwstringhelper_longdouble) { - m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = + std::move(_var_map_inneraliasboundedwstringhelper_longdouble); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_longdouble * @return Constant reference to member var_map_inneraliasboundedwstringhelper_longdouble */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longdouble() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longdouble() const { return m_var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32360,13 +32181,12 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_longdouble * @return Reference to member var_map_inneraliasboundedwstringhelper_longdouble */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longdouble() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longdouble() { return m_var_map_inneraliasboundedwstringhelper_longdouble; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_longdouble; @@ -32401,7 +32221,7 @@ class MapInnerAliasBoundedWStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedWStringHelperBoolean( const MapInnerAliasBoundedWStringHelperBoolean& x) { - m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; + m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; } @@ -32412,7 +32232,8 @@ class MapInnerAliasBoundedWStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedWStringHelperBoolean( MapInnerAliasBoundedWStringHelperBoolean&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_boolean = std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); + m_var_map_inneraliasboundedwstringhelper_boolean = + std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); } /*! @@ -32423,7 +32244,7 @@ class MapInnerAliasBoundedWStringHelperBoolean const MapInnerAliasBoundedWStringHelperBoolean& x) { - m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; + m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; return *this; } @@ -32436,7 +32257,8 @@ class MapInnerAliasBoundedWStringHelperBoolean MapInnerAliasBoundedWStringHelperBoolean&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_boolean = std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); + m_var_map_inneraliasboundedwstringhelper_boolean = + std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); return *this; } @@ -32484,7 +32306,8 @@ class MapInnerAliasBoundedWStringHelperBoolean * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_boolean * @return Constant reference to member var_map_inneraliasboundedwstringhelper_boolean */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_boolean() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_boolean() const { return m_var_map_inneraliasboundedwstringhelper_boolean; } @@ -32493,13 +32316,12 @@ class MapInnerAliasBoundedWStringHelperBoolean * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_boolean * @return Reference to member var_map_inneraliasboundedwstringhelper_boolean */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_boolean() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_boolean() { return m_var_map_inneraliasboundedwstringhelper_boolean; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_boolean; @@ -32534,7 +32356,7 @@ class MapInnerAliasBoundedWStringHelperOctet eProsima_user_DllExport MapInnerAliasBoundedWStringHelperOctet( const MapInnerAliasBoundedWStringHelperOctet& x) { - m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; + m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; } @@ -32556,7 +32378,7 @@ class MapInnerAliasBoundedWStringHelperOctet const MapInnerAliasBoundedWStringHelperOctet& x) { - m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; + m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; return *this; } @@ -32617,7 +32439,8 @@ class MapInnerAliasBoundedWStringHelperOctet * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_octet * @return Constant reference to member var_map_inneraliasboundedwstringhelper_octet */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_octet() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_octet() const { return m_var_map_inneraliasboundedwstringhelper_octet; } @@ -32626,13 +32449,12 @@ class MapInnerAliasBoundedWStringHelperOctet * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_octet * @return Reference to member var_map_inneraliasboundedwstringhelper_octet */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_octet() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_octet() { return m_var_map_inneraliasboundedwstringhelper_octet; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_octet; @@ -32667,7 +32489,7 @@ class MapInnerAliasBoundedWStringHelperChar eProsima_user_DllExport MapInnerAliasBoundedWStringHelperChar( const MapInnerAliasBoundedWStringHelperChar& x) { - m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; + m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; } @@ -32689,7 +32511,7 @@ class MapInnerAliasBoundedWStringHelperChar const MapInnerAliasBoundedWStringHelperChar& x) { - m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; + m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; return *this; } @@ -32750,7 +32572,8 @@ class MapInnerAliasBoundedWStringHelperChar * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_char * @return Constant reference to member var_map_inneraliasboundedwstringhelper_char */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_char() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_char() const { return m_var_map_inneraliasboundedwstringhelper_char; } @@ -32759,13 +32582,12 @@ class MapInnerAliasBoundedWStringHelperChar * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_char * @return Reference to member var_map_inneraliasboundedwstringhelper_char */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_char() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_char() { return m_var_map_inneraliasboundedwstringhelper_char; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_char; @@ -32800,7 +32622,7 @@ class MapInnerAliasBoundedWStringHelperWChar eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWChar( const MapInnerAliasBoundedWStringHelperWChar& x) { - m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; + m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; } @@ -32822,7 +32644,7 @@ class MapInnerAliasBoundedWStringHelperWChar const MapInnerAliasBoundedWStringHelperWChar& x) { - m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; + m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; return *this; } @@ -32883,7 +32705,8 @@ class MapInnerAliasBoundedWStringHelperWChar * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_wchar * @return Constant reference to member var_map_inneraliasboundedwstringhelper_wchar */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wchar() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wchar() const { return m_var_map_inneraliasboundedwstringhelper_wchar; } @@ -32892,13 +32715,12 @@ class MapInnerAliasBoundedWStringHelperWChar * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_wchar * @return Reference to member var_map_inneraliasboundedwstringhelper_wchar */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wchar() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wchar() { return m_var_map_inneraliasboundedwstringhelper_wchar; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_wchar; @@ -32933,7 +32755,7 @@ class MapInnerAliasBoundedWStringHelperString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperString( const MapInnerAliasBoundedWStringHelperString& x) { - m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; + m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; } @@ -32955,7 +32777,7 @@ class MapInnerAliasBoundedWStringHelperString const MapInnerAliasBoundedWStringHelperString& x) { - m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; + m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; return *this; } @@ -32997,7 +32819,8 @@ class MapInnerAliasBoundedWStringHelperString * @param _var_map_inneraliasboundedwstringhelper_string New value to be copied in member var_map_inneraliasboundedwstringhelper_string */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_string( - const std::map& _var_map_inneraliasboundedwstringhelper_string) + const std::map& _var_map_inneraliasboundedwstringhelper_string) { m_var_map_inneraliasboundedwstringhelper_string = _var_map_inneraliasboundedwstringhelper_string; } @@ -33016,7 +32839,8 @@ class MapInnerAliasBoundedWStringHelperString * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_string * @return Constant reference to member var_map_inneraliasboundedwstringhelper_string */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_string() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_string() const { return m_var_map_inneraliasboundedwstringhelper_string; } @@ -33025,13 +32849,12 @@ class MapInnerAliasBoundedWStringHelperString * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_string * @return Reference to member var_map_inneraliasboundedwstringhelper_string */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_string() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_string() { return m_var_map_inneraliasboundedwstringhelper_string; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_string; @@ -33066,7 +32889,7 @@ class MapInnerAliasBoundedWStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWString( const MapInnerAliasBoundedWStringHelperWString& x) { - m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; + m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; } @@ -33077,7 +32900,8 @@ class MapInnerAliasBoundedWStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWString( MapInnerAliasBoundedWStringHelperWString&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_wstring = std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); + m_var_map_inneraliasboundedwstringhelper_wstring = + std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); } /*! @@ -33088,7 +32912,7 @@ class MapInnerAliasBoundedWStringHelperWString const MapInnerAliasBoundedWStringHelperWString& x) { - m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; + m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; return *this; } @@ -33101,7 +32925,8 @@ class MapInnerAliasBoundedWStringHelperWString MapInnerAliasBoundedWStringHelperWString&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_wstring = std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); + m_var_map_inneraliasboundedwstringhelper_wstring = + std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); return *this; } @@ -33130,7 +32955,8 @@ class MapInnerAliasBoundedWStringHelperWString * @param _var_map_inneraliasboundedwstringhelper_wstring New value to be copied in member var_map_inneraliasboundedwstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_wstring( - const std::map& _var_map_inneraliasboundedwstringhelper_wstring) + const std::map& _var_map_inneraliasboundedwstringhelper_wstring) { m_var_map_inneraliasboundedwstringhelper_wstring = _var_map_inneraliasboundedwstringhelper_wstring; } @@ -33140,7 +32966,8 @@ class MapInnerAliasBoundedWStringHelperWString * @param _var_map_inneraliasboundedwstringhelper_wstring New value to be moved in member var_map_inneraliasboundedwstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_wstring( - std::map&& _var_map_inneraliasboundedwstringhelper_wstring) + std::map&& _var_map_inneraliasboundedwstringhelper_wstring) { m_var_map_inneraliasboundedwstringhelper_wstring = std::move(_var_map_inneraliasboundedwstringhelper_wstring); } @@ -33149,7 +32976,8 @@ class MapInnerAliasBoundedWStringHelperWString * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_wstring * @return Constant reference to member var_map_inneraliasboundedwstringhelper_wstring */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wstring() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wstring() const { return m_var_map_inneraliasboundedwstringhelper_wstring; } @@ -33158,13 +32986,12 @@ class MapInnerAliasBoundedWStringHelperWString * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_wstring * @return Reference to member var_map_inneraliasboundedwstringhelper_wstring */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wstring() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wstring() { return m_var_map_inneraliasboundedwstringhelper_wstring; } - - private: std::map m_var_map_inneraliasboundedwstringhelper_wstring; @@ -33199,7 +33026,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } @@ -33210,7 +33038,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper( MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! @@ -33221,7 +33050,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; return *this; } @@ -33234,7 +33064,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); return *this; } @@ -33245,7 +33076,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! @@ -33263,9 +33095,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } /*! @@ -33273,16 +33107,20 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() + const { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } @@ -33291,16 +33129,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; }; /*! @@ -33332,7 +33170,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } @@ -33343,7 +33182,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper( MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! @@ -33354,7 +33194,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; return *this; } @@ -33367,7 +33208,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); return *this; } @@ -33378,7 +33220,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! @@ -33396,9 +33239,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } /*! @@ -33406,16 +33251,20 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() + const { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } @@ -33424,16 +33273,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; }; /*! @@ -33465,7 +33314,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerEnumHelper( const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } @@ -33476,7 +33326,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerEnumHelper( MapInnerAliasBoundedWStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! @@ -33487,7 +33338,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; return *this; } @@ -33500,7 +33352,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper MapInnerAliasBoundedWStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); return *this; } @@ -33511,7 +33364,8 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerenumhelper == x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerenumhelper == + x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! @@ -33529,9 +33383,11 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedwstringhelper_innerenumhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerenumhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerenumhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = _var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + _var_map_inneraliasboundedwstringhelper_innerenumhelper; } /*! @@ -33539,16 +33395,19 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedwstringhelper_innerenumhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerenumhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerenumhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = + std::move(_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } @@ -33557,16 +33416,16 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() { return m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerenumhelper; }; /*! @@ -33598,7 +33457,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitMaskHelper( const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } @@ -33609,7 +33469,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitMaskHelper( MapInnerAliasBoundedWStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! @@ -33620,7 +33481,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; return *this; } @@ -33633,7 +33495,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper MapInnerAliasBoundedWStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); return *this; } @@ -33644,7 +33507,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper == x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper == + x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! @@ -33662,9 +33526,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitmaskhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } /*! @@ -33672,16 +33538,19 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitmaskhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = + std::move(_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } @@ -33690,16 +33559,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() { return m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; }; /*! @@ -33731,7 +33600,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasHelper( const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } @@ -33742,7 +33612,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasHelper( MapInnerAliasBoundedWStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! @@ -33753,7 +33624,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; return *this; } @@ -33766,7 +33638,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper MapInnerAliasBoundedWStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); return *this; } @@ -33777,7 +33650,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliashelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliashelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! @@ -33795,9 +33669,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliashelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliashelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliashelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = _var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + _var_map_inneraliasboundedwstringhelper_inneraliashelper; } /*! @@ -33805,16 +33681,19 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliashelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliashelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliashelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } @@ -33823,16 +33702,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliashelper; }; /*! @@ -33864,7 +33743,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper( const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } @@ -33875,7 +33755,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper( MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! @@ -33886,7 +33767,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; return *this; } @@ -33899,7 +33781,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); return *this; } @@ -33910,7 +33793,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! @@ -33928,9 +33812,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } /*! @@ -33938,16 +33824,19 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } @@ -33956,16 +33845,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; }; /*! @@ -33997,7 +33886,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper( const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } @@ -34008,7 +33898,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper( MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! @@ -34019,7 +33910,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; return *this; } @@ -34032,7 +33924,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); return *this; } @@ -34043,7 +33936,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! @@ -34061,9 +33955,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliassequencehelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } /*! @@ -34071,16 +33967,19 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliassequencehelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } @@ -34089,16 +33988,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; }; /*! @@ -34130,7 +34029,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasMapHelper( const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } @@ -34141,7 +34041,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasMapHelper( MapInnerAliasBoundedWStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! @@ -34152,7 +34053,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; return *this; } @@ -34165,7 +34067,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper MapInnerAliasBoundedWStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); return *this; } @@ -34176,7 +34079,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper == + x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! @@ -34194,9 +34098,11 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasmaphelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } /*! @@ -34204,16 +34110,19 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasmaphelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = + std::move(_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } @@ -34222,16 +34131,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; }; /*! @@ -34263,7 +34172,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerUnionHelper( const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } @@ -34274,7 +34184,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerUnionHelper( MapInnerAliasBoundedWStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! @@ -34285,7 +34196,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; return *this; } @@ -34298,7 +34210,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper MapInnerAliasBoundedWStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); return *this; } @@ -34309,7 +34222,8 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerunionhelper == x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerunionhelper == + x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! @@ -34327,9 +34241,11 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedwstringhelper_innerunionhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerunionhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerunionhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = _var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + _var_map_inneraliasboundedwstringhelper_innerunionhelper; } /*! @@ -34337,16 +34253,19 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedwstringhelper_innerunionhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerunionhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerunionhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = + std::move(_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } @@ -34355,16 +34274,16 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() { return m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerunionhelper; }; /*! @@ -34396,7 +34315,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerStructureHelper( const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } @@ -34407,7 +34327,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerStructureHelper( MapInnerAliasBoundedWStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! @@ -34418,7 +34339,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; return *this; } @@ -34431,7 +34353,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper MapInnerAliasBoundedWStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); return *this; } @@ -34442,7 +34365,8 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerstructurehelper == x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + return (m_var_map_inneraliasboundedwstringhelper_innerstructurehelper == + x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! @@ -34460,9 +34384,11 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedwstringhelper_innerstructurehelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerstructurehelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = _var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + _var_map_inneraliasboundedwstringhelper_innerstructurehelper; } /*! @@ -34470,16 +34396,19 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedwstringhelper_innerstructurehelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerstructurehelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = + std::move(_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() const { return m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } @@ -34488,16 +34417,16 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() { return m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; }; /*! @@ -34529,7 +34458,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitsetHelper( const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } @@ -34540,7 +34470,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitsetHelper( MapInnerAliasBoundedWStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! @@ -34551,7 +34482,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; return *this; } @@ -34564,7 +34496,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper MapInnerAliasBoundedWStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); return *this; } @@ -34575,7 +34508,8 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerbitsethelper == x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + return (m_var_map_inneraliasboundedwstringhelper_innerbitsethelper == + x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! @@ -34593,9 +34527,11 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitsethelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitsethelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = _var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + _var_map_inneraliasboundedwstringhelper_innerbitsethelper; } /*! @@ -34603,16 +34539,19 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitsethelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitsethelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = + std::move(_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() const { return m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } @@ -34621,16 +34560,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() { return m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } - - private: - std::map m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; }; /*! @@ -34662,11 +34601,11 @@ class BoundedSmallMap eProsima_user_DllExport BoundedSmallMap( const BoundedSmallMap& x) { - m_var_small_map = x.m_var_small_map; + m_var_small_map = x.m_var_small_map; - m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; + m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; - m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; + m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; } @@ -34690,11 +34629,11 @@ class BoundedSmallMap const BoundedSmallMap& x) { - m_var_small_map = x.m_var_small_map; + m_var_small_map = x.m_var_small_map; - m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; + m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; - m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; + m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; return *this; } @@ -34721,8 +34660,8 @@ class BoundedSmallMap const BoundedSmallMap& x) const { return (m_var_small_map == x.m_var_small_map && - m_var_unbounded_string_long_bounded_small_map == x.m_var_unbounded_string_long_bounded_small_map && - m_var_long_unbounded_string_bounded_small_map == x.m_var_long_unbounded_string_bounded_small_map); + m_var_unbounded_string_long_bounded_small_map == x.m_var_unbounded_string_long_bounded_small_map && + m_var_long_unbounded_string_bounded_small_map == x.m_var_long_unbounded_string_bounded_small_map); } /*! @@ -34773,7 +34712,6 @@ class BoundedSmallMap return m_var_small_map; } - /*! * @brief This function copies the value in member var_unbounded_string_long_bounded_small_map * @param _var_unbounded_string_long_bounded_small_map New value to be copied in member var_unbounded_string_long_bounded_small_map @@ -34812,7 +34750,6 @@ class BoundedSmallMap return m_var_unbounded_string_long_bounded_small_map; } - /*! * @brief This function copies the value in member var_long_unbounded_string_bounded_small_map * @param _var_long_unbounded_string_bounded_small_map New value to be copied in member var_long_unbounded_string_bounded_small_map @@ -34851,8 +34788,6 @@ class BoundedSmallMap return m_var_long_unbounded_string_bounded_small_map; } - - private: std::map m_var_small_map; @@ -34889,11 +34824,11 @@ class BoundedLargeMap eProsima_user_DllExport BoundedLargeMap( const BoundedLargeMap& x) { - m_var_large_map = x.m_var_large_map; + m_var_large_map = x.m_var_large_map; - m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; + m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; - m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; + m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; } @@ -34917,11 +34852,11 @@ class BoundedLargeMap const BoundedLargeMap& x) { - m_var_large_map = x.m_var_large_map; + m_var_large_map = x.m_var_large_map; - m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; + m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; - m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; + m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; return *this; } @@ -34948,8 +34883,8 @@ class BoundedLargeMap const BoundedLargeMap& x) const { return (m_var_large_map == x.m_var_large_map && - m_var_unbounded_string_long_bounded_large_map == x.m_var_unbounded_string_long_bounded_large_map && - m_var_long_unbounded_string_bounded_large_map == x.m_var_long_unbounded_string_bounded_large_map); + m_var_unbounded_string_long_bounded_large_map == x.m_var_unbounded_string_long_bounded_large_map && + m_var_long_unbounded_string_bounded_large_map == x.m_var_long_unbounded_string_bounded_large_map); } /*! @@ -35000,7 +34935,6 @@ class BoundedLargeMap return m_var_large_map; } - /*! * @brief This function copies the value in member var_unbounded_string_long_bounded_large_map * @param _var_unbounded_string_long_bounded_large_map New value to be copied in member var_unbounded_string_long_bounded_large_map @@ -35039,7 +34973,6 @@ class BoundedLargeMap return m_var_unbounded_string_long_bounded_large_map; } - /*! * @brief This function copies the value in member var_long_unbounded_string_bounded_large_map * @param _var_long_unbounded_string_bounded_large_map New value to be copied in member var_long_unbounded_string_bounded_large_map @@ -35078,8 +35011,6 @@ class BoundedLargeMap return m_var_long_unbounded_string_bounded_large_map; } - - private: std::map m_var_large_map; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp index db82899c..71e706f6 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp @@ -18106,7 +18106,8 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType +class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds:: + TopicDataType { public: @@ -18187,7 +18188,8 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType +class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds:: + TopicDataType { public: @@ -20212,7 +20214,8 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType +class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds:: + TopicDataType { public: @@ -20293,7 +20296,8 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType +class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds:: + TopicDataType { public: diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp index bf02e26e..6f61b81f 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp @@ -78,13 +78,13 @@ class FixId eProsima_user_DllExport FixId( const FixId& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -109,13 +109,13 @@ class FixId const FixId& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -143,9 +143,9 @@ class FixId const FixId& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -186,7 +186,6 @@ class FixId return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -215,7 +214,6 @@ class FixId return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -244,7 +242,6 @@ class FixId return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -273,8 +270,6 @@ class FixId return m_ll; } - - private: uint8_t m_o{0}; @@ -312,13 +307,13 @@ class FixHexId eProsima_user_DllExport FixHexId( const FixHexId& x) { - m_ho = x.m_ho; + m_ho = x.m_ho; - m_hs = x.m_hs; + m_hs = x.m_hs; - m_hl = x.m_hl; + m_hl = x.m_hl; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -343,13 +338,13 @@ class FixHexId const FixHexId& x) { - m_ho = x.m_ho; + m_ho = x.m_ho; - m_hs = x.m_hs; + m_hs = x.m_hs; - m_hl = x.m_hl; + m_hl = x.m_hl; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -377,9 +372,9 @@ class FixHexId const FixHexId& x) const { return (m_ho == x.m_ho && - m_hs == x.m_hs && - m_hl == x.m_hl && - m_ll == x.m_ll); + m_hs == x.m_hs && + m_hl == x.m_hl && + m_ll == x.m_ll); } /*! @@ -420,7 +415,6 @@ class FixHexId return m_ho; } - /*! * @brief This function sets a value in member hs * @param _hs New value for member hs @@ -449,7 +443,6 @@ class FixHexId return m_hs; } - /*! * @brief This function sets a value in member hl * @param _hl New value for member hl @@ -478,7 +471,6 @@ class FixHexId return m_hl; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -507,8 +499,6 @@ class FixHexId return m_ll; } - - private: uint8_t m_ho{0}; @@ -546,13 +536,13 @@ class FixHashidDefault eProsima_user_DllExport FixHashidDefault( const FixHashidDefault& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -577,13 +567,13 @@ class FixHashidDefault const FixHashidDefault& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -611,9 +601,9 @@ class FixHashidDefault const FixHashidDefault& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -654,7 +644,6 @@ class FixHashidDefault return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -683,7 +672,6 @@ class FixHashidDefault return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -712,7 +700,6 @@ class FixHashidDefault return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -741,8 +728,6 @@ class FixHashidDefault return m_ll; } - - private: uint8_t m_o{0}; @@ -780,13 +765,13 @@ class FixHashid eProsima_user_DllExport FixHashid( const FixHashid& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -811,13 +796,13 @@ class FixHashid const FixHashid& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -845,9 +830,9 @@ class FixHashid const FixHashid& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -888,7 +873,6 @@ class FixHashid return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -917,7 +901,6 @@ class FixHashid return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -946,7 +929,6 @@ class FixHashid return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -975,8 +957,6 @@ class FixHashid return m_ll; } - - private: uint8_t m_o{0}; @@ -1014,15 +994,15 @@ class FixMix eProsima_user_DllExport FixMix( const FixMix& x) { - m_o = x.m_o; + m_o = x.m_o; - m_ho = x.m_ho; + m_ho = x.m_ho; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1048,15 +1028,15 @@ class FixMix const FixMix& x) { - m_o = x.m_o; + m_o = x.m_o; - m_ho = x.m_ho; + m_ho = x.m_ho; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1085,10 +1065,10 @@ class FixMix const FixMix& x) const { return (m_o == x.m_o && - m_ho == x.m_ho && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_ho == x.m_ho && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1129,7 +1109,6 @@ class FixMix return m_o; } - /*! * @brief This function sets a value in member ho * @param _ho New value for member ho @@ -1158,7 +1137,6 @@ class FixMix return m_ho; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1187,7 +1165,6 @@ class FixMix return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1216,7 +1193,6 @@ class FixMix return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1245,8 +1221,6 @@ class FixMix return m_ll; } - - private: uint8_t m_o{0}; @@ -1285,15 +1259,15 @@ class AutoidDefault eProsima_user_DllExport AutoidDefault( const AutoidDefault& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1319,15 +1293,15 @@ class AutoidDefault const AutoidDefault& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1356,10 +1330,10 @@ class AutoidDefault const AutoidDefault& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1400,7 +1374,6 @@ class AutoidDefault return m_c; } - /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1429,7 +1402,6 @@ class AutoidDefault return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1458,7 +1430,6 @@ class AutoidDefault return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1487,7 +1458,6 @@ class AutoidDefault return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1516,8 +1486,6 @@ class AutoidDefault return m_ll; } - - private: char m_c{0}; @@ -1556,15 +1524,15 @@ class AutoidSequential eProsima_user_DllExport AutoidSequential( const AutoidSequential& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1590,15 +1558,15 @@ class AutoidSequential const AutoidSequential& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1627,10 +1595,10 @@ class AutoidSequential const AutoidSequential& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1671,7 +1639,6 @@ class AutoidSequential return m_c; } - /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1700,7 +1667,6 @@ class AutoidSequential return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1729,7 +1695,6 @@ class AutoidSequential return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1758,7 +1723,6 @@ class AutoidSequential return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1787,8 +1751,6 @@ class AutoidSequential return m_ll; } - - private: char m_c{0}; @@ -1827,15 +1789,15 @@ class AutoidHash eProsima_user_DllExport AutoidHash( const AutoidHash& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1861,15 +1823,15 @@ class AutoidHash const AutoidHash& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1898,10 +1860,10 @@ class AutoidHash const AutoidHash& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1942,7 +1904,6 @@ class AutoidHash return m_c; } - /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1971,7 +1932,6 @@ class AutoidHash return m_o; } - /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -2000,7 +1960,6 @@ class AutoidHash return m_s; } - /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -2029,7 +1988,6 @@ class AutoidHash return m_l; } - /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -2058,8 +2016,6 @@ class AutoidHash return m_ll; } - - private: char m_c{0}; @@ -2100,15 +2056,15 @@ class DerivedAutoidDefault : public AutoidDefault const DerivedAutoidDefault& x) : AutoidDefault(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2137,15 +2093,15 @@ class DerivedAutoidDefault : public AutoidDefault { AutoidDefault::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2175,14 +2131,14 @@ class DerivedAutoidDefault : public AutoidDefault const DerivedAutoidDefault& x) const { if (AutoidDefault::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2223,7 +2179,6 @@ class DerivedAutoidDefault : public AutoidDefault return m_cd; } - /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2252,7 +2207,6 @@ class DerivedAutoidDefault : public AutoidDefault return m_od; } - /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2281,7 +2235,6 @@ class DerivedAutoidDefault : public AutoidDefault return m_sd; } - /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2310,7 +2263,6 @@ class DerivedAutoidDefault : public AutoidDefault return m_ld; } - /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -2339,8 +2291,6 @@ class DerivedAutoidDefault : public AutoidDefault return m_lld; } - - private: char m_cd{0}; @@ -2432,9 +2382,9 @@ class DerivedEmptyAutoidSequential : public AutoidSequential const DerivedEmptyAutoidSequential& x) const { if (AutoidSequential::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2449,8 +2399,6 @@ class DerivedEmptyAutoidSequential : public AutoidSequential return !(*this == x); } - - private: @@ -2486,15 +2434,15 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential const DerivedAutoidSequential& x) : DerivedEmptyAutoidSequential(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2523,15 +2471,15 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential { DerivedEmptyAutoidSequential::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2561,14 +2509,14 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential const DerivedAutoidSequential& x) const { if (DerivedEmptyAutoidSequential::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2609,7 +2557,6 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_cd; } - /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2638,7 +2585,6 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_od; } - /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2667,7 +2613,6 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_sd; } - /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2696,7 +2641,6 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_ld; } - /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -2725,8 +2669,6 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_lld; } - - private: char m_cd{0}; @@ -2767,15 +2709,15 @@ class DerivedAutoidHash : public AutoidHash const DerivedAutoidHash& x) : AutoidHash(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2804,15 +2746,15 @@ class DerivedAutoidHash : public AutoidHash { AutoidHash::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2842,14 +2784,14 @@ class DerivedAutoidHash : public AutoidHash const DerivedAutoidHash& x) const { if (AutoidHash::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2890,7 +2832,6 @@ class DerivedAutoidHash : public AutoidHash return m_cd; } - /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2919,7 +2860,6 @@ class DerivedAutoidHash : public AutoidHash return m_od; } - /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2948,7 +2888,6 @@ class DerivedAutoidHash : public AutoidHash return m_sd; } - /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2977,7 +2916,6 @@ class DerivedAutoidHash : public AutoidHash return m_ld; } - /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -3006,8 +2944,6 @@ class DerivedAutoidHash : public AutoidHash return m_lld; } - - private: char m_cd{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp index 1f071522..574faa67 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp @@ -81,7 +81,7 @@ class MutableShortStruct eProsima_user_DllExport MutableShortStruct( const MutableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class MutableShortStruct const MutableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,8 +168,6 @@ class MutableShortStruct return m_var_short; } - - private: int16_t m_var_short{0}; @@ -204,7 +202,7 @@ class MutableUShortStruct eProsima_user_DllExport MutableUShortStruct( const MutableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -226,7 +224,7 @@ class MutableUShortStruct const MutableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -291,8 +289,6 @@ class MutableUShortStruct return m_var_ushort; } - - private: uint16_t m_var_ushort{0}; @@ -327,7 +323,7 @@ class MutableLongStruct eProsima_user_DllExport MutableLongStruct( const MutableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -349,7 +345,7 @@ class MutableLongStruct const MutableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -414,8 +410,6 @@ class MutableLongStruct return m_var_long; } - - private: int32_t m_var_long{0}; @@ -450,7 +444,7 @@ class MutableULongStruct eProsima_user_DllExport MutableULongStruct( const MutableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -472,7 +466,7 @@ class MutableULongStruct const MutableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -537,8 +531,6 @@ class MutableULongStruct return m_var_ulong; } - - private: uint32_t m_var_ulong{0}; @@ -573,7 +565,7 @@ class MutableLongLongStruct eProsima_user_DllExport MutableLongLongStruct( const MutableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -595,7 +587,7 @@ class MutableLongLongStruct const MutableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -660,8 +652,6 @@ class MutableLongLongStruct return m_var_longlong; } - - private: int64_t m_var_longlong{0}; @@ -696,7 +686,7 @@ class MutableULongLongStruct eProsima_user_DllExport MutableULongLongStruct( const MutableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -718,7 +708,7 @@ class MutableULongLongStruct const MutableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -783,8 +773,6 @@ class MutableULongLongStruct return m_var_ulonglong; } - - private: uint64_t m_var_ulonglong{0}; @@ -819,7 +807,7 @@ class MutableFloatStruct eProsima_user_DllExport MutableFloatStruct( const MutableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -841,7 +829,7 @@ class MutableFloatStruct const MutableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -906,8 +894,6 @@ class MutableFloatStruct return m_var_float; } - - private: float m_var_float{0.0}; @@ -942,7 +928,7 @@ class MutableDoubleStruct eProsima_user_DllExport MutableDoubleStruct( const MutableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -964,7 +950,7 @@ class MutableDoubleStruct const MutableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1029,8 +1015,6 @@ class MutableDoubleStruct return m_var_double; } - - private: double m_var_double{0.0}; @@ -1065,7 +1049,7 @@ class MutableLongDoubleStruct eProsima_user_DllExport MutableLongDoubleStruct( const MutableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1087,7 +1071,7 @@ class MutableLongDoubleStruct const MutableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1152,8 +1136,6 @@ class MutableLongDoubleStruct return m_var_longdouble; } - - private: long double m_var_longdouble{0.0}; @@ -1188,7 +1170,7 @@ class MutableBooleanStruct eProsima_user_DllExport MutableBooleanStruct( const MutableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1210,7 +1192,7 @@ class MutableBooleanStruct const MutableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1275,8 +1257,6 @@ class MutableBooleanStruct return m_var_boolean; } - - private: bool m_var_boolean{false}; @@ -1311,7 +1291,7 @@ class MutableOctetStruct eProsima_user_DllExport MutableOctetStruct( const MutableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1333,7 +1313,7 @@ class MutableOctetStruct const MutableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1398,8 +1378,6 @@ class MutableOctetStruct return m_var_octet; } - - private: uint8_t m_var_octet{0}; @@ -1434,7 +1412,7 @@ class MutableCharStruct eProsima_user_DllExport MutableCharStruct( const MutableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1456,7 +1434,7 @@ class MutableCharStruct const MutableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1521,8 +1499,6 @@ class MutableCharStruct return m_var_char8; } - - private: char m_var_char8{0}; @@ -1557,7 +1533,7 @@ class MutableWCharStruct eProsima_user_DllExport MutableWCharStruct( const MutableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1579,7 +1555,7 @@ class MutableWCharStruct const MutableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1644,8 +1620,6 @@ class MutableWCharStruct return m_var_char16; } - - private: wchar_t m_var_char16{0}; @@ -1680,7 +1654,7 @@ class MutableUnionStruct eProsima_user_DllExport MutableUnionStruct( const MutableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1702,7 +1676,7 @@ class MutableUnionStruct const MutableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1777,8 +1751,6 @@ class MutableUnionStruct return m_var_union; } - - private: InnerUnionHelper m_var_union; @@ -1873,8 +1845,6 @@ class MutableEmptyStruct return !(*this == x); } - - private: @@ -1910,7 +1880,7 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct const MutableEmptyInheritanceStruct& x) : MutableEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1935,7 +1905,7 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct { MutableEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1961,9 +1931,9 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct const MutableEmptyInheritanceStruct& x) const { if (MutableEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2015,8 +1985,6 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct return m_var_str; } - - private: std::string m_var_str; @@ -2053,7 +2021,7 @@ class MutableInheritanceStruct : public MutableShortStruct const MutableInheritanceStruct& x) : MutableShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2078,7 +2046,7 @@ class MutableInheritanceStruct : public MutableShortStruct { MutableShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2104,9 +2072,9 @@ class MutableInheritanceStruct : public MutableShortStruct const MutableInheritanceStruct& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2158,8 +2126,6 @@ class MutableInheritanceStruct : public MutableShortStruct return m_var_str; } - - private: std::string m_var_str; @@ -2247,9 +2213,9 @@ class MutableInheritanceEmptyStruct : public MutableShortStruct const MutableInheritanceEmptyStruct& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2264,8 +2230,6 @@ class MutableInheritanceEmptyStruct : public MutableShortStruct return !(*this == x); } - - private: @@ -2301,7 +2265,7 @@ class MutableExtensibilityInheritance : public MutableShortStruct const MutableExtensibilityInheritance& x) : MutableShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2326,7 +2290,7 @@ class MutableExtensibilityInheritance : public MutableShortStruct { MutableShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2352,9 +2316,9 @@ class MutableExtensibilityInheritance : public MutableShortStruct const MutableExtensibilityInheritance& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2396,8 +2360,6 @@ class MutableExtensibilityInheritance : public MutableShortStruct return m_var_long; } - - private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp index 9f068e6a..aaf291c0 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp @@ -86,7 +86,7 @@ class short_optional eProsima_user_DllExport short_optional( const short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -108,7 +108,7 @@ class short_optional const short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -183,8 +183,6 @@ class short_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -219,7 +217,7 @@ class ushort_optional eProsima_user_DllExport ushort_optional( const ushort_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -241,7 +239,7 @@ class ushort_optional const ushort_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -316,8 +314,6 @@ class ushort_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -352,7 +348,7 @@ class long_optional eProsima_user_DllExport long_optional( const long_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -374,7 +370,7 @@ class long_optional const long_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -449,8 +445,6 @@ class long_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -485,7 +479,7 @@ class ulong_optional eProsima_user_DllExport ulong_optional( const ulong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -507,7 +501,7 @@ class ulong_optional const ulong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -582,8 +576,6 @@ class ulong_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -618,7 +610,7 @@ class longlong_optional eProsima_user_DllExport longlong_optional( const longlong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -640,7 +632,7 @@ class longlong_optional const longlong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -715,8 +707,6 @@ class longlong_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -751,7 +741,7 @@ class ulonglong_optional eProsima_user_DllExport ulonglong_optional( const ulonglong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -773,7 +763,7 @@ class ulonglong_optional const ulonglong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -848,8 +838,6 @@ class ulonglong_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -884,7 +872,7 @@ class float_optional eProsima_user_DllExport float_optional( const float_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -906,7 +894,7 @@ class float_optional const float_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -981,8 +969,6 @@ class float_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1017,7 +1003,7 @@ class double_optional eProsima_user_DllExport double_optional( const double_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1039,7 +1025,7 @@ class double_optional const double_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1114,8 +1100,6 @@ class double_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1150,7 +1134,7 @@ class longdouble_optional eProsima_user_DllExport longdouble_optional( const longdouble_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1172,7 +1156,7 @@ class longdouble_optional const longdouble_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1247,8 +1231,6 @@ class longdouble_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1283,7 +1265,7 @@ class boolean_optional eProsima_user_DllExport boolean_optional( const boolean_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1305,7 +1287,7 @@ class boolean_optional const boolean_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1380,8 +1362,6 @@ class boolean_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1416,7 +1396,7 @@ class octet_optional eProsima_user_DllExport octet_optional( const octet_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1438,7 +1418,7 @@ class octet_optional const octet_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1513,8 +1493,6 @@ class octet_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1549,7 +1527,7 @@ class char_optional eProsima_user_DllExport char_optional( const char_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1571,7 +1549,7 @@ class char_optional const char_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1646,8 +1624,6 @@ class char_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1682,7 +1658,7 @@ class wchar_optional eProsima_user_DllExport wchar_optional( const wchar_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1704,7 +1680,7 @@ class wchar_optional const wchar_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1779,8 +1755,6 @@ class wchar_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -1815,9 +1789,9 @@ class short_align_1_optional eProsima_user_DllExport short_align_1_optional( const short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -1840,9 +1814,9 @@ class short_align_1_optional const short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1868,7 +1842,7 @@ class short_align_1_optional const short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -1909,7 +1883,6 @@ class short_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -1948,8 +1921,6 @@ class short_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -1985,9 +1956,9 @@ class short_align_2_optional eProsima_user_DllExport short_align_2_optional( const short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2010,9 +1981,9 @@ class short_align_2_optional const short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2038,7 +2009,7 @@ class short_align_2_optional const short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2079,7 +2050,6 @@ class short_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2118,8 +2088,6 @@ class short_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -2155,9 +2123,9 @@ class short_align_4_optional eProsima_user_DllExport short_align_4_optional( const short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2180,9 +2148,9 @@ class short_align_4_optional const short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2208,7 +2176,7 @@ class short_align_4_optional const short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2249,7 +2217,6 @@ class short_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2288,8 +2255,6 @@ class short_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -2325,9 +2290,9 @@ class ushort_align_1_optional eProsima_user_DllExport ushort_align_1_optional( const ushort_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2350,9 +2315,9 @@ class ushort_align_1_optional const ushort_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2378,7 +2343,7 @@ class ushort_align_1_optional const ushort_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2419,7 +2384,6 @@ class ushort_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2458,8 +2422,6 @@ class ushort_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -2495,9 +2457,9 @@ class ushort_align_2_optional eProsima_user_DllExport ushort_align_2_optional( const ushort_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2520,9 +2482,9 @@ class ushort_align_2_optional const ushort_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2548,7 +2510,7 @@ class ushort_align_2_optional const ushort_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2589,7 +2551,6 @@ class ushort_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2628,8 +2589,6 @@ class ushort_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -2665,9 +2624,9 @@ class ushort_align_4_optional eProsima_user_DllExport ushort_align_4_optional( const ushort_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2690,9 +2649,9 @@ class ushort_align_4_optional const ushort_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2718,7 +2677,7 @@ class ushort_align_4_optional const ushort_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2759,7 +2718,6 @@ class ushort_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2798,8 +2756,6 @@ class ushort_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -2835,9 +2791,9 @@ class long_align_1_optional eProsima_user_DllExport long_align_1_optional( const long_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2860,9 +2816,9 @@ class long_align_1_optional const long_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2888,7 +2844,7 @@ class long_align_1_optional const long_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2929,7 +2885,6 @@ class long_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2968,8 +2923,6 @@ class long_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -3005,9 +2958,9 @@ class long_align_2_optional eProsima_user_DllExport long_align_2_optional( const long_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3030,9 +2983,9 @@ class long_align_2_optional const long_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3058,7 +3011,7 @@ class long_align_2_optional const long_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3099,7 +3052,6 @@ class long_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3138,8 +3090,6 @@ class long_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -3175,9 +3125,9 @@ class long_align_4_optional eProsima_user_DllExport long_align_4_optional( const long_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3200,9 +3150,9 @@ class long_align_4_optional const long_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3228,7 +3178,7 @@ class long_align_4_optional const long_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3269,7 +3219,6 @@ class long_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3308,8 +3257,6 @@ class long_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -3345,9 +3292,9 @@ class ulong_align_1_optional eProsima_user_DllExport ulong_align_1_optional( const ulong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3370,9 +3317,9 @@ class ulong_align_1_optional const ulong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3398,7 +3345,7 @@ class ulong_align_1_optional const ulong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3439,7 +3386,6 @@ class ulong_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3478,8 +3424,6 @@ class ulong_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -3515,9 +3459,9 @@ class ulong_align_2_optional eProsima_user_DllExport ulong_align_2_optional( const ulong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3540,9 +3484,9 @@ class ulong_align_2_optional const ulong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3568,7 +3512,7 @@ class ulong_align_2_optional const ulong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3609,7 +3553,6 @@ class ulong_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3648,8 +3591,6 @@ class ulong_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -3685,9 +3626,9 @@ class ulong_align_4_optional eProsima_user_DllExport ulong_align_4_optional( const ulong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3710,9 +3651,9 @@ class ulong_align_4_optional const ulong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3738,7 +3679,7 @@ class ulong_align_4_optional const ulong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3779,7 +3720,6 @@ class ulong_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3818,8 +3758,6 @@ class ulong_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -3855,9 +3793,9 @@ class longlong_align_1_optional eProsima_user_DllExport longlong_align_1_optional( const longlong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3880,9 +3818,9 @@ class longlong_align_1_optional const longlong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3908,7 +3846,7 @@ class longlong_align_1_optional const longlong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3949,7 +3887,6 @@ class longlong_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3988,8 +3925,6 @@ class longlong_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -4025,9 +3960,9 @@ class longlong_align_2_optional eProsima_user_DllExport longlong_align_2_optional( const longlong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4050,9 +3985,9 @@ class longlong_align_2_optional const longlong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4078,7 +4013,7 @@ class longlong_align_2_optional const longlong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4119,7 +4054,6 @@ class longlong_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4158,8 +4092,6 @@ class longlong_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -4195,9 +4127,9 @@ class longlong_align_4_optional eProsima_user_DllExport longlong_align_4_optional( const longlong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4220,9 +4152,9 @@ class longlong_align_4_optional const longlong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4248,7 +4180,7 @@ class longlong_align_4_optional const longlong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4289,7 +4221,6 @@ class longlong_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4328,8 +4259,6 @@ class longlong_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -4365,9 +4294,9 @@ class ulonglong_align_1_optional eProsima_user_DllExport ulonglong_align_1_optional( const ulonglong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4390,9 +4319,9 @@ class ulonglong_align_1_optional const ulonglong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4418,7 +4347,7 @@ class ulonglong_align_1_optional const ulonglong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4459,7 +4388,6 @@ class ulonglong_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4498,8 +4426,6 @@ class ulonglong_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -4535,9 +4461,9 @@ class ulonglong_align_2_optional eProsima_user_DllExport ulonglong_align_2_optional( const ulonglong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4560,9 +4486,9 @@ class ulonglong_align_2_optional const ulonglong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4588,7 +4514,7 @@ class ulonglong_align_2_optional const ulonglong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4629,7 +4555,6 @@ class ulonglong_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4668,8 +4593,6 @@ class ulonglong_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -4705,9 +4628,9 @@ class ulonglong_align_4_optional eProsima_user_DllExport ulonglong_align_4_optional( const ulonglong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4730,9 +4653,9 @@ class ulonglong_align_4_optional const ulonglong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4758,7 +4681,7 @@ class ulonglong_align_4_optional const ulonglong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4799,7 +4722,6 @@ class ulonglong_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4838,8 +4760,6 @@ class ulonglong_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -4875,9 +4795,9 @@ class float_align_1_optional eProsima_user_DllExport float_align_1_optional( const float_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4900,9 +4820,9 @@ class float_align_1_optional const float_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4928,7 +4848,7 @@ class float_align_1_optional const float_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4969,7 +4889,6 @@ class float_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5008,8 +4927,6 @@ class float_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -5045,9 +4962,9 @@ class float_align_2_optional eProsima_user_DllExport float_align_2_optional( const float_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5070,9 +4987,9 @@ class float_align_2_optional const float_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5098,7 +5015,7 @@ class float_align_2_optional const float_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5139,7 +5056,6 @@ class float_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5178,8 +5094,6 @@ class float_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -5215,9 +5129,9 @@ class float_align_4_optional eProsima_user_DllExport float_align_4_optional( const float_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5240,9 +5154,9 @@ class float_align_4_optional const float_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5268,7 +5182,7 @@ class float_align_4_optional const float_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5309,7 +5223,6 @@ class float_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5348,8 +5261,6 @@ class float_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -5385,9 +5296,9 @@ class double_align_1_optional eProsima_user_DllExport double_align_1_optional( const double_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5410,9 +5321,9 @@ class double_align_1_optional const double_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5438,7 +5349,7 @@ class double_align_1_optional const double_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5479,7 +5390,6 @@ class double_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5518,8 +5428,6 @@ class double_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -5555,9 +5463,9 @@ class double_align_2_optional eProsima_user_DllExport double_align_2_optional( const double_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5580,9 +5488,9 @@ class double_align_2_optional const double_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5608,7 +5516,7 @@ class double_align_2_optional const double_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5649,7 +5557,6 @@ class double_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5688,8 +5595,6 @@ class double_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -5725,9 +5630,9 @@ class double_align_4_optional eProsima_user_DllExport double_align_4_optional( const double_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5750,9 +5655,9 @@ class double_align_4_optional const double_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5778,7 +5683,7 @@ class double_align_4_optional const double_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5819,7 +5724,6 @@ class double_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5858,8 +5762,6 @@ class double_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -5895,9 +5797,9 @@ class longdouble_align_1_optional eProsima_user_DllExport longdouble_align_1_optional( const longdouble_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5920,9 +5822,9 @@ class longdouble_align_1_optional const longdouble_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5948,7 +5850,7 @@ class longdouble_align_1_optional const longdouble_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5989,7 +5891,6 @@ class longdouble_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6028,8 +5929,6 @@ class longdouble_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -6065,9 +5964,9 @@ class longdouble_align_2_optional eProsima_user_DllExport longdouble_align_2_optional( const longdouble_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6090,9 +5989,9 @@ class longdouble_align_2_optional const longdouble_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6118,7 +6017,7 @@ class longdouble_align_2_optional const longdouble_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6159,7 +6058,6 @@ class longdouble_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6198,8 +6096,6 @@ class longdouble_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -6235,9 +6131,9 @@ class longdouble_align_4_optional eProsima_user_DllExport longdouble_align_4_optional( const longdouble_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6260,9 +6156,9 @@ class longdouble_align_4_optional const longdouble_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6288,7 +6184,7 @@ class longdouble_align_4_optional const longdouble_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6329,7 +6225,6 @@ class longdouble_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6368,8 +6263,6 @@ class longdouble_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -6405,9 +6298,9 @@ class boolean_align_1_optional eProsima_user_DllExport boolean_align_1_optional( const boolean_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6430,9 +6323,9 @@ class boolean_align_1_optional const boolean_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6458,7 +6351,7 @@ class boolean_align_1_optional const boolean_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6499,7 +6392,6 @@ class boolean_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6538,8 +6430,6 @@ class boolean_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -6575,9 +6465,9 @@ class boolean_align_2_optional eProsima_user_DllExport boolean_align_2_optional( const boolean_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6600,9 +6490,9 @@ class boolean_align_2_optional const boolean_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6628,7 +6518,7 @@ class boolean_align_2_optional const boolean_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6669,7 +6559,6 @@ class boolean_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6708,8 +6597,6 @@ class boolean_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -6745,9 +6632,9 @@ class boolean_align_4_optional eProsima_user_DllExport boolean_align_4_optional( const boolean_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6770,9 +6657,9 @@ class boolean_align_4_optional const boolean_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6798,7 +6685,7 @@ class boolean_align_4_optional const boolean_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6839,7 +6726,6 @@ class boolean_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6878,8 +6764,6 @@ class boolean_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -6915,9 +6799,9 @@ class octet_align_1_optional eProsima_user_DllExport octet_align_1_optional( const octet_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6940,9 +6824,9 @@ class octet_align_1_optional const octet_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6968,7 +6852,7 @@ class octet_align_1_optional const octet_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7009,7 +6893,6 @@ class octet_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7048,8 +6931,6 @@ class octet_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -7085,9 +6966,9 @@ class octet_align_2_optional eProsima_user_DllExport octet_align_2_optional( const octet_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7110,9 +6991,9 @@ class octet_align_2_optional const octet_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7138,7 +7019,7 @@ class octet_align_2_optional const octet_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7179,7 +7060,6 @@ class octet_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7218,8 +7098,6 @@ class octet_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -7255,9 +7133,9 @@ class octet_align_4_optional eProsima_user_DllExport octet_align_4_optional( const octet_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7280,9 +7158,9 @@ class octet_align_4_optional const octet_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7308,7 +7186,7 @@ class octet_align_4_optional const octet_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7349,7 +7227,6 @@ class octet_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7388,8 +7265,6 @@ class octet_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -7425,9 +7300,9 @@ class char_align_1_optional eProsima_user_DllExport char_align_1_optional( const char_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7450,9 +7325,9 @@ class char_align_1_optional const char_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7478,7 +7353,7 @@ class char_align_1_optional const char_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7519,7 +7394,6 @@ class char_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7558,8 +7432,6 @@ class char_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -7595,9 +7467,9 @@ class char_align_2_optional eProsima_user_DllExport char_align_2_optional( const char_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7620,9 +7492,9 @@ class char_align_2_optional const char_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7648,7 +7520,7 @@ class char_align_2_optional const char_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7689,7 +7561,6 @@ class char_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7728,8 +7599,6 @@ class char_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -7765,9 +7634,9 @@ class char_align_4_optional eProsima_user_DllExport char_align_4_optional( const char_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7790,9 +7659,9 @@ class char_align_4_optional const char_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7818,7 +7687,7 @@ class char_align_4_optional const char_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7859,7 +7728,6 @@ class char_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7898,8 +7766,6 @@ class char_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -7935,9 +7801,9 @@ class wchar_align_1_optional eProsima_user_DllExport wchar_align_1_optional( const wchar_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7960,9 +7826,9 @@ class wchar_align_1_optional const wchar_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7988,7 +7854,7 @@ class wchar_align_1_optional const wchar_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8029,7 +7895,6 @@ class wchar_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8068,8 +7933,6 @@ class wchar_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -8105,9 +7968,9 @@ class wchar_align_2_optional eProsima_user_DllExport wchar_align_2_optional( const wchar_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8130,9 +7993,9 @@ class wchar_align_2_optional const wchar_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8158,7 +8021,7 @@ class wchar_align_2_optional const wchar_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8199,7 +8062,6 @@ class wchar_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8238,8 +8100,6 @@ class wchar_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -8275,9 +8135,9 @@ class wchar_align_4_optional eProsima_user_DllExport wchar_align_4_optional( const wchar_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8300,9 +8160,9 @@ class wchar_align_4_optional const wchar_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8328,7 +8188,7 @@ class wchar_align_4_optional const wchar_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8369,7 +8229,6 @@ class wchar_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8408,8 +8267,6 @@ class wchar_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -8445,7 +8302,7 @@ class sequence_short_optional eProsima_user_DllExport sequence_short_optional( const sequence_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -8467,7 +8324,7 @@ class sequence_short_optional const sequence_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8542,8 +8399,6 @@ class sequence_short_optional return m_value; } - - private: eprosima::fastcdr::optional> m_value; @@ -8578,9 +8433,9 @@ class sequence_short_align_1_optional eProsima_user_DllExport sequence_short_align_1_optional( const sequence_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8603,9 +8458,9 @@ class sequence_short_align_1_optional const sequence_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8631,7 +8486,7 @@ class sequence_short_align_1_optional const sequence_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8672,7 +8527,6 @@ class sequence_short_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8711,8 +8565,6 @@ class sequence_short_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -8748,9 +8600,9 @@ class sequence_short_align_2_optional eProsima_user_DllExport sequence_short_align_2_optional( const sequence_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8773,9 +8625,9 @@ class sequence_short_align_2_optional const sequence_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8801,7 +8653,7 @@ class sequence_short_align_2_optional const sequence_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8842,7 +8694,6 @@ class sequence_short_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8881,8 +8732,6 @@ class sequence_short_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -8918,9 +8767,9 @@ class sequence_short_align_4_optional eProsima_user_DllExport sequence_short_align_4_optional( const sequence_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8943,9 +8792,9 @@ class sequence_short_align_4_optional const sequence_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8971,7 +8820,7 @@ class sequence_short_align_4_optional const sequence_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9012,7 +8861,6 @@ class sequence_short_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9051,8 +8899,6 @@ class sequence_short_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -9088,7 +8934,7 @@ class string_unbounded_optional eProsima_user_DllExport string_unbounded_optional( const string_unbounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -9110,7 +8956,7 @@ class string_unbounded_optional const string_unbounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9185,8 +9031,6 @@ class string_unbounded_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -9221,9 +9065,9 @@ class string_unbounded_align_1_optional eProsima_user_DllExport string_unbounded_align_1_optional( const string_unbounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9246,9 +9090,9 @@ class string_unbounded_align_1_optional const string_unbounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9274,7 +9118,7 @@ class string_unbounded_align_1_optional const string_unbounded_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9315,7 +9159,6 @@ class string_unbounded_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9354,8 +9197,6 @@ class string_unbounded_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -9391,9 +9232,9 @@ class string_unbounded_align_2_optional eProsima_user_DllExport string_unbounded_align_2_optional( const string_unbounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9416,9 +9257,9 @@ class string_unbounded_align_2_optional const string_unbounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9444,7 +9285,7 @@ class string_unbounded_align_2_optional const string_unbounded_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9485,7 +9326,6 @@ class string_unbounded_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9524,8 +9364,6 @@ class string_unbounded_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -9561,9 +9399,9 @@ class string_unbounded_align_4_optional eProsima_user_DllExport string_unbounded_align_4_optional( const string_unbounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9586,9 +9424,9 @@ class string_unbounded_align_4_optional const string_unbounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9614,7 +9452,7 @@ class string_unbounded_align_4_optional const string_unbounded_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9655,7 +9493,6 @@ class string_unbounded_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9694,8 +9531,6 @@ class string_unbounded_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -9731,7 +9566,7 @@ class string_bounded_optional eProsima_user_DllExport string_bounded_optional( const string_bounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -9753,7 +9588,7 @@ class string_bounded_optional const string_bounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9828,8 +9663,6 @@ class string_bounded_optional return m_value; } - - private: eprosima::fastcdr::optional> m_value; @@ -9864,9 +9697,9 @@ class string_bounded_align_1_optional eProsima_user_DllExport string_bounded_align_1_optional( const string_bounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9889,9 +9722,9 @@ class string_bounded_align_1_optional const string_bounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9917,7 +9750,7 @@ class string_bounded_align_1_optional const string_bounded_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9958,7 +9791,6 @@ class string_bounded_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9997,8 +9829,6 @@ class string_bounded_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -10034,9 +9864,9 @@ class string_bounded_align_2_optional eProsima_user_DllExport string_bounded_align_2_optional( const string_bounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10059,9 +9889,9 @@ class string_bounded_align_2_optional const string_bounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10087,7 +9917,7 @@ class string_bounded_align_2_optional const string_bounded_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10128,7 +9958,6 @@ class string_bounded_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10167,8 +9996,6 @@ class string_bounded_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -10204,9 +10031,9 @@ class string_bounded_align_4_optional eProsima_user_DllExport string_bounded_align_4_optional( const string_bounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10229,9 +10056,9 @@ class string_bounded_align_4_optional const string_bounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10257,7 +10084,7 @@ class string_bounded_align_4_optional const string_bounded_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10298,7 +10125,6 @@ class string_bounded_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10337,8 +10163,6 @@ class string_bounded_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -10374,7 +10198,7 @@ class map_short_optional eProsima_user_DllExport map_short_optional( const map_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -10396,7 +10220,7 @@ class map_short_optional const map_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10471,8 +10295,6 @@ class map_short_optional return m_value; } - - private: eprosima::fastcdr::optional> m_value; @@ -10507,9 +10329,9 @@ class map_short_align_1_optional eProsima_user_DllExport map_short_align_1_optional( const map_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10532,9 +10354,9 @@ class map_short_align_1_optional const map_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10560,7 +10382,7 @@ class map_short_align_1_optional const map_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10601,7 +10423,6 @@ class map_short_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10640,8 +10461,6 @@ class map_short_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -10677,9 +10496,9 @@ class map_short_align_2_optional eProsima_user_DllExport map_short_align_2_optional( const map_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10702,9 +10521,9 @@ class map_short_align_2_optional const map_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10730,7 +10549,7 @@ class map_short_align_2_optional const map_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10771,7 +10590,6 @@ class map_short_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10810,8 +10628,6 @@ class map_short_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -10847,9 +10663,9 @@ class map_short_align_4_optional eProsima_user_DllExport map_short_align_4_optional( const map_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10872,9 +10688,9 @@ class map_short_align_4_optional const map_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10900,7 +10716,7 @@ class map_short_align_4_optional const map_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10941,7 +10757,6 @@ class map_short_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10980,8 +10795,6 @@ class map_short_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -11017,7 +10830,7 @@ class array_short_optional eProsima_user_DllExport array_short_optional( const array_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -11039,7 +10852,7 @@ class array_short_optional const array_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11114,8 +10927,6 @@ class array_short_optional return m_value; } - - private: eprosima::fastcdr::optional> m_value; @@ -11150,9 +10961,9 @@ class array_short_align_1_optional eProsima_user_DllExport array_short_align_1_optional( const array_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11175,9 +10986,9 @@ class array_short_align_1_optional const array_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11203,7 +11014,7 @@ class array_short_align_1_optional const array_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11244,7 +11055,6 @@ class array_short_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11283,8 +11093,6 @@ class array_short_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -11320,9 +11128,9 @@ class array_short_align_2_optional eProsima_user_DllExport array_short_align_2_optional( const array_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11345,9 +11153,9 @@ class array_short_align_2_optional const array_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11373,7 +11181,7 @@ class array_short_align_2_optional const array_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11414,7 +11222,6 @@ class array_short_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11453,8 +11260,6 @@ class array_short_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -11490,9 +11295,9 @@ class array_short_align_4_optional eProsima_user_DllExport array_short_align_4_optional( const array_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11515,9 +11320,9 @@ class array_short_align_4_optional const array_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11543,7 +11348,7 @@ class array_short_align_4_optional const array_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11584,7 +11389,6 @@ class array_short_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11623,8 +11427,6 @@ class array_short_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -11660,7 +11462,7 @@ class struct_optional eProsima_user_DllExport struct_optional( const struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -11682,7 +11484,7 @@ class struct_optional const struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11757,8 +11559,6 @@ class struct_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -11793,9 +11593,9 @@ class struct_align_1_optional eProsima_user_DllExport struct_align_1_optional( const struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11818,9 +11618,9 @@ class struct_align_1_optional const struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11846,7 +11646,7 @@ class struct_align_1_optional const struct_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11887,7 +11687,6 @@ class struct_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11926,8 +11725,6 @@ class struct_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -11963,9 +11760,9 @@ class struct_align_2_optional eProsima_user_DllExport struct_align_2_optional( const struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11988,9 +11785,9 @@ class struct_align_2_optional const struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12016,7 +11813,7 @@ class struct_align_2_optional const struct_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12057,7 +11854,6 @@ class struct_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12096,8 +11892,6 @@ class struct_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -12133,9 +11927,9 @@ class struct_align_4_optional eProsima_user_DllExport struct_align_4_optional( const struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12158,9 +11952,9 @@ class struct_align_4_optional const struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12186,7 +11980,7 @@ class struct_align_4_optional const struct_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12227,7 +12021,6 @@ class struct_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12266,8 +12059,6 @@ class struct_align_4_optional return m_value; } - - private: uint32_t m_align{0}; @@ -12303,9 +12094,9 @@ class InnerStructOptional eProsima_user_DllExport InnerStructOptional( const InnerStructOptional& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; } @@ -12328,9 +12119,9 @@ class InnerStructOptional const InnerStructOptional& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; return *this; } @@ -12356,7 +12147,7 @@ class InnerStructOptional const InnerStructOptional& x) const { return (m_s == x.m_s && - m_l == x.m_l); + m_l == x.m_l); } /*! @@ -12397,7 +12188,6 @@ class InnerStructOptional return m_s; } - /*! * @brief This function copies the value in member l * @param _l New value to be copied in member l @@ -12436,8 +12226,6 @@ class InnerStructOptional return m_l; } - - private: int16_t m_s{0}; @@ -12473,7 +12261,7 @@ class opt_struct_optional eProsima_user_DllExport opt_struct_optional( const opt_struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -12495,7 +12283,7 @@ class opt_struct_optional const opt_struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12570,8 +12358,6 @@ class opt_struct_optional return m_value; } - - private: eprosima::fastcdr::optional m_value; @@ -12606,9 +12392,9 @@ class opt_struct_align_1_optional eProsima_user_DllExport opt_struct_align_1_optional( const opt_struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12631,9 +12417,9 @@ class opt_struct_align_1_optional const opt_struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12659,7 +12445,7 @@ class opt_struct_align_1_optional const opt_struct_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12700,7 +12486,6 @@ class opt_struct_align_1_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12739,8 +12524,6 @@ class opt_struct_align_1_optional return m_value; } - - private: uint8_t m_align{0}; @@ -12776,9 +12559,9 @@ class opt_struct_align_2_optional eProsima_user_DllExport opt_struct_align_2_optional( const opt_struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12801,9 +12584,9 @@ class opt_struct_align_2_optional const opt_struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12829,7 +12612,7 @@ class opt_struct_align_2_optional const opt_struct_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12870,7 +12653,6 @@ class opt_struct_align_2_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12909,8 +12691,6 @@ class opt_struct_align_2_optional return m_value; } - - private: uint16_t m_align{0}; @@ -12946,9 +12726,9 @@ class opt_struct_align_4_optional eProsima_user_DllExport opt_struct_align_4_optional( const opt_struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12971,9 +12751,9 @@ class opt_struct_align_4_optional const opt_struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12999,7 +12779,7 @@ class opt_struct_align_4_optional const opt_struct_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -13040,7 +12820,6 @@ class opt_struct_align_4_optional return m_align; } - /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -13079,8 +12858,6 @@ class opt_struct_align_4_optional return m_value; } - - private: uint32_t m_align{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp index 041ad148..376d4ea8 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp @@ -78,7 +78,7 @@ class ShortStruct eProsima_user_DllExport ShortStruct( const ShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -100,7 +100,7 @@ class ShortStruct const ShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -165,8 +165,6 @@ class ShortStruct return m_var_short; } - - private: int16_t m_var_short{0}; @@ -201,7 +199,7 @@ class UShortStruct eProsima_user_DllExport UShortStruct( const UShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -223,7 +221,7 @@ class UShortStruct const UShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -288,8 +286,6 @@ class UShortStruct return m_var_ushort; } - - private: uint16_t m_var_ushort{0}; @@ -324,7 +320,7 @@ class LongStruct eProsima_user_DllExport LongStruct( const LongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -346,7 +342,7 @@ class LongStruct const LongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -411,8 +407,6 @@ class LongStruct return m_var_long; } - - private: int32_t m_var_long{0}; @@ -447,7 +441,7 @@ class ULongStruct eProsima_user_DllExport ULongStruct( const ULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -469,7 +463,7 @@ class ULongStruct const ULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -534,8 +528,6 @@ class ULongStruct return m_var_ulong; } - - private: uint32_t m_var_ulong{0}; @@ -570,7 +562,7 @@ class LongLongStruct eProsima_user_DllExport LongLongStruct( const LongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -592,7 +584,7 @@ class LongLongStruct const LongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -657,8 +649,6 @@ class LongLongStruct return m_var_longlong; } - - private: int64_t m_var_longlong{0}; @@ -693,7 +683,7 @@ class ULongLongStruct eProsima_user_DllExport ULongLongStruct( const ULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -715,7 +705,7 @@ class ULongLongStruct const ULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -780,8 +770,6 @@ class ULongLongStruct return m_var_ulonglong; } - - private: uint64_t m_var_ulonglong{0}; @@ -816,7 +804,7 @@ class FloatStruct eProsima_user_DllExport FloatStruct( const FloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -838,7 +826,7 @@ class FloatStruct const FloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -903,8 +891,6 @@ class FloatStruct return m_var_float; } - - private: float m_var_float{0.0}; @@ -939,7 +925,7 @@ class DoubleStruct eProsima_user_DllExport DoubleStruct( const DoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -961,7 +947,7 @@ class DoubleStruct const DoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1026,8 +1012,6 @@ class DoubleStruct return m_var_double; } - - private: double m_var_double{0.0}; @@ -1062,7 +1046,7 @@ class LongDoubleStruct eProsima_user_DllExport LongDoubleStruct( const LongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1084,7 +1068,7 @@ class LongDoubleStruct const LongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1149,8 +1133,6 @@ class LongDoubleStruct return m_var_longdouble; } - - private: long double m_var_longdouble{0.0}; @@ -1185,7 +1167,7 @@ class BooleanStruct eProsima_user_DllExport BooleanStruct( const BooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1207,7 +1189,7 @@ class BooleanStruct const BooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1272,8 +1254,6 @@ class BooleanStruct return m_var_boolean; } - - private: bool m_var_boolean{false}; @@ -1308,7 +1288,7 @@ class OctetStruct eProsima_user_DllExport OctetStruct( const OctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1330,7 +1310,7 @@ class OctetStruct const OctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1395,8 +1375,6 @@ class OctetStruct return m_var_octet; } - - private: uint8_t m_var_octet{0}; @@ -1431,7 +1409,7 @@ class CharStruct eProsima_user_DllExport CharStruct( const CharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1453,7 +1431,7 @@ class CharStruct const CharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1518,8 +1496,6 @@ class CharStruct return m_var_char8; } - - private: char m_var_char8{0}; @@ -1554,7 +1530,7 @@ class WCharStruct eProsima_user_DllExport WCharStruct( const WCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1576,7 +1552,7 @@ class WCharStruct const WCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1641,8 +1617,6 @@ class WCharStruct return m_var_char16; } - - private: wchar_t m_var_char16{0}; @@ -1677,7 +1651,7 @@ class Int8Struct eProsima_user_DllExport Int8Struct( const Int8Struct& x) { - m_var_int8 = x.m_var_int8; + m_var_int8 = x.m_var_int8; } @@ -1699,7 +1673,7 @@ class Int8Struct const Int8Struct& x) { - m_var_int8 = x.m_var_int8; + m_var_int8 = x.m_var_int8; return *this; } @@ -1764,8 +1738,6 @@ class Int8Struct return m_var_int8; } - - private: int8_t m_var_int8{0}; @@ -1800,7 +1772,7 @@ class Uint8Struct eProsima_user_DllExport Uint8Struct( const Uint8Struct& x) { - m_var_uint8 = x.m_var_uint8; + m_var_uint8 = x.m_var_uint8; } @@ -1822,7 +1794,7 @@ class Uint8Struct const Uint8Struct& x) { - m_var_uint8 = x.m_var_uint8; + m_var_uint8 = x.m_var_uint8; return *this; } @@ -1887,8 +1859,6 @@ class Uint8Struct return m_var_uint8; } - - private: uint8_t m_var_uint8{0}; @@ -1923,7 +1893,7 @@ class Int16Struct eProsima_user_DllExport Int16Struct( const Int16Struct& x) { - m_var_int16 = x.m_var_int16; + m_var_int16 = x.m_var_int16; } @@ -1945,7 +1915,7 @@ class Int16Struct const Int16Struct& x) { - m_var_int16 = x.m_var_int16; + m_var_int16 = x.m_var_int16; return *this; } @@ -2010,8 +1980,6 @@ class Int16Struct return m_var_int16; } - - private: int16_t m_var_int16{0}; @@ -2046,7 +2014,7 @@ class Uint16Struct eProsima_user_DllExport Uint16Struct( const Uint16Struct& x) { - m_var_uint16 = x.m_var_uint16; + m_var_uint16 = x.m_var_uint16; } @@ -2068,7 +2036,7 @@ class Uint16Struct const Uint16Struct& x) { - m_var_uint16 = x.m_var_uint16; + m_var_uint16 = x.m_var_uint16; return *this; } @@ -2133,8 +2101,6 @@ class Uint16Struct return m_var_uint16; } - - private: uint16_t m_var_uint16{0}; @@ -2169,7 +2135,7 @@ class Int32Struct eProsima_user_DllExport Int32Struct( const Int32Struct& x) { - m_var_int32 = x.m_var_int32; + m_var_int32 = x.m_var_int32; } @@ -2191,7 +2157,7 @@ class Int32Struct const Int32Struct& x) { - m_var_int32 = x.m_var_int32; + m_var_int32 = x.m_var_int32; return *this; } @@ -2256,8 +2222,6 @@ class Int32Struct return m_var_int32; } - - private: int32_t m_var_int32{0}; @@ -2292,7 +2256,7 @@ class Uint32Struct eProsima_user_DllExport Uint32Struct( const Uint32Struct& x) { - m_var_uint32 = x.m_var_uint32; + m_var_uint32 = x.m_var_uint32; } @@ -2314,7 +2278,7 @@ class Uint32Struct const Uint32Struct& x) { - m_var_uint32 = x.m_var_uint32; + m_var_uint32 = x.m_var_uint32; return *this; } @@ -2379,8 +2343,6 @@ class Uint32Struct return m_var_uint32; } - - private: uint32_t m_var_uint32{0}; @@ -2415,7 +2377,7 @@ class Int64Struct eProsima_user_DllExport Int64Struct( const Int64Struct& x) { - m_var_int64 = x.m_var_int64; + m_var_int64 = x.m_var_int64; } @@ -2437,7 +2399,7 @@ class Int64Struct const Int64Struct& x) { - m_var_int64 = x.m_var_int64; + m_var_int64 = x.m_var_int64; return *this; } @@ -2502,8 +2464,6 @@ class Int64Struct return m_var_int64; } - - private: int64_t m_var_int64{0}; @@ -2538,7 +2498,7 @@ class Uint64Struct eProsima_user_DllExport Uint64Struct( const Uint64Struct& x) { - m_var_uint64 = x.m_var_uint64; + m_var_uint64 = x.m_var_uint64; } @@ -2560,7 +2520,7 @@ class Uint64Struct const Uint64Struct& x) { - m_var_uint64 = x.m_var_uint64; + m_var_uint64 = x.m_var_uint64; return *this; } @@ -2625,8 +2585,6 @@ class Uint64Struct return m_var_uint64; } - - private: uint64_t m_var_uint64{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp index 90fcdcf5..38d044d5 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp @@ -83,7 +83,7 @@ class SequenceShort eProsima_user_DllExport SequenceShort( const SequenceShort& x) { - m_var_sequence_short = x.m_var_sequence_short; + m_var_sequence_short = x.m_var_sequence_short; } @@ -105,7 +105,7 @@ class SequenceShort const SequenceShort& x) { - m_var_sequence_short = x.m_var_sequence_short; + m_var_sequence_short = x.m_var_sequence_short; return *this; } @@ -180,8 +180,6 @@ class SequenceShort return m_var_sequence_short; } - - private: std::vector m_var_sequence_short; @@ -216,7 +214,7 @@ class SequenceUShort eProsima_user_DllExport SequenceUShort( const SequenceUShort& x) { - m_var_sequence_ushort = x.m_var_sequence_ushort; + m_var_sequence_ushort = x.m_var_sequence_ushort; } @@ -238,7 +236,7 @@ class SequenceUShort const SequenceUShort& x) { - m_var_sequence_ushort = x.m_var_sequence_ushort; + m_var_sequence_ushort = x.m_var_sequence_ushort; return *this; } @@ -313,8 +311,6 @@ class SequenceUShort return m_var_sequence_ushort; } - - private: std::vector m_var_sequence_ushort; @@ -349,7 +345,7 @@ class SequenceLong eProsima_user_DllExport SequenceLong( const SequenceLong& x) { - m_var_sequence_long = x.m_var_sequence_long; + m_var_sequence_long = x.m_var_sequence_long; } @@ -371,7 +367,7 @@ class SequenceLong const SequenceLong& x) { - m_var_sequence_long = x.m_var_sequence_long; + m_var_sequence_long = x.m_var_sequence_long; return *this; } @@ -446,8 +442,6 @@ class SequenceLong return m_var_sequence_long; } - - private: std::vector m_var_sequence_long; @@ -482,7 +476,7 @@ class SequenceULong eProsima_user_DllExport SequenceULong( const SequenceULong& x) { - m_var_sequence_ulong = x.m_var_sequence_ulong; + m_var_sequence_ulong = x.m_var_sequence_ulong; } @@ -504,7 +498,7 @@ class SequenceULong const SequenceULong& x) { - m_var_sequence_ulong = x.m_var_sequence_ulong; + m_var_sequence_ulong = x.m_var_sequence_ulong; return *this; } @@ -579,8 +573,6 @@ class SequenceULong return m_var_sequence_ulong; } - - private: std::vector m_var_sequence_ulong; @@ -615,7 +607,7 @@ class SequenceLongLong eProsima_user_DllExport SequenceLongLong( const SequenceLongLong& x) { - m_var_sequence_longlong = x.m_var_sequence_longlong; + m_var_sequence_longlong = x.m_var_sequence_longlong; } @@ -637,7 +629,7 @@ class SequenceLongLong const SequenceLongLong& x) { - m_var_sequence_longlong = x.m_var_sequence_longlong; + m_var_sequence_longlong = x.m_var_sequence_longlong; return *this; } @@ -712,8 +704,6 @@ class SequenceLongLong return m_var_sequence_longlong; } - - private: std::vector m_var_sequence_longlong; @@ -748,7 +738,7 @@ class SequenceULongLong eProsima_user_DllExport SequenceULongLong( const SequenceULongLong& x) { - m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; + m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; } @@ -770,7 +760,7 @@ class SequenceULongLong const SequenceULongLong& x) { - m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; + m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; return *this; } @@ -845,8 +835,6 @@ class SequenceULongLong return m_var_sequence_ulonglong; } - - private: std::vector m_var_sequence_ulonglong; @@ -881,7 +869,7 @@ class SequenceFloat eProsima_user_DllExport SequenceFloat( const SequenceFloat& x) { - m_var_sequence_float = x.m_var_sequence_float; + m_var_sequence_float = x.m_var_sequence_float; } @@ -903,7 +891,7 @@ class SequenceFloat const SequenceFloat& x) { - m_var_sequence_float = x.m_var_sequence_float; + m_var_sequence_float = x.m_var_sequence_float; return *this; } @@ -978,8 +966,6 @@ class SequenceFloat return m_var_sequence_float; } - - private: std::vector m_var_sequence_float; @@ -1014,7 +1000,7 @@ class SequenceDouble eProsima_user_DllExport SequenceDouble( const SequenceDouble& x) { - m_var_sequence_double = x.m_var_sequence_double; + m_var_sequence_double = x.m_var_sequence_double; } @@ -1036,7 +1022,7 @@ class SequenceDouble const SequenceDouble& x) { - m_var_sequence_double = x.m_var_sequence_double; + m_var_sequence_double = x.m_var_sequence_double; return *this; } @@ -1111,8 +1097,6 @@ class SequenceDouble return m_var_sequence_double; } - - private: std::vector m_var_sequence_double; @@ -1147,7 +1131,7 @@ class SequenceLongDouble eProsima_user_DllExport SequenceLongDouble( const SequenceLongDouble& x) { - m_var_sequence_longdouble = x.m_var_sequence_longdouble; + m_var_sequence_longdouble = x.m_var_sequence_longdouble; } @@ -1169,7 +1153,7 @@ class SequenceLongDouble const SequenceLongDouble& x) { - m_var_sequence_longdouble = x.m_var_sequence_longdouble; + m_var_sequence_longdouble = x.m_var_sequence_longdouble; return *this; } @@ -1244,8 +1228,6 @@ class SequenceLongDouble return m_var_sequence_longdouble; } - - private: std::vector m_var_sequence_longdouble; @@ -1280,7 +1262,7 @@ class SequenceBoolean eProsima_user_DllExport SequenceBoolean( const SequenceBoolean& x) { - m_var_sequence_boolean = x.m_var_sequence_boolean; + m_var_sequence_boolean = x.m_var_sequence_boolean; } @@ -1302,7 +1284,7 @@ class SequenceBoolean const SequenceBoolean& x) { - m_var_sequence_boolean = x.m_var_sequence_boolean; + m_var_sequence_boolean = x.m_var_sequence_boolean; return *this; } @@ -1377,8 +1359,6 @@ class SequenceBoolean return m_var_sequence_boolean; } - - private: std::vector m_var_sequence_boolean; @@ -1413,7 +1393,7 @@ class SequenceOctet eProsima_user_DllExport SequenceOctet( const SequenceOctet& x) { - m_var_sequence_octet = x.m_var_sequence_octet; + m_var_sequence_octet = x.m_var_sequence_octet; } @@ -1435,7 +1415,7 @@ class SequenceOctet const SequenceOctet& x) { - m_var_sequence_octet = x.m_var_sequence_octet; + m_var_sequence_octet = x.m_var_sequence_octet; return *this; } @@ -1510,8 +1490,6 @@ class SequenceOctet return m_var_sequence_octet; } - - private: std::vector m_var_sequence_octet; @@ -1546,7 +1524,7 @@ class SequenceChar eProsima_user_DllExport SequenceChar( const SequenceChar& x) { - m_var_sequence_char = x.m_var_sequence_char; + m_var_sequence_char = x.m_var_sequence_char; } @@ -1568,7 +1546,7 @@ class SequenceChar const SequenceChar& x) { - m_var_sequence_char = x.m_var_sequence_char; + m_var_sequence_char = x.m_var_sequence_char; return *this; } @@ -1643,8 +1621,6 @@ class SequenceChar return m_var_sequence_char; } - - private: std::vector m_var_sequence_char; @@ -1679,7 +1655,7 @@ class SequenceWChar eProsima_user_DllExport SequenceWChar( const SequenceWChar& x) { - m_var_sequence_wchar = x.m_var_sequence_wchar; + m_var_sequence_wchar = x.m_var_sequence_wchar; } @@ -1701,7 +1677,7 @@ class SequenceWChar const SequenceWChar& x) { - m_var_sequence_wchar = x.m_var_sequence_wchar; + m_var_sequence_wchar = x.m_var_sequence_wchar; return *this; } @@ -1776,8 +1752,6 @@ class SequenceWChar return m_var_sequence_wchar; } - - private: std::vector m_var_sequence_wchar; @@ -1812,7 +1786,7 @@ class SequenceString eProsima_user_DllExport SequenceString( const SequenceString& x) { - m_var_sequence_string = x.m_var_sequence_string; + m_var_sequence_string = x.m_var_sequence_string; } @@ -1834,7 +1808,7 @@ class SequenceString const SequenceString& x) { - m_var_sequence_string = x.m_var_sequence_string; + m_var_sequence_string = x.m_var_sequence_string; return *this; } @@ -1909,8 +1883,6 @@ class SequenceString return m_var_sequence_string; } - - private: std::vector m_var_sequence_string; @@ -1945,7 +1917,7 @@ class SequenceWString eProsima_user_DllExport SequenceWString( const SequenceWString& x) { - m_var_sequence_wstring = x.m_var_sequence_wstring; + m_var_sequence_wstring = x.m_var_sequence_wstring; } @@ -1967,7 +1939,7 @@ class SequenceWString const SequenceWString& x) { - m_var_sequence_wstring = x.m_var_sequence_wstring; + m_var_sequence_wstring = x.m_var_sequence_wstring; return *this; } @@ -2042,8 +2014,6 @@ class SequenceWString return m_var_sequence_wstring; } - - private: std::vector m_var_sequence_wstring; @@ -2078,7 +2048,7 @@ class SequenceStringBounded eProsima_user_DllExport SequenceStringBounded( const SequenceStringBounded& x) { - m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; + m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; } @@ -2100,7 +2070,7 @@ class SequenceStringBounded const SequenceStringBounded& x) { - m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; + m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; return *this; } @@ -2175,8 +2145,6 @@ class SequenceStringBounded return m_var_sequence_bounded_string; } - - private: std::vector m_var_sequence_bounded_string; @@ -2211,7 +2179,7 @@ class SequenceWStringBounded eProsima_user_DllExport SequenceWStringBounded( const SequenceWStringBounded& x) { - m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; + m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; } @@ -2233,7 +2201,7 @@ class SequenceWStringBounded const SequenceWStringBounded& x) { - m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; + m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; return *this; } @@ -2308,8 +2276,6 @@ class SequenceWStringBounded return m_var_sequence_bounded_wstring; } - - private: std::vector m_var_sequence_bounded_wstring; @@ -2344,7 +2310,7 @@ class SequenceEnum eProsima_user_DllExport SequenceEnum( const SequenceEnum& x) { - m_var_sequence_enum = x.m_var_sequence_enum; + m_var_sequence_enum = x.m_var_sequence_enum; } @@ -2366,7 +2332,7 @@ class SequenceEnum const SequenceEnum& x) { - m_var_sequence_enum = x.m_var_sequence_enum; + m_var_sequence_enum = x.m_var_sequence_enum; return *this; } @@ -2441,8 +2407,6 @@ class SequenceEnum return m_var_sequence_enum; } - - private: std::vector m_var_sequence_enum; @@ -2477,7 +2441,7 @@ class SequenceBitMask eProsima_user_DllExport SequenceBitMask( const SequenceBitMask& x) { - m_var_sequence_bitmask = x.m_var_sequence_bitmask; + m_var_sequence_bitmask = x.m_var_sequence_bitmask; } @@ -2499,7 +2463,7 @@ class SequenceBitMask const SequenceBitMask& x) { - m_var_sequence_bitmask = x.m_var_sequence_bitmask; + m_var_sequence_bitmask = x.m_var_sequence_bitmask; return *this; } @@ -2574,8 +2538,6 @@ class SequenceBitMask return m_var_sequence_bitmask; } - - private: std::vector m_var_sequence_bitmask; @@ -2610,7 +2572,7 @@ class SequenceAlias eProsima_user_DllExport SequenceAlias( const SequenceAlias& x) { - m_var_sequence_alias = x.m_var_sequence_alias; + m_var_sequence_alias = x.m_var_sequence_alias; } @@ -2632,7 +2594,7 @@ class SequenceAlias const SequenceAlias& x) { - m_var_sequence_alias = x.m_var_sequence_alias; + m_var_sequence_alias = x.m_var_sequence_alias; return *this; } @@ -2707,8 +2669,6 @@ class SequenceAlias return m_var_sequence_alias; } - - private: std::vector m_var_sequence_alias; @@ -2743,7 +2703,7 @@ class SequenceShortArray eProsima_user_DllExport SequenceShortArray( const SequenceShortArray& x) { - m_var_sequence_short_array = x.m_var_sequence_short_array; + m_var_sequence_short_array = x.m_var_sequence_short_array; } @@ -2765,7 +2725,7 @@ class SequenceShortArray const SequenceShortArray& x) { - m_var_sequence_short_array = x.m_var_sequence_short_array; + m_var_sequence_short_array = x.m_var_sequence_short_array; return *this; } @@ -2840,8 +2800,6 @@ class SequenceShortArray return m_var_sequence_short_array; } - - private: std::vector m_var_sequence_short_array; @@ -2876,7 +2834,7 @@ class SequenceSequence eProsima_user_DllExport SequenceSequence( const SequenceSequence& x) { - m_var_sequence_sequence = x.m_var_sequence_sequence; + m_var_sequence_sequence = x.m_var_sequence_sequence; } @@ -2898,7 +2856,7 @@ class SequenceSequence const SequenceSequence& x) { - m_var_sequence_sequence = x.m_var_sequence_sequence; + m_var_sequence_sequence = x.m_var_sequence_sequence; return *this; } @@ -2973,8 +2931,6 @@ class SequenceSequence return m_var_sequence_sequence; } - - private: std::vector m_var_sequence_sequence; @@ -3009,7 +2965,7 @@ class SequenceMap eProsima_user_DllExport SequenceMap( const SequenceMap& x) { - m_var_sequence_map = x.m_var_sequence_map; + m_var_sequence_map = x.m_var_sequence_map; } @@ -3031,7 +2987,7 @@ class SequenceMap const SequenceMap& x) { - m_var_sequence_map = x.m_var_sequence_map; + m_var_sequence_map = x.m_var_sequence_map; return *this; } @@ -3106,8 +3062,6 @@ class SequenceMap return m_var_sequence_map; } - - private: std::vector m_var_sequence_map; @@ -3142,7 +3096,7 @@ class SequenceUnion eProsima_user_DllExport SequenceUnion( const SequenceUnion& x) { - m_var_sequence_union = x.m_var_sequence_union; + m_var_sequence_union = x.m_var_sequence_union; } @@ -3164,7 +3118,7 @@ class SequenceUnion const SequenceUnion& x) { - m_var_sequence_union = x.m_var_sequence_union; + m_var_sequence_union = x.m_var_sequence_union; return *this; } @@ -3239,8 +3193,6 @@ class SequenceUnion return m_var_sequence_union; } - - private: std::vector m_var_sequence_union; @@ -3275,7 +3227,7 @@ class SequenceStructure eProsima_user_DllExport SequenceStructure( const SequenceStructure& x) { - m_var_sequence_structure = x.m_var_sequence_structure; + m_var_sequence_structure = x.m_var_sequence_structure; } @@ -3297,7 +3249,7 @@ class SequenceStructure const SequenceStructure& x) { - m_var_sequence_structure = x.m_var_sequence_structure; + m_var_sequence_structure = x.m_var_sequence_structure; return *this; } @@ -3372,8 +3324,6 @@ class SequenceStructure return m_var_sequence_structure; } - - private: std::vector m_var_sequence_structure; @@ -3408,7 +3358,7 @@ class SequenceBitset eProsima_user_DllExport SequenceBitset( const SequenceBitset& x) { - m_var_sequence_bitset = x.m_var_sequence_bitset; + m_var_sequence_bitset = x.m_var_sequence_bitset; } @@ -3430,7 +3380,7 @@ class SequenceBitset const SequenceBitset& x) { - m_var_sequence_bitset = x.m_var_sequence_bitset; + m_var_sequence_bitset = x.m_var_sequence_bitset; return *this; } @@ -3505,8 +3455,6 @@ class SequenceBitset return m_var_sequence_bitset; } - - private: std::vector m_var_sequence_bitset; @@ -3541,9 +3489,9 @@ class BoundedSmallSequences eProsima_user_DllExport BoundedSmallSequences( const BoundedSmallSequences& x) { - m_var_sequence_small = x.m_var_sequence_small; + m_var_sequence_small = x.m_var_sequence_small; - m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; + m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; } @@ -3566,9 +3514,9 @@ class BoundedSmallSequences const BoundedSmallSequences& x) { - m_var_sequence_small = x.m_var_sequence_small; + m_var_sequence_small = x.m_var_sequence_small; - m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; + m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; return *this; } @@ -3594,7 +3542,7 @@ class BoundedSmallSequences const BoundedSmallSequences& x) const { return (m_var_sequence_small == x.m_var_sequence_small && - m_var_unbounded_string_small_bounded_sequence == x.m_var_unbounded_string_small_bounded_sequence); + m_var_unbounded_string_small_bounded_sequence == x.m_var_unbounded_string_small_bounded_sequence); } /*! @@ -3645,7 +3593,6 @@ class BoundedSmallSequences return m_var_sequence_small; } - /*! * @brief This function copies the value in member var_unbounded_string_small_bounded_sequence * @param _var_unbounded_string_small_bounded_sequence New value to be copied in member var_unbounded_string_small_bounded_sequence @@ -3684,8 +3631,6 @@ class BoundedSmallSequences return m_var_unbounded_string_small_bounded_sequence; } - - private: std::vector m_var_sequence_small; @@ -3721,9 +3666,9 @@ class BoundedBigSequences eProsima_user_DllExport BoundedBigSequences( const BoundedBigSequences& x) { - m_var_sequence_big = x.m_var_sequence_big; + m_var_sequence_big = x.m_var_sequence_big; - m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; + m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; } @@ -3746,9 +3691,9 @@ class BoundedBigSequences const BoundedBigSequences& x) { - m_var_sequence_big = x.m_var_sequence_big; + m_var_sequence_big = x.m_var_sequence_big; - m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; + m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; return *this; } @@ -3774,7 +3719,7 @@ class BoundedBigSequences const BoundedBigSequences& x) const { return (m_var_sequence_big == x.m_var_sequence_big && - m_var_unbounded_string_large_bounded_sequence == x.m_var_unbounded_string_large_bounded_sequence); + m_var_unbounded_string_large_bounded_sequence == x.m_var_unbounded_string_large_bounded_sequence); } /*! @@ -3825,7 +3770,6 @@ class BoundedBigSequences return m_var_sequence_big; } - /*! * @brief This function copies the value in member var_unbounded_string_large_bounded_sequence * @param _var_unbounded_string_large_bounded_sequence New value to be copied in member var_unbounded_string_large_bounded_sequence @@ -3864,8 +3808,6 @@ class BoundedBigSequences return m_var_unbounded_string_large_bounded_sequence; } - - private: std::vector m_var_sequence_big; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp index 1ea3b4c1..f6fff8a9 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp @@ -80,7 +80,7 @@ class StringStruct eProsima_user_DllExport StringStruct( const StringStruct& x) { - m_var_string8 = x.m_var_string8; + m_var_string8 = x.m_var_string8; } @@ -102,7 +102,7 @@ class StringStruct const StringStruct& x) { - m_var_string8 = x.m_var_string8; + m_var_string8 = x.m_var_string8; return *this; } @@ -177,8 +177,6 @@ class StringStruct return m_var_string8; } - - private: std::string m_var_string8; @@ -213,7 +211,7 @@ class WStringStruct eProsima_user_DllExport WStringStruct( const WStringStruct& x) { - m_var_string16 = x.m_var_string16; + m_var_string16 = x.m_var_string16; } @@ -235,7 +233,7 @@ class WStringStruct const WStringStruct& x) { - m_var_string16 = x.m_var_string16; + m_var_string16 = x.m_var_string16; return *this; } @@ -310,8 +308,6 @@ class WStringStruct return m_var_string16; } - - private: std::wstring m_var_string16; @@ -346,7 +342,7 @@ class SmallStringStruct eProsima_user_DllExport SmallStringStruct( const SmallStringStruct& x) { - m_var_small_string = x.m_var_small_string; + m_var_small_string = x.m_var_small_string; } @@ -368,7 +364,7 @@ class SmallStringStruct const SmallStringStruct& x) { - m_var_small_string = x.m_var_small_string; + m_var_small_string = x.m_var_small_string; return *this; } @@ -443,8 +439,6 @@ class SmallStringStruct return m_var_small_string; } - - private: eprosima::fastcdr::fixed_string<1> m_var_small_string; @@ -479,7 +473,7 @@ class SmallWStringStruct eProsima_user_DllExport SmallWStringStruct( const SmallWStringStruct& x) { - m_var_small_wstring = x.m_var_small_wstring; + m_var_small_wstring = x.m_var_small_wstring; } @@ -501,7 +495,7 @@ class SmallWStringStruct const SmallWStringStruct& x) { - m_var_small_wstring = x.m_var_small_wstring; + m_var_small_wstring = x.m_var_small_wstring; return *this; } @@ -576,8 +570,6 @@ class SmallWStringStruct return m_var_small_wstring; } - - private: std::wstring m_var_small_wstring; @@ -612,7 +604,7 @@ class LargeStringStruct eProsima_user_DllExport LargeStringStruct( const LargeStringStruct& x) { - m_var_large_string = x.m_var_large_string; + m_var_large_string = x.m_var_large_string; } @@ -634,7 +626,7 @@ class LargeStringStruct const LargeStringStruct& x) { - m_var_large_string = x.m_var_large_string; + m_var_large_string = x.m_var_large_string; return *this; } @@ -709,8 +701,6 @@ class LargeStringStruct return m_var_large_string; } - - private: eprosima::fastcdr::fixed_string<41925> m_var_large_string; @@ -745,7 +735,7 @@ class LargeWStringStruct eProsima_user_DllExport LargeWStringStruct( const LargeWStringStruct& x) { - m_var_large_wstring = x.m_var_large_wstring; + m_var_large_wstring = x.m_var_large_wstring; } @@ -767,7 +757,7 @@ class LargeWStringStruct const LargeWStringStruct& x) { - m_var_large_wstring = x.m_var_large_wstring; + m_var_large_wstring = x.m_var_large_wstring; return *this; } @@ -842,8 +832,6 @@ class LargeWStringStruct return m_var_large_wstring; } - - private: std::wstring m_var_large_wstring; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp index 79d50901..a75a89d6 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp @@ -85,7 +85,7 @@ class StructShort eProsima_user_DllExport StructShort( const StructShort& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -107,7 +107,7 @@ class StructShort const StructShort& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -172,8 +172,6 @@ class StructShort return m_var_short; } - - private: int16_t m_var_short{0}; @@ -208,7 +206,7 @@ class StructUnsignedShort eProsima_user_DllExport StructUnsignedShort( const StructUnsignedShort& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -230,7 +228,7 @@ class StructUnsignedShort const StructUnsignedShort& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -295,8 +293,6 @@ class StructUnsignedShort return m_var_ushort; } - - private: uint16_t m_var_ushort{0}; @@ -331,7 +327,7 @@ class StructLong eProsima_user_DllExport StructLong( const StructLong& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -353,7 +349,7 @@ class StructLong const StructLong& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -418,8 +414,6 @@ class StructLong return m_var_long; } - - private: int32_t m_var_long{0}; @@ -454,7 +448,7 @@ class StructUnsignedLong eProsima_user_DllExport StructUnsignedLong( const StructUnsignedLong& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -476,7 +470,7 @@ class StructUnsignedLong const StructUnsignedLong& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -541,8 +535,6 @@ class StructUnsignedLong return m_var_ulong; } - - private: uint32_t m_var_ulong{0}; @@ -577,7 +569,7 @@ class StructLongLong eProsima_user_DllExport StructLongLong( const StructLongLong& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -599,7 +591,7 @@ class StructLongLong const StructLongLong& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -664,8 +656,6 @@ class StructLongLong return m_var_longlong; } - - private: int64_t m_var_longlong{0}; @@ -700,7 +690,7 @@ class StructUnsignedLongLong eProsima_user_DllExport StructUnsignedLongLong( const StructUnsignedLongLong& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -722,7 +712,7 @@ class StructUnsignedLongLong const StructUnsignedLongLong& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -787,8 +777,6 @@ class StructUnsignedLongLong return m_var_ulonglong; } - - private: uint64_t m_var_ulonglong{0}; @@ -823,7 +811,7 @@ class StructFloat eProsima_user_DllExport StructFloat( const StructFloat& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -845,7 +833,7 @@ class StructFloat const StructFloat& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -910,8 +898,6 @@ class StructFloat return m_var_float; } - - private: float m_var_float{0.0}; @@ -946,7 +932,7 @@ class StructDouble eProsima_user_DllExport StructDouble( const StructDouble& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -968,7 +954,7 @@ class StructDouble const StructDouble& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1033,8 +1019,6 @@ class StructDouble return m_var_double; } - - private: double m_var_double{0.0}; @@ -1069,7 +1053,7 @@ class StructLongDouble eProsima_user_DllExport StructLongDouble( const StructLongDouble& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1091,7 +1075,7 @@ class StructLongDouble const StructLongDouble& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1156,8 +1140,6 @@ class StructLongDouble return m_var_longdouble; } - - private: long double m_var_longdouble{0.0}; @@ -1192,7 +1174,7 @@ class StructBoolean eProsima_user_DllExport StructBoolean( const StructBoolean& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1214,7 +1196,7 @@ class StructBoolean const StructBoolean& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1279,8 +1261,6 @@ class StructBoolean return m_var_boolean; } - - private: bool m_var_boolean{false}; @@ -1315,7 +1295,7 @@ class StructOctet eProsima_user_DllExport StructOctet( const StructOctet& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1337,7 +1317,7 @@ class StructOctet const StructOctet& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1402,8 +1382,6 @@ class StructOctet return m_var_octet; } - - private: uint8_t m_var_octet{0}; @@ -1438,7 +1416,7 @@ class StructChar8 eProsima_user_DllExport StructChar8( const StructChar8& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1460,7 +1438,7 @@ class StructChar8 const StructChar8& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1525,8 +1503,6 @@ class StructChar8 return m_var_char8; } - - private: char m_var_char8{0}; @@ -1561,7 +1537,7 @@ class StructChar16 eProsima_user_DllExport StructChar16( const StructChar16& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1583,7 +1559,7 @@ class StructChar16 const StructChar16& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1648,8 +1624,6 @@ class StructChar16 return m_var_char16; } - - private: wchar_t m_var_char16{0}; @@ -1684,7 +1658,7 @@ class StructString eProsima_user_DllExport StructString( const StructString& x) { - m_var_string = x.m_var_string; + m_var_string = x.m_var_string; } @@ -1706,7 +1680,7 @@ class StructString const StructString& x) { - m_var_string = x.m_var_string; + m_var_string = x.m_var_string; return *this; } @@ -1781,8 +1755,6 @@ class StructString return m_var_string; } - - private: std::string m_var_string; @@ -1817,7 +1789,7 @@ class StructWString eProsima_user_DllExport StructWString( const StructWString& x) { - m_var_wstring = x.m_var_wstring; + m_var_wstring = x.m_var_wstring; } @@ -1839,7 +1811,7 @@ class StructWString const StructWString& x) { - m_var_wstring = x.m_var_wstring; + m_var_wstring = x.m_var_wstring; return *this; } @@ -1914,8 +1886,6 @@ class StructWString return m_var_wstring; } - - private: std::wstring m_var_wstring; @@ -1950,7 +1920,7 @@ class StructBoundedString eProsima_user_DllExport StructBoundedString( const StructBoundedString& x) { - m_var_bounded_string = x.m_var_bounded_string; + m_var_bounded_string = x.m_var_bounded_string; } @@ -1972,7 +1942,7 @@ class StructBoundedString const StructBoundedString& x) { - m_var_bounded_string = x.m_var_bounded_string; + m_var_bounded_string = x.m_var_bounded_string; return *this; } @@ -2047,8 +2017,6 @@ class StructBoundedString return m_var_bounded_string; } - - private: Inner_alias_bounded_string_helper m_var_bounded_string; @@ -2083,7 +2051,7 @@ class StructBoundedWString eProsima_user_DllExport StructBoundedWString( const StructBoundedWString& x) { - m_var_bounded_wstring = x.m_var_bounded_wstring; + m_var_bounded_wstring = x.m_var_bounded_wstring; } @@ -2105,7 +2073,7 @@ class StructBoundedWString const StructBoundedWString& x) { - m_var_bounded_wstring = x.m_var_bounded_wstring; + m_var_bounded_wstring = x.m_var_bounded_wstring; return *this; } @@ -2180,8 +2148,6 @@ class StructBoundedWString return m_var_bounded_wstring; } - - private: Inner_alias_bounded_wstring_helper m_var_bounded_wstring; @@ -2216,7 +2182,7 @@ class StructEnum eProsima_user_DllExport StructEnum( const StructEnum& x) { - m_var_enum = x.m_var_enum; + m_var_enum = x.m_var_enum; } @@ -2238,7 +2204,7 @@ class StructEnum const StructEnum& x) { - m_var_enum = x.m_var_enum; + m_var_enum = x.m_var_enum; return *this; } @@ -2303,8 +2269,6 @@ class StructEnum return m_var_enum; } - - private: InnerEnumHelper m_var_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -2339,7 +2303,7 @@ class StructBitMask eProsima_user_DllExport StructBitMask( const StructBitMask& x) { - m_var_bitmask = x.m_var_bitmask; + m_var_bitmask = x.m_var_bitmask; } @@ -2361,7 +2325,7 @@ class StructBitMask const StructBitMask& x) { - m_var_bitmask = x.m_var_bitmask; + m_var_bitmask = x.m_var_bitmask; return *this; } @@ -2436,8 +2400,6 @@ class StructBitMask return m_var_bitmask; } - - private: InnerBitMaskHelper m_var_bitmask{0}; @@ -2472,7 +2434,7 @@ class StructAlias eProsima_user_DllExport StructAlias( const StructAlias& x) { - m_var_alias = x.m_var_alias; + m_var_alias = x.m_var_alias; } @@ -2494,7 +2456,7 @@ class StructAlias const StructAlias& x) { - m_var_alias = x.m_var_alias; + m_var_alias = x.m_var_alias; return *this; } @@ -2559,8 +2521,6 @@ class StructAlias return m_var_alias; } - - private: InnerAliasHelper m_var_alias{0}; @@ -2595,7 +2555,7 @@ class StructShortArray eProsima_user_DllExport StructShortArray( const StructShortArray& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -2617,7 +2577,7 @@ class StructShortArray const StructShortArray& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -2692,8 +2652,6 @@ class StructShortArray return m_var_array_short; } - - private: std::array m_var_array_short{0}; @@ -2728,7 +2686,7 @@ class StructSequence eProsima_user_DllExport StructSequence( const StructSequence& x) { - m_var_sequence = x.m_var_sequence; + m_var_sequence = x.m_var_sequence; } @@ -2750,7 +2708,7 @@ class StructSequence const StructSequence& x) { - m_var_sequence = x.m_var_sequence; + m_var_sequence = x.m_var_sequence; return *this; } @@ -2825,8 +2783,6 @@ class StructSequence return m_var_sequence; } - - private: std::vector m_var_sequence; @@ -2861,7 +2817,7 @@ class StructMap eProsima_user_DllExport StructMap( const StructMap& x) { - m_var_map = x.m_var_map; + m_var_map = x.m_var_map; } @@ -2883,7 +2839,7 @@ class StructMap const StructMap& x) { - m_var_map = x.m_var_map; + m_var_map = x.m_var_map; return *this; } @@ -2958,8 +2914,6 @@ class StructMap return m_var_map; } - - private: std::map m_var_map; @@ -2994,7 +2948,7 @@ class StructUnion eProsima_user_DllExport StructUnion( const StructUnion& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -3016,7 +2970,7 @@ class StructUnion const StructUnion& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -3091,8 +3045,6 @@ class StructUnion return m_var_union; } - - private: InnerUnionHelper m_var_union; @@ -3127,7 +3079,7 @@ class StructStructure eProsima_user_DllExport StructStructure( const StructStructure& x) { - m_var_structure = x.m_var_structure; + m_var_structure = x.m_var_structure; } @@ -3149,7 +3101,7 @@ class StructStructure const StructStructure& x) { - m_var_structure = x.m_var_structure; + m_var_structure = x.m_var_structure; return *this; } @@ -3224,8 +3176,6 @@ class StructStructure return m_var_structure; } - - private: InnerStructureHelper m_var_structure; @@ -3260,7 +3210,7 @@ class StructBitset eProsima_user_DllExport StructBitset( const StructBitset& x) { - m_var_bitset = x.m_var_bitset; + m_var_bitset = x.m_var_bitset; } @@ -3282,7 +3232,7 @@ class StructBitset const StructBitset& x) { - m_var_bitset = x.m_var_bitset; + m_var_bitset = x.m_var_bitset; return *this; } @@ -3357,8 +3307,6 @@ class StructBitset return m_var_bitset; } - - private: InnerBitsetHelper m_var_bitset{}; @@ -3453,8 +3401,6 @@ class StructEmpty return !(*this == x); } - - private: @@ -3488,59 +3434,59 @@ class Structures eProsima_user_DllExport Structures( const Structures& x) { - m_var_StructShort = x.m_var_StructShort; + m_var_StructShort = x.m_var_StructShort; - m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; + m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; - m_var_StructLong = x.m_var_StructLong; + m_var_StructLong = x.m_var_StructLong; - m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; + m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; - m_var_StructLongLong = x.m_var_StructLongLong; + m_var_StructLongLong = x.m_var_StructLongLong; - m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; + m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; - m_var_StructFloat = x.m_var_StructFloat; + m_var_StructFloat = x.m_var_StructFloat; - m_var_StructDouble = x.m_var_StructDouble; + m_var_StructDouble = x.m_var_StructDouble; - m_var_StructLongDouble = x.m_var_StructLongDouble; + m_var_StructLongDouble = x.m_var_StructLongDouble; - m_var_StructBoolean = x.m_var_StructBoolean; + m_var_StructBoolean = x.m_var_StructBoolean; - m_var_StructOctet = x.m_var_StructOctet; + m_var_StructOctet = x.m_var_StructOctet; - m_var_StructChar8 = x.m_var_StructChar8; + m_var_StructChar8 = x.m_var_StructChar8; - m_var_StructChar16 = x.m_var_StructChar16; + m_var_StructChar16 = x.m_var_StructChar16; - m_var_StructString = x.m_var_StructString; + m_var_StructString = x.m_var_StructString; - m_var_StructWString = x.m_var_StructWString; + m_var_StructWString = x.m_var_StructWString; - m_var_StructBoundedString = x.m_var_StructBoundedString; + m_var_StructBoundedString = x.m_var_StructBoundedString; - m_var_StructBoundedWString = x.m_var_StructBoundedWString; + m_var_StructBoundedWString = x.m_var_StructBoundedWString; - m_var_StructEnum = x.m_var_StructEnum; + m_var_StructEnum = x.m_var_StructEnum; - m_var_StructBitMask = x.m_var_StructBitMask; + m_var_StructBitMask = x.m_var_StructBitMask; - m_var_StructAlias = x.m_var_StructAlias; + m_var_StructAlias = x.m_var_StructAlias; - m_var_StructShortArray = x.m_var_StructShortArray; + m_var_StructShortArray = x.m_var_StructShortArray; - m_var_StructSequence = x.m_var_StructSequence; + m_var_StructSequence = x.m_var_StructSequence; - m_var_StructMap = x.m_var_StructMap; + m_var_StructMap = x.m_var_StructMap; - m_var_StructUnion = x.m_var_StructUnion; + m_var_StructUnion = x.m_var_StructUnion; - m_var_StructStructure = x.m_var_StructStructure; + m_var_StructStructure = x.m_var_StructStructure; - m_var_StructBitset = x.m_var_StructBitset; + m_var_StructBitset = x.m_var_StructBitset; - m_var_StructEmpty = x.m_var_StructEmpty; + m_var_StructEmpty = x.m_var_StructEmpty; } @@ -3588,59 +3534,59 @@ class Structures const Structures& x) { - m_var_StructShort = x.m_var_StructShort; + m_var_StructShort = x.m_var_StructShort; - m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; + m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; - m_var_StructLong = x.m_var_StructLong; + m_var_StructLong = x.m_var_StructLong; - m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; + m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; - m_var_StructLongLong = x.m_var_StructLongLong; + m_var_StructLongLong = x.m_var_StructLongLong; - m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; + m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; - m_var_StructFloat = x.m_var_StructFloat; + m_var_StructFloat = x.m_var_StructFloat; - m_var_StructDouble = x.m_var_StructDouble; + m_var_StructDouble = x.m_var_StructDouble; - m_var_StructLongDouble = x.m_var_StructLongDouble; + m_var_StructLongDouble = x.m_var_StructLongDouble; - m_var_StructBoolean = x.m_var_StructBoolean; + m_var_StructBoolean = x.m_var_StructBoolean; - m_var_StructOctet = x.m_var_StructOctet; + m_var_StructOctet = x.m_var_StructOctet; - m_var_StructChar8 = x.m_var_StructChar8; + m_var_StructChar8 = x.m_var_StructChar8; - m_var_StructChar16 = x.m_var_StructChar16; + m_var_StructChar16 = x.m_var_StructChar16; - m_var_StructString = x.m_var_StructString; + m_var_StructString = x.m_var_StructString; - m_var_StructWString = x.m_var_StructWString; + m_var_StructWString = x.m_var_StructWString; - m_var_StructBoundedString = x.m_var_StructBoundedString; + m_var_StructBoundedString = x.m_var_StructBoundedString; - m_var_StructBoundedWString = x.m_var_StructBoundedWString; + m_var_StructBoundedWString = x.m_var_StructBoundedWString; - m_var_StructEnum = x.m_var_StructEnum; + m_var_StructEnum = x.m_var_StructEnum; - m_var_StructBitMask = x.m_var_StructBitMask; + m_var_StructBitMask = x.m_var_StructBitMask; - m_var_StructAlias = x.m_var_StructAlias; + m_var_StructAlias = x.m_var_StructAlias; - m_var_StructShortArray = x.m_var_StructShortArray; + m_var_StructShortArray = x.m_var_StructShortArray; - m_var_StructSequence = x.m_var_StructSequence; + m_var_StructSequence = x.m_var_StructSequence; - m_var_StructMap = x.m_var_StructMap; + m_var_StructMap = x.m_var_StructMap; - m_var_StructUnion = x.m_var_StructUnion; + m_var_StructUnion = x.m_var_StructUnion; - m_var_StructStructure = x.m_var_StructStructure; + m_var_StructStructure = x.m_var_StructStructure; - m_var_StructBitset = x.m_var_StructBitset; + m_var_StructBitset = x.m_var_StructBitset; - m_var_StructEmpty = x.m_var_StructEmpty; + m_var_StructEmpty = x.m_var_StructEmpty; return *this; } @@ -3691,32 +3637,32 @@ class Structures const Structures& x) const { return (m_var_StructShort == x.m_var_StructShort && - m_var_StructUnsignedShort == x.m_var_StructUnsignedShort && - m_var_StructLong == x.m_var_StructLong && - m_var_StructUnsignedLong == x.m_var_StructUnsignedLong && - m_var_StructLongLong == x.m_var_StructLongLong && - m_var_StructUnsignedLongLong == x.m_var_StructUnsignedLongLong && - m_var_StructFloat == x.m_var_StructFloat && - m_var_StructDouble == x.m_var_StructDouble && - m_var_StructLongDouble == x.m_var_StructLongDouble && - m_var_StructBoolean == x.m_var_StructBoolean && - m_var_StructOctet == x.m_var_StructOctet && - m_var_StructChar8 == x.m_var_StructChar8 && - m_var_StructChar16 == x.m_var_StructChar16 && - m_var_StructString == x.m_var_StructString && - m_var_StructWString == x.m_var_StructWString && - m_var_StructBoundedString == x.m_var_StructBoundedString && - m_var_StructBoundedWString == x.m_var_StructBoundedWString && - m_var_StructEnum == x.m_var_StructEnum && - m_var_StructBitMask == x.m_var_StructBitMask && - m_var_StructAlias == x.m_var_StructAlias && - m_var_StructShortArray == x.m_var_StructShortArray && - m_var_StructSequence == x.m_var_StructSequence && - m_var_StructMap == x.m_var_StructMap && - m_var_StructUnion == x.m_var_StructUnion && - m_var_StructStructure == x.m_var_StructStructure && - m_var_StructBitset == x.m_var_StructBitset && - m_var_StructEmpty == x.m_var_StructEmpty); + m_var_StructUnsignedShort == x.m_var_StructUnsignedShort && + m_var_StructLong == x.m_var_StructLong && + m_var_StructUnsignedLong == x.m_var_StructUnsignedLong && + m_var_StructLongLong == x.m_var_StructLongLong && + m_var_StructUnsignedLongLong == x.m_var_StructUnsignedLongLong && + m_var_StructFloat == x.m_var_StructFloat && + m_var_StructDouble == x.m_var_StructDouble && + m_var_StructLongDouble == x.m_var_StructLongDouble && + m_var_StructBoolean == x.m_var_StructBoolean && + m_var_StructOctet == x.m_var_StructOctet && + m_var_StructChar8 == x.m_var_StructChar8 && + m_var_StructChar16 == x.m_var_StructChar16 && + m_var_StructString == x.m_var_StructString && + m_var_StructWString == x.m_var_StructWString && + m_var_StructBoundedString == x.m_var_StructBoundedString && + m_var_StructBoundedWString == x.m_var_StructBoundedWString && + m_var_StructEnum == x.m_var_StructEnum && + m_var_StructBitMask == x.m_var_StructBitMask && + m_var_StructAlias == x.m_var_StructAlias && + m_var_StructShortArray == x.m_var_StructShortArray && + m_var_StructSequence == x.m_var_StructSequence && + m_var_StructMap == x.m_var_StructMap && + m_var_StructUnion == x.m_var_StructUnion && + m_var_StructStructure == x.m_var_StructStructure && + m_var_StructBitset == x.m_var_StructBitset && + m_var_StructEmpty == x.m_var_StructEmpty); } /*! @@ -3767,7 +3713,6 @@ class Structures return m_var_StructShort; } - /*! * @brief This function copies the value in member var_StructUnsignedShort * @param _var_StructUnsignedShort New value to be copied in member var_StructUnsignedShort @@ -3806,7 +3751,6 @@ class Structures return m_var_StructUnsignedShort; } - /*! * @brief This function copies the value in member var_StructLong * @param _var_StructLong New value to be copied in member var_StructLong @@ -3845,7 +3789,6 @@ class Structures return m_var_StructLong; } - /*! * @brief This function copies the value in member var_StructUnsignedLong * @param _var_StructUnsignedLong New value to be copied in member var_StructUnsignedLong @@ -3884,7 +3827,6 @@ class Structures return m_var_StructUnsignedLong; } - /*! * @brief This function copies the value in member var_StructLongLong * @param _var_StructLongLong New value to be copied in member var_StructLongLong @@ -3923,7 +3865,6 @@ class Structures return m_var_StructLongLong; } - /*! * @brief This function copies the value in member var_StructUnsignedLongLong * @param _var_StructUnsignedLongLong New value to be copied in member var_StructUnsignedLongLong @@ -3962,7 +3903,6 @@ class Structures return m_var_StructUnsignedLongLong; } - /*! * @brief This function copies the value in member var_StructFloat * @param _var_StructFloat New value to be copied in member var_StructFloat @@ -4001,7 +3941,6 @@ class Structures return m_var_StructFloat; } - /*! * @brief This function copies the value in member var_StructDouble * @param _var_StructDouble New value to be copied in member var_StructDouble @@ -4040,7 +3979,6 @@ class Structures return m_var_StructDouble; } - /*! * @brief This function copies the value in member var_StructLongDouble * @param _var_StructLongDouble New value to be copied in member var_StructLongDouble @@ -4079,7 +4017,6 @@ class Structures return m_var_StructLongDouble; } - /*! * @brief This function copies the value in member var_StructBoolean * @param _var_StructBoolean New value to be copied in member var_StructBoolean @@ -4118,7 +4055,6 @@ class Structures return m_var_StructBoolean; } - /*! * @brief This function copies the value in member var_StructOctet * @param _var_StructOctet New value to be copied in member var_StructOctet @@ -4157,7 +4093,6 @@ class Structures return m_var_StructOctet; } - /*! * @brief This function copies the value in member var_StructChar8 * @param _var_StructChar8 New value to be copied in member var_StructChar8 @@ -4196,7 +4131,6 @@ class Structures return m_var_StructChar8; } - /*! * @brief This function copies the value in member var_StructChar16 * @param _var_StructChar16 New value to be copied in member var_StructChar16 @@ -4235,7 +4169,6 @@ class Structures return m_var_StructChar16; } - /*! * @brief This function copies the value in member var_StructString * @param _var_StructString New value to be copied in member var_StructString @@ -4274,7 +4207,6 @@ class Structures return m_var_StructString; } - /*! * @brief This function copies the value in member var_StructWString * @param _var_StructWString New value to be copied in member var_StructWString @@ -4313,7 +4245,6 @@ class Structures return m_var_StructWString; } - /*! * @brief This function copies the value in member var_StructBoundedString * @param _var_StructBoundedString New value to be copied in member var_StructBoundedString @@ -4352,7 +4283,6 @@ class Structures return m_var_StructBoundedString; } - /*! * @brief This function copies the value in member var_StructBoundedWString * @param _var_StructBoundedWString New value to be copied in member var_StructBoundedWString @@ -4391,7 +4321,6 @@ class Structures return m_var_StructBoundedWString; } - /*! * @brief This function copies the value in member var_StructEnum * @param _var_StructEnum New value to be copied in member var_StructEnum @@ -4430,7 +4359,6 @@ class Structures return m_var_StructEnum; } - /*! * @brief This function copies the value in member var_StructBitMask * @param _var_StructBitMask New value to be copied in member var_StructBitMask @@ -4469,7 +4397,6 @@ class Structures return m_var_StructBitMask; } - /*! * @brief This function copies the value in member var_StructAlias * @param _var_StructAlias New value to be copied in member var_StructAlias @@ -4508,7 +4435,6 @@ class Structures return m_var_StructAlias; } - /*! * @brief This function copies the value in member var_StructShortArray * @param _var_StructShortArray New value to be copied in member var_StructShortArray @@ -4547,7 +4473,6 @@ class Structures return m_var_StructShortArray; } - /*! * @brief This function copies the value in member var_StructSequence * @param _var_StructSequence New value to be copied in member var_StructSequence @@ -4586,7 +4511,6 @@ class Structures return m_var_StructSequence; } - /*! * @brief This function copies the value in member var_StructMap * @param _var_StructMap New value to be copied in member var_StructMap @@ -4625,7 +4549,6 @@ class Structures return m_var_StructMap; } - /*! * @brief This function copies the value in member var_StructUnion * @param _var_StructUnion New value to be copied in member var_StructUnion @@ -4664,7 +4587,6 @@ class Structures return m_var_StructUnion; } - /*! * @brief This function copies the value in member var_StructStructure * @param _var_StructStructure New value to be copied in member var_StructStructure @@ -4703,7 +4625,6 @@ class Structures return m_var_StructStructure; } - /*! * @brief This function copies the value in member var_StructBitset * @param _var_StructBitset New value to be copied in member var_StructBitset @@ -4742,7 +4663,6 @@ class Structures return m_var_StructBitset; } - /*! * @brief This function copies the value in member var_StructEmpty * @param _var_StructEmpty New value to be copied in member var_StructEmpty @@ -4781,8 +4701,6 @@ class Structures return m_var_StructEmpty; } - - private: StructShort m_var_StructShort; @@ -4845,9 +4763,9 @@ class foo eProsima_user_DllExport foo( const foo& x) { - m_a = x.m_a; + m_a = x.m_a; - m_b = x.m_b; + m_b = x.m_b; } @@ -4870,9 +4788,9 @@ class foo const foo& x) { - m_a = x.m_a; + m_a = x.m_a; - m_b = x.m_b; + m_b = x.m_b; return *this; } @@ -4898,7 +4816,7 @@ class foo const foo& x) const { return (m_a == x.m_a && - m_b == x.m_b); + m_b == x.m_b); } /*! @@ -4939,7 +4857,6 @@ class foo return m_a; } - /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -4968,8 +4885,6 @@ class foo return m_b; } - - private: int32_t m_a{0}; @@ -5009,7 +4924,7 @@ class foo eProsima_user_DllExport foo( const foo& x) { - m_d = x.m_d; + m_d = x.m_d; } @@ -5031,7 +4946,7 @@ class foo const foo& x) { - m_d = x.m_d; + m_d = x.m_d; return *this; } @@ -5096,8 +5011,6 @@ class foo return m_d; } - - private: bool m_d{false}; @@ -5134,7 +5047,7 @@ class bar eProsima_user_DllExport bar( const bar& x) { - m_e = x.m_e; + m_e = x.m_e; } @@ -5156,7 +5069,7 @@ class bar const bar& x) { - m_e = x.m_e; + m_e = x.m_e; return *this; } @@ -5221,8 +5134,6 @@ class bar return m_e; } - - private: double m_e{0.0}; @@ -5257,9 +5168,9 @@ class root1 eProsima_user_DllExport root1( const root1& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_c = x.m_c; + m_c = x.m_c; } @@ -5282,9 +5193,9 @@ class root1 const root1& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_c = x.m_c; + m_c = x.m_c; return *this; } @@ -5310,7 +5221,7 @@ class root1 const root1& x) const { return (m_foo_struct == x.m_foo_struct && - m_c == x.m_c); + m_c == x.m_c); } /*! @@ -5361,7 +5272,6 @@ class root1 return m_foo_struct; } - /*! * @brief This function sets a value in member c * @param _c New value for member c @@ -5390,8 +5300,6 @@ class root1 return m_c; } - - private: testing_1::foo m_foo_struct; @@ -5427,9 +5335,9 @@ class root2 eProsima_user_DllExport root2( const root2& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_bar_struct = x.m_bar_struct; + m_bar_struct = x.m_bar_struct; } @@ -5452,9 +5360,9 @@ class root2 const root2& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_bar_struct = x.m_bar_struct; + m_bar_struct = x.m_bar_struct; return *this; } @@ -5480,7 +5388,7 @@ class root2 const root2& x) const { return (m_foo_struct == x.m_foo_struct && - m_bar_struct == x.m_bar_struct); + m_bar_struct == x.m_bar_struct); } /*! @@ -5531,7 +5439,6 @@ class root2 return m_foo_struct; } - /*! * @brief This function copies the value in member bar_struct * @param _bar_struct New value to be copied in member bar_struct @@ -5570,8 +5477,6 @@ class root2 return m_bar_struct; } - - private: testing_2::foo m_foo_struct; @@ -5607,9 +5512,9 @@ class root eProsima_user_DllExport root( const root& x) { - m_var_root1 = x.m_var_root1; + m_var_root1 = x.m_var_root1; - m_var_root2 = x.m_var_root2; + m_var_root2 = x.m_var_root2; } @@ -5632,9 +5537,9 @@ class root const root& x) { - m_var_root1 = x.m_var_root1; + m_var_root1 = x.m_var_root1; - m_var_root2 = x.m_var_root2; + m_var_root2 = x.m_var_root2; return *this; } @@ -5660,7 +5565,7 @@ class root const root& x) const { return (m_var_root1 == x.m_var_root1 && - m_var_root2 == x.m_var_root2); + m_var_root2 == x.m_var_root2); } /*! @@ -5711,7 +5616,6 @@ class root return m_var_root1; } - /*! * @brief This function copies the value in member var_root2 * @param _var_root2 New value to be copied in member var_root2 @@ -5750,8 +5654,6 @@ class root return m_var_root2; } - - private: root1 m_var_root1; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp index a68af1f1..ee19e49b 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp @@ -2306,173 +2306,171 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType unsigned char* key_buffer_; }; -namespace testing_1 -{ +namespace testing_1 { - /*! - * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. - * @ingroup structures - */ - class fooPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. + * @ingroup structures + */ +class fooPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef foo type; + typedef foo type; - eProsima_user_DllExport fooPubSubType(); + eProsima_user_DllExport fooPubSubType(); - eProsima_user_DllExport ~fooPubSubType() override; + eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace testing_1 -namespace testing_2 -{ +namespace testing_2 { - /*! - * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. - * @ingroup structures - */ - class fooPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. + * @ingroup structures + */ +class fooPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef foo type; + typedef foo type; - eProsima_user_DllExport fooPubSubType(); + eProsima_user_DllExport fooPubSubType(); - eProsima_user_DllExport ~fooPubSubType() override; + eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; } // namespace testing_2 /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp index c67d1e83..c44e81f3 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp @@ -95,9 +95,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; } } @@ -113,9 +113,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; } } @@ -131,9 +131,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; } @@ -151,9 +151,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; } @@ -174,9 +174,9 @@ class Union_Short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; } } @@ -206,18 +206,19 @@ class Union_Short switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -273,7 +274,6 @@ class Union_Short return m_a; } - void _default() { if (member_destructor_) @@ -284,27 +284,25 @@ class Union_Short selected_member_ = 0x0FFFFFFFu; } - private: - int16_t& a_() + int16_t& a_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - return m_a; - } + } + return m_a; + } int32_t m__d {2147483647}; @@ -354,9 +352,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = x.m_b; - break; + case 0x00000001: + b_() = x.m_b; + break; } } @@ -372,9 +370,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = std::move(x.m_b); - break; + case 0x00000001: + b_() = std::move(x.m_b); + break; } } @@ -390,9 +388,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = x.m_b; - break; + case 0x00000001: + b_() = x.m_b; + break; } @@ -410,9 +408,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = std::move(x.m_b); - break; + case 0x00000001: + b_() = std::move(x.m_b); + break; } @@ -433,9 +431,9 @@ class Union_UShort { switch (selected_member_) { - case 0x00000001: - ret_value = (m_b == x.m_b); - break; + case 0x00000001: + ret_value = (m_b == x.m_b); + break; } } @@ -465,18 +463,19 @@ class Union_UShort switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -532,7 +531,6 @@ class Union_UShort return m_b; } - void _default() { if (member_destructor_) @@ -543,27 +541,25 @@ class Union_UShort selected_member_ = 0x0FFFFFFFu; } - private: - uint16_t& b_() + uint16_t& b_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_b = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_b = {0}; - return m_b; - } + } + return m_b; + } int32_t m__d {2147483647}; @@ -613,9 +609,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = x.m_c; - break; + case 0x00000001: + c_() = x.m_c; + break; } } @@ -631,9 +627,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = std::move(x.m_c); - break; + case 0x00000001: + c_() = std::move(x.m_c); + break; } } @@ -649,9 +645,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = x.m_c; - break; + case 0x00000001: + c_() = x.m_c; + break; } @@ -669,9 +665,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = std::move(x.m_c); - break; + case 0x00000001: + c_() = std::move(x.m_c); + break; } @@ -692,9 +688,9 @@ class Union_Long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_c == x.m_c); - break; + case 0x00000001: + ret_value = (m_c == x.m_c); + break; } } @@ -724,18 +720,19 @@ class Union_Long switch (__d) { - case 2: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -791,7 +788,6 @@ class Union_Long return m_c; } - void _default() { if (member_destructor_) @@ -802,27 +798,25 @@ class Union_Long selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& c_() + int32_t& c_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_c = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_c = {0}; - return m_c; - } + } + return m_c; + } int32_t m__d {2147483647}; @@ -872,9 +866,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = x.m_d; - break; + case 0x00000001: + d_() = x.m_d; + break; } } @@ -890,9 +884,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = std::move(x.m_d); - break; + case 0x00000001: + d_() = std::move(x.m_d); + break; } } @@ -908,9 +902,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = x.m_d; - break; + case 0x00000001: + d_() = x.m_d; + break; } @@ -928,9 +922,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = std::move(x.m_d); - break; + case 0x00000001: + d_() = std::move(x.m_d); + break; } @@ -951,9 +945,9 @@ class Union_ULong { switch (selected_member_) { - case 0x00000001: - ret_value = (m_d == x.m_d); - break; + case 0x00000001: + ret_value = (m_d == x.m_d); + break; } } @@ -983,18 +977,19 @@ class Union_ULong switch (__d) { - case 3: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 3: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1050,7 +1045,6 @@ class Union_ULong return m_d; } - void _default() { if (member_destructor_) @@ -1061,27 +1055,25 @@ class Union_ULong selected_member_ = 0x0FFFFFFFu; } - private: - uint32_t& d_() + uint32_t& d_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_d = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_d = {0}; - return m_d; - } + } + return m_d; + } int32_t m__d {2147483647}; @@ -1131,9 +1123,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = x.m_e; - break; + case 0x00000001: + e_() = x.m_e; + break; } } @@ -1149,9 +1141,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = std::move(x.m_e); - break; + case 0x00000001: + e_() = std::move(x.m_e); + break; } } @@ -1167,9 +1159,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = x.m_e; - break; + case 0x00000001: + e_() = x.m_e; + break; } @@ -1187,9 +1179,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = std::move(x.m_e); - break; + case 0x00000001: + e_() = std::move(x.m_e); + break; } @@ -1210,9 +1202,9 @@ class Union_LongLong { switch (selected_member_) { - case 0x00000001: - ret_value = (m_e == x.m_e); - break; + case 0x00000001: + ret_value = (m_e == x.m_e); + break; } } @@ -1242,18 +1234,19 @@ class Union_LongLong switch (__d) { - case 4: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 4: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1309,7 +1302,6 @@ class Union_LongLong return m_e; } - void _default() { if (member_destructor_) @@ -1320,27 +1312,25 @@ class Union_LongLong selected_member_ = 0x0FFFFFFFu; } - private: - int64_t& e_() + int64_t& e_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_e = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_e = {0}; - return m_e; - } + } + return m_e; + } int32_t m__d {2147483647}; @@ -1390,9 +1380,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = x.m_f; - break; + case 0x00000001: + f_() = x.m_f; + break; } } @@ -1408,9 +1398,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = std::move(x.m_f); - break; + case 0x00000001: + f_() = std::move(x.m_f); + break; } } @@ -1426,9 +1416,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = x.m_f; - break; + case 0x00000001: + f_() = x.m_f; + break; } @@ -1446,9 +1436,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = std::move(x.m_f); - break; + case 0x00000001: + f_() = std::move(x.m_f); + break; } @@ -1469,9 +1459,9 @@ class Union_ULongLOng { switch (selected_member_) { - case 0x00000001: - ret_value = (m_f == x.m_f); - break; + case 0x00000001: + ret_value = (m_f == x.m_f); + break; } } @@ -1501,18 +1491,19 @@ class Union_ULongLOng switch (__d) { - case 5: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 5: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1568,7 +1559,6 @@ class Union_ULongLOng return m_f; } - void _default() { if (member_destructor_) @@ -1579,27 +1569,25 @@ class Union_ULongLOng selected_member_ = 0x0FFFFFFFu; } - private: - uint64_t& f_() + uint64_t& f_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_f = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_f = {0}; - return m_f; - } + } + return m_f; + } int32_t m__d {2147483647}; @@ -1649,9 +1637,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = x.m_g; - break; + case 0x00000001: + g_() = x.m_g; + break; } } @@ -1667,9 +1655,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = std::move(x.m_g); - break; + case 0x00000001: + g_() = std::move(x.m_g); + break; } } @@ -1685,9 +1673,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = x.m_g; - break; + case 0x00000001: + g_() = x.m_g; + break; } @@ -1705,9 +1693,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = std::move(x.m_g); - break; + case 0x00000001: + g_() = std::move(x.m_g); + break; } @@ -1728,9 +1716,9 @@ class Union_Float { switch (selected_member_) { - case 0x00000001: - ret_value = (m_g == x.m_g); - break; + case 0x00000001: + ret_value = (m_g == x.m_g); + break; } } @@ -1760,18 +1748,19 @@ class Union_Float switch (__d) { - case 6: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 6: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1827,7 +1816,6 @@ class Union_Float return m_g; } - void _default() { if (member_destructor_) @@ -1838,27 +1826,25 @@ class Union_Float selected_member_ = 0x0FFFFFFFu; } - private: - float& g_() + float& g_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_g = {0.0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_g = {0.0}; - return m_g; - } + } + return m_g; + } int32_t m__d {2147483647}; @@ -1908,9 +1894,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = x.m_h; - break; + case 0x00000001: + h_() = x.m_h; + break; } } @@ -1926,9 +1912,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = std::move(x.m_h); - break; + case 0x00000001: + h_() = std::move(x.m_h); + break; } } @@ -1944,9 +1930,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = x.m_h; - break; + case 0x00000001: + h_() = x.m_h; + break; } @@ -1964,9 +1950,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = std::move(x.m_h); - break; + case 0x00000001: + h_() = std::move(x.m_h); + break; } @@ -1987,9 +1973,9 @@ class Union_Double { switch (selected_member_) { - case 0x00000001: - ret_value = (m_h == x.m_h); - break; + case 0x00000001: + ret_value = (m_h == x.m_h); + break; } } @@ -2019,18 +2005,19 @@ class Union_Double switch (__d) { - case 7: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 7: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2086,7 +2073,6 @@ class Union_Double return m_h; } - void _default() { if (member_destructor_) @@ -2097,27 +2083,25 @@ class Union_Double selected_member_ = 0x0FFFFFFFu; } - private: - double& h_() + double& h_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_h = {0.0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_h = {0.0}; - return m_h; - } + } + return m_h; + } int32_t m__d {2147483647}; @@ -2167,9 +2151,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = x.m_i; - break; + case 0x00000001: + i_() = x.m_i; + break; } } @@ -2185,9 +2169,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = std::move(x.m_i); - break; + case 0x00000001: + i_() = std::move(x.m_i); + break; } } @@ -2203,9 +2187,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = x.m_i; - break; + case 0x00000001: + i_() = x.m_i; + break; } @@ -2223,9 +2207,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = std::move(x.m_i); - break; + case 0x00000001: + i_() = std::move(x.m_i); + break; } @@ -2246,9 +2230,9 @@ class Union_LongDouble { switch (selected_member_) { - case 0x00000001: - ret_value = (m_i == x.m_i); - break; + case 0x00000001: + ret_value = (m_i == x.m_i); + break; } } @@ -2278,18 +2262,19 @@ class Union_LongDouble switch (__d) { - case 8: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 8: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2345,7 +2330,6 @@ class Union_LongDouble return m_i; } - void _default() { if (member_destructor_) @@ -2356,27 +2340,25 @@ class Union_LongDouble selected_member_ = 0x0FFFFFFFu; } - private: - long double& i_() + long double& i_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_i = {0.0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_i = {0.0}; - return m_i; - } + } + return m_i; + } int32_t m__d {2147483647}; @@ -2426,9 +2408,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = x.m_j; - break; + case 0x00000001: + j_() = x.m_j; + break; } } @@ -2444,9 +2426,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = std::move(x.m_j); - break; + case 0x00000001: + j_() = std::move(x.m_j); + break; } } @@ -2462,9 +2444,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = x.m_j; - break; + case 0x00000001: + j_() = x.m_j; + break; } @@ -2482,9 +2464,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = std::move(x.m_j); - break; + case 0x00000001: + j_() = std::move(x.m_j); + break; } @@ -2505,9 +2487,9 @@ class Union_Boolean { switch (selected_member_) { - case 0x00000001: - ret_value = (m_j == x.m_j); - break; + case 0x00000001: + ret_value = (m_j == x.m_j); + break; } } @@ -2537,18 +2519,19 @@ class Union_Boolean switch (__d) { - case 9: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 9: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2604,7 +2587,6 @@ class Union_Boolean return m_j; } - void _default() { if (member_destructor_) @@ -2615,27 +2597,25 @@ class Union_Boolean selected_member_ = 0x0FFFFFFFu; } - private: - bool& j_() + bool& j_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_j = {false}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_j = {false}; - return m_j; - } + } + return m_j; + } int32_t m__d {2147483647}; @@ -2685,9 +2665,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = x.m_k; - break; + case 0x00000001: + k_() = x.m_k; + break; } } @@ -2703,9 +2683,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = std::move(x.m_k); - break; + case 0x00000001: + k_() = std::move(x.m_k); + break; } } @@ -2721,9 +2701,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = x.m_k; - break; + case 0x00000001: + k_() = x.m_k; + break; } @@ -2741,9 +2721,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = std::move(x.m_k); - break; + case 0x00000001: + k_() = std::move(x.m_k); + break; } @@ -2764,9 +2744,9 @@ class Union_Octet { switch (selected_member_) { - case 0x00000001: - ret_value = (m_k == x.m_k); - break; + case 0x00000001: + ret_value = (m_k == x.m_k); + break; } } @@ -2796,18 +2776,19 @@ class Union_Octet switch (__d) { - case 10: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 10: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2863,7 +2844,6 @@ class Union_Octet return m_k; } - void _default() { if (member_destructor_) @@ -2874,27 +2854,25 @@ class Union_Octet selected_member_ = 0x0FFFFFFFu; } - private: - uint8_t& k_() + uint8_t& k_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_k = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_k = {0}; - return m_k; - } + } + return m_k; + } int32_t m__d {2147483647}; @@ -2944,9 +2922,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; } } @@ -2962,9 +2940,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; } } @@ -2980,9 +2958,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; } @@ -3000,9 +2978,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; } @@ -3023,9 +3001,9 @@ class Union_Char { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; } } @@ -3055,18 +3033,19 @@ class Union_Char switch (__d) { - case 11: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 11: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3122,7 +3101,6 @@ class Union_Char return m_l; } - void _default() { if (member_destructor_) @@ -3133,27 +3111,25 @@ class Union_Char selected_member_ = 0x0FFFFFFFu; } - private: - char& l_() + char& l_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - return m_l; - } + } + return m_l; + } int32_t m__d {2147483647}; @@ -3203,9 +3179,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = x.m_m; - break; + case 0x00000001: + m_() = x.m_m; + break; } } @@ -3221,9 +3197,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = std::move(x.m_m); - break; + case 0x00000001: + m_() = std::move(x.m_m); + break; } } @@ -3239,9 +3215,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = x.m_m; - break; + case 0x00000001: + m_() = x.m_m; + break; } @@ -3259,9 +3235,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = std::move(x.m_m); - break; + case 0x00000001: + m_() = std::move(x.m_m); + break; } @@ -3282,9 +3258,9 @@ class Union_WChar { switch (selected_member_) { - case 0x00000001: - ret_value = (m_m == x.m_m); - break; + case 0x00000001: + ret_value = (m_m == x.m_m); + break; } } @@ -3314,18 +3290,19 @@ class Union_WChar switch (__d) { - case 12: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 12: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3381,7 +3358,6 @@ class Union_WChar return m_m; } - void _default() { if (member_destructor_) @@ -3392,27 +3368,25 @@ class Union_WChar selected_member_ = 0x0FFFFFFFu; } - private: - wchar_t& m_() + wchar_t& m_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_m = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_m = {0}; - return m_m; - } + } + return m_m; + } int32_t m__d {2147483647}; @@ -3462,9 +3436,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = x.m_n; - break; + case 0x00000001: + n_() = x.m_n; + break; } } @@ -3480,9 +3454,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = std::move(x.m_n); - break; + case 0x00000001: + n_() = std::move(x.m_n); + break; } } @@ -3498,9 +3472,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = x.m_n; - break; + case 0x00000001: + n_() = x.m_n; + break; } @@ -3518,9 +3492,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = std::move(x.m_n); - break; + case 0x00000001: + n_() = std::move(x.m_n); + break; } @@ -3541,9 +3515,9 @@ class Union_String { switch (selected_member_) { - case 0x00000001: - ret_value = (m_n == x.m_n); - break; + case 0x00000001: + ret_value = (m_n == x.m_n); + break; } } @@ -3573,18 +3547,19 @@ class Union_String switch (__d) { - case 13: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 13: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3651,7 +3626,6 @@ class Union_String return m_n; } - void _default() { if (member_destructor_) @@ -3662,27 +3636,28 @@ class Union_String selected_member_ = 0x0FFFFFFFu; } - private: - std::string& n_() + std::string& n_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_n.~basic_string();}; - new(&m_n) std::string(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_n.~basic_string(); + }; + new(&m_n) std::string(); - return m_n; - } + } + return m_n; + } int32_t m__d {2147483647}; @@ -3732,9 +3707,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = x.m_o; - break; + case 0x00000001: + o_() = x.m_o; + break; } } @@ -3750,9 +3725,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = std::move(x.m_o); - break; + case 0x00000001: + o_() = std::move(x.m_o); + break; } } @@ -3768,9 +3743,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = x.m_o; - break; + case 0x00000001: + o_() = x.m_o; + break; } @@ -3788,9 +3763,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = std::move(x.m_o); - break; + case 0x00000001: + o_() = std::move(x.m_o); + break; } @@ -3811,9 +3786,9 @@ class Union_WString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_o == x.m_o); - break; + case 0x00000001: + ret_value = (m_o == x.m_o); + break; } } @@ -3843,18 +3818,19 @@ class Union_WString switch (__d) { - case 14: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 14: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3921,7 +3897,6 @@ class Union_WString return m_o; } - void _default() { if (member_destructor_) @@ -3932,27 +3907,28 @@ class Union_WString selected_member_ = 0x0FFFFFFFu; } - private: - std::wstring& o_() + std::wstring& o_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_o.~basic_string();}; - new(&m_o) std::wstring(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_o.~basic_string(); + }; + new(&m_o) std::wstring(); - return m_o; - } + } + return m_o; + } int32_t m__d {2147483647}; @@ -4002,9 +3978,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = x.m_bn; - break; + case 0x00000001: + bn_() = x.m_bn; + break; } } @@ -4020,9 +3996,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = std::move(x.m_bn); - break; + case 0x00000001: + bn_() = std::move(x.m_bn); + break; } } @@ -4038,9 +4014,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = x.m_bn; - break; + case 0x00000001: + bn_() = x.m_bn; + break; } @@ -4058,9 +4034,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = std::move(x.m_bn); - break; + case 0x00000001: + bn_() = std::move(x.m_bn); + break; } @@ -4081,9 +4057,9 @@ class Union_BoundedString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_bn == x.m_bn); - break; + case 0x00000001: + ret_value = (m_bn == x.m_bn); + break; } } @@ -4113,18 +4089,19 @@ class Union_BoundedString switch (__d) { - case 13: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 13: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4191,7 +4168,6 @@ class Union_BoundedString return m_bn; } - void _default() { if (member_destructor_) @@ -4202,27 +4178,28 @@ class Union_BoundedString selected_member_ = 0x0FFFFFFFu; } - private: - Inner_alias_bounded_string_helper& bn_() + Inner_alias_bounded_string_helper& bn_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + member_destructor_(); + } + + selected_member_ = 0x00000001; + member_destructor_ = [&]() { - member_destructor_(); - } + m_bn.~Inner_alias_bounded_string_helper(); + }; + new(&m_bn) Inner_alias_bounded_string_helper(); - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_bn.~Inner_alias_bounded_string_helper();}; - new(&m_bn) Inner_alias_bounded_string_helper(); - - } - - return m_bn; - } + } + return m_bn; + } int32_t m__d {2147483647}; @@ -4272,9 +4249,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = x.m_bo; - break; + case 0x00000001: + bo_() = x.m_bo; + break; } } @@ -4290,9 +4267,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = std::move(x.m_bo); - break; + case 0x00000001: + bo_() = std::move(x.m_bo); + break; } } @@ -4308,9 +4285,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = x.m_bo; - break; + case 0x00000001: + bo_() = x.m_bo; + break; } @@ -4328,9 +4305,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = std::move(x.m_bo); - break; + case 0x00000001: + bo_() = std::move(x.m_bo); + break; } @@ -4351,9 +4328,9 @@ class Union_BoundedWString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_bo == x.m_bo); - break; + case 0x00000001: + ret_value = (m_bo == x.m_bo); + break; } } @@ -4383,18 +4360,19 @@ class Union_BoundedWString switch (__d) { - case 14: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 14: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4461,7 +4439,6 @@ class Union_BoundedWString return m_bo; } - void _default() { if (member_destructor_) @@ -4472,27 +4449,28 @@ class Union_BoundedWString selected_member_ = 0x0FFFFFFFu; } - private: - Inner_alias_bounded_wstring_helper& bo_() + Inner_alias_bounded_wstring_helper& bo_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_bo.~Inner_alias_bounded_wstring_helper();}; - new(&m_bo) Inner_alias_bounded_wstring_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_bo.~Inner_alias_bounded_wstring_helper(); + }; + new(&m_bo) Inner_alias_bounded_wstring_helper(); - return m_bo; - } + } + return m_bo; + } int32_t m__d {2147483647}; @@ -4542,9 +4520,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = x.m_p; - break; + case 0x00000001: + p_() = x.m_p; + break; } } @@ -4560,9 +4538,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = std::move(x.m_p); - break; + case 0x00000001: + p_() = std::move(x.m_p); + break; } } @@ -4578,9 +4556,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = x.m_p; - break; + case 0x00000001: + p_() = x.m_p; + break; } @@ -4598,9 +4576,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = std::move(x.m_p); - break; + case 0x00000001: + p_() = std::move(x.m_p); + break; } @@ -4621,9 +4599,9 @@ class Union_InnerEnumHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_p == x.m_p); - break; + case 0x00000001: + ret_value = (m_p == x.m_p); + break; } } @@ -4653,18 +4631,19 @@ class Union_InnerEnumHelper switch (__d) { - case 15: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 15: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4720,7 +4699,6 @@ class Union_InnerEnumHelper return m_p; } - void _default() { if (member_destructor_) @@ -4731,27 +4709,25 @@ class Union_InnerEnumHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerEnumHelper& p_() + InnerEnumHelper& p_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_p = {InnerEnumHelper::ENUM_VALUE_1}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_p = {InnerEnumHelper::ENUM_VALUE_1}; - return m_p; - } + } + return m_p; + } int32_t m__d {2147483647}; @@ -4801,9 +4777,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = x.m_q; - break; + case 0x00000001: + q_() = x.m_q; + break; } } @@ -4819,9 +4795,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = std::move(x.m_q); - break; + case 0x00000001: + q_() = std::move(x.m_q); + break; } } @@ -4837,9 +4813,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = x.m_q; - break; + case 0x00000001: + q_() = x.m_q; + break; } @@ -4857,9 +4833,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = std::move(x.m_q); - break; + case 0x00000001: + q_() = std::move(x.m_q); + break; } @@ -4880,9 +4856,9 @@ class Union_InnerBitMaskHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_q == x.m_q); - break; + case 0x00000001: + ret_value = (m_q == x.m_q); + break; } } @@ -4912,18 +4888,19 @@ class Union_InnerBitMaskHelper switch (__d) { - case 16: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 16: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4990,7 +4967,6 @@ class Union_InnerBitMaskHelper return m_q; } - void _default() { if (member_destructor_) @@ -5001,27 +4977,28 @@ class Union_InnerBitMaskHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerBitMaskHelper& q_() + InnerBitMaskHelper& q_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_q.~InnerBitMaskHelper();}; - new(&m_q) InnerBitMaskHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_q.~InnerBitMaskHelper(); + }; + new(&m_q) InnerBitMaskHelper(); - return m_q; - } + } + return m_q; + } int32_t m__d {2147483647}; @@ -5071,9 +5048,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = x.m_r; - break; + case 0x00000001: + r_() = x.m_r; + break; } } @@ -5089,9 +5066,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = std::move(x.m_r); - break; + case 0x00000001: + r_() = std::move(x.m_r); + break; } } @@ -5107,9 +5084,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = x.m_r; - break; + case 0x00000001: + r_() = x.m_r; + break; } @@ -5127,9 +5104,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = std::move(x.m_r); - break; + case 0x00000001: + r_() = std::move(x.m_r); + break; } @@ -5150,9 +5127,9 @@ class Union_InnerAliasHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_r == x.m_r); - break; + case 0x00000001: + ret_value = (m_r == x.m_r); + break; } } @@ -5182,18 +5159,19 @@ class Union_InnerAliasHelper switch (__d) { - case 17: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 17: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5249,7 +5227,6 @@ class Union_InnerAliasHelper return m_r; } - void _default() { if (member_destructor_) @@ -5260,27 +5237,25 @@ class Union_InnerAliasHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerAliasHelper& r_() + InnerAliasHelper& r_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_r = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_r = {0}; - return m_r; - } + } + return m_r; + } int32_t m__d {2147483647}; @@ -5330,9 +5305,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = x.m_s; - break; + case 0x00000001: + s_() = x.m_s; + break; } } @@ -5348,9 +5323,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = std::move(x.m_s); - break; + case 0x00000001: + s_() = std::move(x.m_s); + break; } } @@ -5366,9 +5341,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = x.m_s; - break; + case 0x00000001: + s_() = x.m_s; + break; } @@ -5386,9 +5361,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = std::move(x.m_s); - break; + case 0x00000001: + s_() = std::move(x.m_s); + break; } @@ -5409,9 +5384,9 @@ class Union_Array { switch (selected_member_) { - case 0x00000001: - ret_value = (m_s == x.m_s); - break; + case 0x00000001: + ret_value = (m_s == x.m_s); + break; } } @@ -5441,18 +5416,19 @@ class Union_Array switch (__d) { - case 18: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 18: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5519,7 +5495,6 @@ class Union_Array return m_s; } - void _default() { if (member_destructor_) @@ -5530,27 +5505,28 @@ class Union_Array selected_member_ = 0x0FFFFFFFu; } - private: - Inner_alias_array_helper& s_() + Inner_alias_array_helper& s_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_s.~Inner_alias_array_helper();}; - new(&m_s) Inner_alias_array_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_s.~Inner_alias_array_helper(); + }; + new(&m_s) Inner_alias_array_helper(); - return m_s; - } + } + return m_s; + } int32_t m__d {2147483647}; @@ -5600,9 +5576,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = x.m_t; - break; + case 0x00000001: + t_() = x.m_t; + break; } } @@ -5618,9 +5594,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = std::move(x.m_t); - break; + case 0x00000001: + t_() = std::move(x.m_t); + break; } } @@ -5636,9 +5612,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = x.m_t; - break; + case 0x00000001: + t_() = x.m_t; + break; } @@ -5656,9 +5632,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = std::move(x.m_t); - break; + case 0x00000001: + t_() = std::move(x.m_t); + break; } @@ -5679,9 +5655,9 @@ class Union_Sequence { switch (selected_member_) { - case 0x00000001: - ret_value = (m_t == x.m_t); - break; + case 0x00000001: + ret_value = (m_t == x.m_t); + break; } } @@ -5711,18 +5687,19 @@ class Union_Sequence switch (__d) { - case 19: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 19: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5789,7 +5766,6 @@ class Union_Sequence return m_t; } - void _default() { if (member_destructor_) @@ -5800,27 +5776,28 @@ class Union_Sequence selected_member_ = 0x0FFFFFFFu; } - private: - std::vector& t_() + std::vector& t_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_t.~vector();}; - new(&m_t) std::vector(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_t.~vector(); + }; + new(&m_t) std::vector(); - return m_t; - } + } + return m_t; + } int32_t m__d {2147483647}; @@ -5870,9 +5847,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = x.m_u; - break; + case 0x00000001: + u_() = x.m_u; + break; } } @@ -5888,9 +5865,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = std::move(x.m_u); - break; + case 0x00000001: + u_() = std::move(x.m_u); + break; } } @@ -5906,9 +5883,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = x.m_u; - break; + case 0x00000001: + u_() = x.m_u; + break; } @@ -5926,9 +5903,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = std::move(x.m_u); - break; + case 0x00000001: + u_() = std::move(x.m_u); + break; } @@ -5949,9 +5926,9 @@ class Union_Map { switch (selected_member_) { - case 0x00000001: - ret_value = (m_u == x.m_u); - break; + case 0x00000001: + ret_value = (m_u == x.m_u); + break; } } @@ -5981,18 +5958,19 @@ class Union_Map switch (__d) { - case 20: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 20: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6059,7 +6037,6 @@ class Union_Map return m_u; } - void _default() { if (member_destructor_) @@ -6070,27 +6047,28 @@ class Union_Map selected_member_ = 0x0FFFFFFFu; } - private: - std::map& u_() + std::map& u_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_u.~map();}; - new(&m_u) std::map(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_u.~map(); + }; + new(&m_u) std::map(); - return m_u; - } + } + return m_u; + } int32_t m__d {2147483647}; @@ -6140,9 +6118,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = x.m_v; - break; + case 0x00000001: + v_() = x.m_v; + break; } } @@ -6158,9 +6136,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = std::move(x.m_v); - break; + case 0x00000001: + v_() = std::move(x.m_v); + break; } } @@ -6176,9 +6154,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = x.m_v; - break; + case 0x00000001: + v_() = x.m_v; + break; } @@ -6196,9 +6174,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = std::move(x.m_v); - break; + case 0x00000001: + v_() = std::move(x.m_v); + break; } @@ -6219,9 +6197,9 @@ class Union_InnerUnionHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_v == x.m_v); - break; + case 0x00000001: + ret_value = (m_v == x.m_v); + break; } } @@ -6251,18 +6229,19 @@ class Union_InnerUnionHelper switch (__d) { - case 21: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 21: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6329,7 +6308,6 @@ class Union_InnerUnionHelper return m_v; } - void _default() { if (member_destructor_) @@ -6340,27 +6318,28 @@ class Union_InnerUnionHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerUnionHelper& v_() + InnerUnionHelper& v_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_v.~InnerUnionHelper();}; - new(&m_v) InnerUnionHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_v.~InnerUnionHelper(); + }; + new(&m_v) InnerUnionHelper(); - return m_v; - } + } + return m_v; + } int32_t m__d {2147483647}; @@ -6410,9 +6389,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = x.m_w; - break; + case 0x00000001: + w_() = x.m_w; + break; } } @@ -6428,9 +6407,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = std::move(x.m_w); - break; + case 0x00000001: + w_() = std::move(x.m_w); + break; } } @@ -6446,9 +6425,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = x.m_w; - break; + case 0x00000001: + w_() = x.m_w; + break; } @@ -6466,9 +6445,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = std::move(x.m_w); - break; + case 0x00000001: + w_() = std::move(x.m_w); + break; } @@ -6489,9 +6468,9 @@ class Union_InnerStructureHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_w == x.m_w); - break; + case 0x00000001: + ret_value = (m_w == x.m_w); + break; } } @@ -6521,18 +6500,19 @@ class Union_InnerStructureHelper switch (__d) { - case 22: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 22: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6599,7 +6579,6 @@ class Union_InnerStructureHelper return m_w; } - void _default() { if (member_destructor_) @@ -6610,27 +6589,28 @@ class Union_InnerStructureHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerStructureHelper& w_() + InnerStructureHelper& w_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_w.~InnerStructureHelper();}; - new(&m_w) InnerStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_w.~InnerStructureHelper(); + }; + new(&m_w) InnerStructureHelper(); - return m_w; - } + } + return m_w; + } int32_t m__d {2147483647}; @@ -6680,9 +6660,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = x.m_x; - break; + case 0x00000001: + x_() = x.m_x; + break; } } @@ -6698,9 +6678,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = std::move(x.m_x); - break; + case 0x00000001: + x_() = std::move(x.m_x); + break; } } @@ -6716,9 +6696,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = x.m_x; - break; + case 0x00000001: + x_() = x.m_x; + break; } @@ -6736,9 +6716,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = std::move(x.m_x); - break; + case 0x00000001: + x_() = std::move(x.m_x); + break; } @@ -6759,9 +6739,9 @@ class Union_InnerBitsetHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_x == x.m_x); - break; + case 0x00000001: + ret_value = (m_x == x.m_x); + break; } } @@ -6791,18 +6771,19 @@ class Union_InnerBitsetHelper switch (__d) { - case 23: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 23: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6869,7 +6850,6 @@ class Union_InnerBitsetHelper return m_x; } - void _default() { if (member_destructor_) @@ -6880,27 +6860,28 @@ class Union_InnerBitsetHelper selected_member_ = 0x0FFFFFFFu; } - private: - InnerBitsetHelper& x_() + InnerBitsetHelper& x_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_x.~InnerBitsetHelper();}; - new(&m_x) InnerBitsetHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() + { + m_x.~InnerBitsetHelper(); + }; + new(&m_x) InnerBitsetHelper(); - return m_x; - } + } + return m_x; + } int32_t m__d {2147483647}; @@ -6950,13 +6931,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -6972,13 +6953,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -6994,13 +6975,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -7018,13 +6999,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7045,13 +7026,13 @@ class Union_Discriminator_short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7081,25 +7062,26 @@ class Union_Discriminator_short switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7155,7 +7137,6 @@ class Union_Discriminator_short return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7197,7 +7178,6 @@ class Union_Discriminator_short return m_second; } - void _default() { if (member_destructor_) @@ -7208,45 +7188,43 @@ class Union_Discriminator_short selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } int16_t m__d {32767}; @@ -7297,13 +7275,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -7319,13 +7297,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -7341,13 +7319,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -7365,13 +7343,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7392,13 +7370,13 @@ class Union_Discriminator_unsigned_short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7428,25 +7406,26 @@ class Union_Discriminator_unsigned_short switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7502,7 +7481,6 @@ class Union_Discriminator_unsigned_short return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7544,7 +7522,6 @@ class Union_Discriminator_unsigned_short return m_second; } - void _default() { if (member_destructor_) @@ -7555,45 +7532,43 @@ class Union_Discriminator_unsigned_short selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } uint16_t m__d {32767}; @@ -7644,13 +7619,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -7666,13 +7641,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -7688,13 +7663,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -7712,13 +7687,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7739,13 +7714,13 @@ class Union_Discriminator_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7775,25 +7750,26 @@ class Union_Discriminator_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7849,7 +7825,6 @@ class Union_Discriminator_long return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7891,7 +7866,6 @@ class Union_Discriminator_long return m_second; } - void _default() { if (member_destructor_) @@ -7902,45 +7876,43 @@ class Union_Discriminator_long selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } - - return m_second; - } + } + return m_second; + } int32_t m__d {2147483647}; @@ -7991,13 +7963,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -8013,13 +7985,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8035,13 +8007,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8059,13 +8031,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8086,13 +8058,13 @@ class Union_Discriminator_unsigned_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8122,25 +8094,26 @@ class Union_Discriminator_unsigned_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8196,7 +8169,6 @@ class Union_Discriminator_unsigned_long return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8238,7 +8210,6 @@ class Union_Discriminator_unsigned_long return m_second; } - void _default() { if (member_destructor_) @@ -8249,45 +8220,43 @@ class Union_Discriminator_unsigned_long selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } uint32_t m__d {2147483647}; @@ -8338,13 +8307,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -8360,13 +8329,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8382,13 +8351,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8406,13 +8375,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8433,13 +8402,13 @@ class Union_Discriminator_long_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8469,25 +8438,26 @@ class Union_Discriminator_long_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8543,7 +8513,6 @@ class Union_Discriminator_long_long return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8585,7 +8554,6 @@ class Union_Discriminator_long_long return m_second; } - void _default() { if (member_destructor_) @@ -8596,45 +8564,43 @@ class Union_Discriminator_long_long selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } int64_t m__d {9223372036854775807}; @@ -8685,13 +8651,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -8707,13 +8673,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8729,13 +8695,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8753,13 +8719,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8780,13 +8746,13 @@ class Union_Discriminator_unsigned_long_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8816,25 +8782,26 @@ class Union_Discriminator_unsigned_long_long switch (__d) { - case 2: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8890,7 +8857,6 @@ class Union_Discriminator_unsigned_long_long return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8932,7 +8898,6 @@ class Union_Discriminator_unsigned_long_long return m_second; } - void _default() { if (member_destructor_) @@ -8943,45 +8908,43 @@ class Union_Discriminator_unsigned_long_long selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } - - return m_second; - } + } + return m_second; + } uint64_t m__d {9223372036854775807}; @@ -9036,13 +8999,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9058,13 +9021,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9080,13 +9043,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9104,13 +9067,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9131,13 +9094,13 @@ class Union_Discriminator_boolean { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9167,25 +9130,26 @@ class Union_Discriminator_boolean switch (__d) { - case true: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case true: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case false: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case false: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9241,7 +9205,6 @@ class Union_Discriminator_boolean return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9283,46 +9246,43 @@ class Union_Discriminator_boolean return m_second; } - - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } bool m__d {true}; @@ -9373,13 +9333,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9395,13 +9355,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9417,13 +9377,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9441,13 +9401,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9468,13 +9428,13 @@ class Union_Discriminator_octet { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9504,25 +9464,26 @@ class Union_Discriminator_octet switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9578,7 +9539,6 @@ class Union_Discriminator_octet return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9620,7 +9580,6 @@ class Union_Discriminator_octet return m_second; } - void _default() { if (member_destructor_) @@ -9631,45 +9590,43 @@ class Union_Discriminator_octet selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } uint8_t m__d {127}; @@ -9720,13 +9677,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9742,13 +9699,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9764,13 +9721,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9788,13 +9745,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9815,13 +9772,13 @@ class Union_Discriminator_char { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9851,25 +9808,26 @@ class Union_Discriminator_char switch (__d) { - case 'a': - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 'a': + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 'b': - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 'b': + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9925,7 +9883,6 @@ class Union_Discriminator_char return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9967,7 +9924,6 @@ class Union_Discriminator_char return m_second; } - void _default() { if (member_destructor_) @@ -9978,45 +9934,43 @@ class Union_Discriminator_char selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } char m__d {127}; @@ -10067,13 +10021,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -10089,13 +10043,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -10111,13 +10065,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -10135,13 +10089,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -10162,13 +10116,13 @@ class Union_Discriminator_wchar { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -10198,25 +10152,26 @@ class Union_Discriminator_wchar switch (__d) { - case L'a': - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case L'a': + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case L'b': - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case L'b': + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -10272,7 +10227,6 @@ class Union_Discriminator_wchar return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -10314,7 +10268,6 @@ class Union_Discriminator_wchar return m_second; } - void _default() { if (member_destructor_) @@ -10325,45 +10278,43 @@ class Union_Discriminator_wchar selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } wchar_t m__d {32767}; @@ -10418,17 +10369,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; - case 0x00000003: - third_() = x.m_third; - break; + case 0x00000003: + third_() = x.m_third; + break; } } @@ -10444,17 +10395,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; - case 0x00000003: - third_() = std::move(x.m_third); - break; + case 0x00000003: + third_() = std::move(x.m_third); + break; } } @@ -10470,17 +10421,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; - case 0x00000003: - third_() = x.m_third; - break; + case 0x00000003: + third_() = x.m_third; + break; } @@ -10498,17 +10449,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; - case 0x00000003: - third_() = std::move(x.m_third); - break; + case 0x00000003: + third_() = std::move(x.m_third); + break; } @@ -10529,17 +10480,17 @@ class Union_Discriminator_enum { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; - case 0x00000003: - ret_value = (m_third == x.m_third); - break; + case 0x00000003: + ret_value = (m_third == x.m_third); + break; } } @@ -10569,32 +10520,33 @@ class Union_Discriminator_enum switch (__d) { - case InnerEnumHelper::ENUM_VALUE_1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case InnerEnumHelper::ENUM_VALUE_2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -10650,7 +10602,6 @@ class Union_Discriminator_enum return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -10692,7 +10643,6 @@ class Union_Discriminator_enum return m_second; } - /*! * @brief This function sets a value in member third * @param _third New value for member third @@ -10734,64 +10684,61 @@ class Union_Discriminator_enum return m_third; } - - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } - return m_second; - } + return m_second; + } - uint8_t& third_() + uint8_t& third_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_third = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_third = {0}; - return m_third; - } + } + return m_third; + } InnerEnumHelper m__d {InnerEnumHelper::ENUM_VALUE_3}; @@ -10847,13 +10794,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -10869,13 +10816,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -10891,13 +10838,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -10915,13 +10862,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -10942,13 +10889,13 @@ class Union_Discriminator_enum_labels { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -10978,26 +10925,27 @@ class Union_Discriminator_enum_labels switch (__d) { - case InnerEnumHelper::ENUM_VALUE_3: - case InnerEnumHelper::ENUM_VALUE_1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_3: + case InnerEnumHelper::ENUM_VALUE_1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case InnerEnumHelper::ENUM_VALUE_2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11053,7 +11001,6 @@ class Union_Discriminator_enum_labels return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -11095,7 +11042,6 @@ class Union_Discriminator_enum_labels return m_second; } - void _default() { if (member_destructor_) @@ -11106,45 +11052,43 @@ class Union_Discriminator_enum_labels selected_member_ = 0x0FFFFFFFu; } - private: - int16_t& first_() + int16_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int16_t& second_() + int16_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } InnerEnumHelper m__d {InnerEnumHelper::ENUM_VALUE_3}; @@ -11195,13 +11139,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -11217,13 +11161,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -11239,13 +11183,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -11263,13 +11207,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -11290,13 +11234,13 @@ class Union_Discriminator_alias { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -11326,25 +11270,26 @@ class Union_Discriminator_alias switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11400,7 +11345,6 @@ class Union_Discriminator_alias return m_first; } - /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -11442,7 +11386,6 @@ class Union_Discriminator_alias return m_second; } - void _default() { if (member_destructor_) @@ -11453,45 +11396,43 @@ class Union_Discriminator_alias selected_member_ = 0x0FFFFFFFu; } - private: - int32_t& first_() + int32_t& first_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() + int64_t& second_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - return m_second; - } + } + return m_second; + } InnerAliasHelper m__d {2147483647}; @@ -11542,25 +11483,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; } } @@ -11576,25 +11517,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; } } @@ -11610,25 +11551,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; } @@ -11646,25 +11587,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; } @@ -11685,25 +11626,25 @@ class Union_Several_Fields { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; - case 0x00000004: - ret_value = (m_d == x.m_d); - break; + case 0x00000004: + ret_value = (m_d == x.m_d); + break; - case 0x00000005: - ret_value = (m_e == x.m_e); - break; + case 0x00000005: + ret_value = (m_e == x.m_e); + break; } } @@ -11733,46 +11674,47 @@ class Union_Several_Fields switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000004 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 4: - if (0x00000005 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000004 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 4: + if (0x00000005 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11839,7 +11781,6 @@ class Union_Several_Fields return m_a; } - /*! * @brief This function copies the value in member b * @param _b New value to be copied in member b @@ -11892,7 +11833,6 @@ class Union_Several_Fields return m_b; } - /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -11945,7 +11885,6 @@ class Union_Several_Fields return m_c; } - /*! * @brief This function copies the value in member d * @param _d New value to be copied in member d @@ -11998,7 +11937,6 @@ class Union_Several_Fields return m_d; } - /*! * @brief This function copies the value in member e * @param _e New value to be copied in member e @@ -12051,7 +11989,6 @@ class Union_Several_Fields return m_e; } - void _default() { if (member_destructor_) @@ -12062,99 +11999,112 @@ class Union_Several_Fields selected_member_ = 0x0FFFFFFFu; } - private: - InnerStructureHelper& a_() + InnerStructureHelper& a_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + member_destructor_(); + } + + selected_member_ = 0x00000001; + member_destructor_ = [&]() { - member_destructor_(); - } + m_a.~InnerStructureHelper(); + }; + new(&m_a) InnerStructureHelper(); - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; - new(&m_a) InnerStructureHelper(); + } - } + return m_a; + } - return m_a; + InnerEmptyStructureHelper& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - InnerEmptyStructureHelper& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000002; + member_destructor_ = [&]() { - member_destructor_(); - } + m_b.~InnerEmptyStructureHelper(); + }; + new(&m_b) InnerEmptyStructureHelper(); - selected_member_ = 0x00000002; - member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; - new(&m_b) InnerEmptyStructureHelper(); + } - } + return m_b; + } - return m_b; + Inner_alias_bounded_string_helper& c_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_bounded_string_helper& c_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000003; + member_destructor_ = [&]() { - member_destructor_(); - } + m_c.~Inner_alias_bounded_string_helper(); + }; + new(&m_c) Inner_alias_bounded_string_helper(); - selected_member_ = 0x00000003; - member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; - new(&m_c) Inner_alias_bounded_string_helper(); + } - } + return m_c; + } - return m_c; + Inner_alias_array_helper& d_() + { + if (0x00000004 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_array_helper& d_() - { - if (0x00000004 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000004; + member_destructor_ = [&]() { - member_destructor_(); - } + m_d.~Inner_alias_array_helper(); + }; + new(&m_d) Inner_alias_array_helper(); - selected_member_ = 0x00000004; - member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; - new(&m_d) Inner_alias_array_helper(); + } - } + return m_d; + } - return m_d; + Inner_alias_sequence_helper& e_() + { + if (0x00000005 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_sequence_helper& e_() - { - if (0x00000005 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000005; + member_destructor_ = [&]() { - member_destructor_(); - } - - selected_member_ = 0x00000005; - member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; - new(&m_e) Inner_alias_sequence_helper(); - - } + m_e.~Inner_alias_sequence_helper(); + }; + new(&m_e) Inner_alias_sequence_helper(); - return m_e; - } + } + return m_e; + } int32_t m__d {2147483647}; @@ -12185,7 +12135,10 @@ class Union_Several_Fields_With_Default eProsima_user_DllExport Union_Several_Fields_With_Default() { selected_member_ = 0x00000006; - member_destructor_ = [&]() {m_f.~vector();}; + member_destructor_ = [&]() + { + m_f.~vector(); + }; new(&m_f) std::vector(); } @@ -12212,29 +12165,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; - case 0x00000006: - f_() = x.m_f; - break; + case 0x00000006: + f_() = x.m_f; + break; } } @@ -12250,29 +12203,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; - case 0x00000006: - f_() = std::move(x.m_f); - break; + case 0x00000006: + f_() = std::move(x.m_f); + break; } } @@ -12288,29 +12241,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; - case 0x00000006: - f_() = x.m_f; - break; + case 0x00000006: + f_() = x.m_f; + break; } @@ -12328,29 +12281,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; - case 0x00000006: - f_() = std::move(x.m_f); - break; + case 0x00000006: + f_() = std::move(x.m_f); + break; } @@ -12371,29 +12324,29 @@ class Union_Several_Fields_With_Default { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; - case 0x00000004: - ret_value = (m_d == x.m_d); - break; + case 0x00000004: + ret_value = (m_d == x.m_d); + break; - case 0x00000005: - ret_value = (m_e == x.m_e); - break; + case 0x00000005: + ret_value = (m_e == x.m_e); + break; - case 0x00000006: - ret_value = (m_f == x.m_f); - break; + case 0x00000006: + ret_value = (m_f == x.m_f); + break; } } @@ -12423,53 +12376,54 @@ class Union_Several_Fields_With_Default switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000004 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 4: - if (0x00000005 == selected_member_) - { - valid_discriminator = true; - } - break; - - default: - if (0x00000006 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000004 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 4: + if (0x00000005 == selected_member_) + { + valid_discriminator = true; + } + break; + + default: + if (0x00000006 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -12536,7 +12490,6 @@ class Union_Several_Fields_With_Default return m_a; } - /*! * @brief This function copies the value in member b * @param _b New value to be copied in member b @@ -12589,7 +12542,6 @@ class Union_Several_Fields_With_Default return m_b; } - /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -12642,7 +12594,6 @@ class Union_Several_Fields_With_Default return m_c; } - /*! * @brief This function copies the value in member d * @param _d New value to be copied in member d @@ -12695,7 +12646,6 @@ class Union_Several_Fields_With_Default return m_d; } - /*! * @brief This function copies the value in member e * @param _e New value to be copied in member e @@ -12748,7 +12698,6 @@ class Union_Several_Fields_With_Default return m_e; } - /*! * @brief This function copies the value in member f * @param _f New value to be copied in member f @@ -12801,118 +12750,133 @@ class Union_Several_Fields_With_Default return m_f; } - - private: - InnerStructureHelper& a_() + InnerStructureHelper& a_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + member_destructor_(); + } + + selected_member_ = 0x00000001; + member_destructor_ = [&]() { - member_destructor_(); - } + m_a.~InnerStructureHelper(); + }; + new(&m_a) InnerStructureHelper(); - selected_member_ = 0x00000001; - member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; - new(&m_a) InnerStructureHelper(); + } - } + return m_a; + } - return m_a; + InnerEmptyStructureHelper& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - InnerEmptyStructureHelper& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000002; + member_destructor_ = [&]() { - member_destructor_(); - } + m_b.~InnerEmptyStructureHelper(); + }; + new(&m_b) InnerEmptyStructureHelper(); - selected_member_ = 0x00000002; - member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; - new(&m_b) InnerEmptyStructureHelper(); + } - } + return m_b; + } - return m_b; + Inner_alias_bounded_string_helper& c_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_bounded_string_helper& c_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000003; + member_destructor_ = [&]() { - member_destructor_(); - } + m_c.~Inner_alias_bounded_string_helper(); + }; + new(&m_c) Inner_alias_bounded_string_helper(); - selected_member_ = 0x00000003; - member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; - new(&m_c) Inner_alias_bounded_string_helper(); + } - } + return m_c; + } - return m_c; + Inner_alias_array_helper& d_() + { + if (0x00000004 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_array_helper& d_() - { - if (0x00000004 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000004; + member_destructor_ = [&]() { - member_destructor_(); - } + m_d.~Inner_alias_array_helper(); + }; + new(&m_d) Inner_alias_array_helper(); - selected_member_ = 0x00000004; - member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; - new(&m_d) Inner_alias_array_helper(); + } - } + return m_d; + } - return m_d; + Inner_alias_sequence_helper& e_() + { + if (0x00000005 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - Inner_alias_sequence_helper& e_() - { - if (0x00000005 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000005; + member_destructor_ = [&]() { - member_destructor_(); - } + m_e.~Inner_alias_sequence_helper(); + }; + new(&m_e) Inner_alias_sequence_helper(); - selected_member_ = 0x00000005; - member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; - new(&m_e) Inner_alias_sequence_helper(); + } - } + return m_e; + } - return m_e; + std::vector& f_() + { + if (0x00000006 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); } - std::vector& f_() - { - if (0x00000006 != selected_member_) - { - if (member_destructor_) + selected_member_ = 0x00000006; + member_destructor_ = [&]() { - member_destructor_(); - } - - selected_member_ = 0x00000006; - member_destructor_ = [&]() {m_f.~vector();}; - new(&m_f) std::vector(); - - } + m_f.~vector(); + }; + new(&m_f) std::vector(); - return m_f; - } + } + return m_f; + } int32_t m__d {2147483647}; @@ -12959,7 +12923,7 @@ class UnionShort eProsima_user_DllExport UnionShort( const UnionShort& x) { - m_var_union_short = x.m_var_union_short; + m_var_union_short = x.m_var_union_short; } @@ -12981,7 +12945,7 @@ class UnionShort const UnionShort& x) { - m_var_union_short = x.m_var_union_short; + m_var_union_short = x.m_var_union_short; return *this; } @@ -13056,8 +13020,6 @@ class UnionShort return m_var_union_short; } - - private: Union_Short m_var_union_short; @@ -13092,7 +13054,7 @@ class UnionUShort eProsima_user_DllExport UnionUShort( const UnionUShort& x) { - m_var_union_ushort = x.m_var_union_ushort; + m_var_union_ushort = x.m_var_union_ushort; } @@ -13114,7 +13076,7 @@ class UnionUShort const UnionUShort& x) { - m_var_union_ushort = x.m_var_union_ushort; + m_var_union_ushort = x.m_var_union_ushort; return *this; } @@ -13189,8 +13151,6 @@ class UnionUShort return m_var_union_ushort; } - - private: Union_UShort m_var_union_ushort; @@ -13225,7 +13185,7 @@ class UnionLong eProsima_user_DllExport UnionLong( const UnionLong& x) { - m_var_union_long = x.m_var_union_long; + m_var_union_long = x.m_var_union_long; } @@ -13247,7 +13207,7 @@ class UnionLong const UnionLong& x) { - m_var_union_long = x.m_var_union_long; + m_var_union_long = x.m_var_union_long; return *this; } @@ -13322,8 +13282,6 @@ class UnionLong return m_var_union_long; } - - private: Union_Long m_var_union_long; @@ -13358,7 +13316,7 @@ class UnionULong eProsima_user_DllExport UnionULong( const UnionULong& x) { - m_var_union_ulong = x.m_var_union_ulong; + m_var_union_ulong = x.m_var_union_ulong; } @@ -13380,7 +13338,7 @@ class UnionULong const UnionULong& x) { - m_var_union_ulong = x.m_var_union_ulong; + m_var_union_ulong = x.m_var_union_ulong; return *this; } @@ -13455,8 +13413,6 @@ class UnionULong return m_var_union_ulong; } - - private: Union_ULong m_var_union_ulong; @@ -13491,7 +13447,7 @@ class UnionLongLong eProsima_user_DllExport UnionLongLong( const UnionLongLong& x) { - m_var_union_long_long = x.m_var_union_long_long; + m_var_union_long_long = x.m_var_union_long_long; } @@ -13513,7 +13469,7 @@ class UnionLongLong const UnionLongLong& x) { - m_var_union_long_long = x.m_var_union_long_long; + m_var_union_long_long = x.m_var_union_long_long; return *this; } @@ -13588,8 +13544,6 @@ class UnionLongLong return m_var_union_long_long; } - - private: Union_LongLong m_var_union_long_long; @@ -13624,7 +13578,7 @@ class UnionULongLong eProsima_user_DllExport UnionULongLong( const UnionULongLong& x) { - m_var_union_ulong_long = x.m_var_union_ulong_long; + m_var_union_ulong_long = x.m_var_union_ulong_long; } @@ -13646,7 +13600,7 @@ class UnionULongLong const UnionULongLong& x) { - m_var_union_ulong_long = x.m_var_union_ulong_long; + m_var_union_ulong_long = x.m_var_union_ulong_long; return *this; } @@ -13721,8 +13675,6 @@ class UnionULongLong return m_var_union_ulong_long; } - - private: Union_ULongLOng m_var_union_ulong_long; @@ -13757,7 +13709,7 @@ class UnionFloat eProsima_user_DllExport UnionFloat( const UnionFloat& x) { - m_var_union_float = x.m_var_union_float; + m_var_union_float = x.m_var_union_float; } @@ -13779,7 +13731,7 @@ class UnionFloat const UnionFloat& x) { - m_var_union_float = x.m_var_union_float; + m_var_union_float = x.m_var_union_float; return *this; } @@ -13854,8 +13806,6 @@ class UnionFloat return m_var_union_float; } - - private: Union_Float m_var_union_float; @@ -13890,7 +13840,7 @@ class UnionDouble eProsima_user_DllExport UnionDouble( const UnionDouble& x) { - m_var_union_double = x.m_var_union_double; + m_var_union_double = x.m_var_union_double; } @@ -13912,7 +13862,7 @@ class UnionDouble const UnionDouble& x) { - m_var_union_double = x.m_var_union_double; + m_var_union_double = x.m_var_union_double; return *this; } @@ -13987,8 +13937,6 @@ class UnionDouble return m_var_union_double; } - - private: Union_Double m_var_union_double; @@ -14023,7 +13971,7 @@ class UnionLongDouble eProsima_user_DllExport UnionLongDouble( const UnionLongDouble& x) { - m_var_union_long_double = x.m_var_union_long_double; + m_var_union_long_double = x.m_var_union_long_double; } @@ -14045,7 +13993,7 @@ class UnionLongDouble const UnionLongDouble& x) { - m_var_union_long_double = x.m_var_union_long_double; + m_var_union_long_double = x.m_var_union_long_double; return *this; } @@ -14120,8 +14068,6 @@ class UnionLongDouble return m_var_union_long_double; } - - private: Union_LongDouble m_var_union_long_double; @@ -14156,7 +14102,7 @@ class UnionBoolean eProsima_user_DllExport UnionBoolean( const UnionBoolean& x) { - m_var_union_boolean = x.m_var_union_boolean; + m_var_union_boolean = x.m_var_union_boolean; } @@ -14178,7 +14124,7 @@ class UnionBoolean const UnionBoolean& x) { - m_var_union_boolean = x.m_var_union_boolean; + m_var_union_boolean = x.m_var_union_boolean; return *this; } @@ -14253,8 +14199,6 @@ class UnionBoolean return m_var_union_boolean; } - - private: Union_Boolean m_var_union_boolean; @@ -14289,7 +14233,7 @@ class UnionOctet eProsima_user_DllExport UnionOctet( const UnionOctet& x) { - m_var_union_octet = x.m_var_union_octet; + m_var_union_octet = x.m_var_union_octet; } @@ -14311,7 +14255,7 @@ class UnionOctet const UnionOctet& x) { - m_var_union_octet = x.m_var_union_octet; + m_var_union_octet = x.m_var_union_octet; return *this; } @@ -14386,8 +14330,6 @@ class UnionOctet return m_var_union_octet; } - - private: Union_Octet m_var_union_octet; @@ -14422,7 +14364,7 @@ class UnionChar eProsima_user_DllExport UnionChar( const UnionChar& x) { - m_var_union_char = x.m_var_union_char; + m_var_union_char = x.m_var_union_char; } @@ -14444,7 +14386,7 @@ class UnionChar const UnionChar& x) { - m_var_union_char = x.m_var_union_char; + m_var_union_char = x.m_var_union_char; return *this; } @@ -14519,8 +14461,6 @@ class UnionChar return m_var_union_char; } - - private: Union_Char m_var_union_char; @@ -14555,7 +14495,7 @@ class UnionWChar eProsima_user_DllExport UnionWChar( const UnionWChar& x) { - m_var_union_wchar = x.m_var_union_wchar; + m_var_union_wchar = x.m_var_union_wchar; } @@ -14577,7 +14517,7 @@ class UnionWChar const UnionWChar& x) { - m_var_union_wchar = x.m_var_union_wchar; + m_var_union_wchar = x.m_var_union_wchar; return *this; } @@ -14652,8 +14592,6 @@ class UnionWChar return m_var_union_wchar; } - - private: Union_WChar m_var_union_wchar; @@ -14688,7 +14626,7 @@ class UnionString eProsima_user_DllExport UnionString( const UnionString& x) { - m_var_union_string = x.m_var_union_string; + m_var_union_string = x.m_var_union_string; } @@ -14710,7 +14648,7 @@ class UnionString const UnionString& x) { - m_var_union_string = x.m_var_union_string; + m_var_union_string = x.m_var_union_string; return *this; } @@ -14785,8 +14723,6 @@ class UnionString return m_var_union_string; } - - private: Union_String m_var_union_string; @@ -14821,7 +14757,7 @@ class UnionWString eProsima_user_DllExport UnionWString( const UnionWString& x) { - m_var_union_wstring = x.m_var_union_wstring; + m_var_union_wstring = x.m_var_union_wstring; } @@ -14843,7 +14779,7 @@ class UnionWString const UnionWString& x) { - m_var_union_wstring = x.m_var_union_wstring; + m_var_union_wstring = x.m_var_union_wstring; return *this; } @@ -14918,8 +14854,6 @@ class UnionWString return m_var_union_wstring; } - - private: Union_WString m_var_union_wstring; @@ -14954,7 +14888,7 @@ class UnionBoundedString eProsima_user_DllExport UnionBoundedString( const UnionBoundedString& x) { - m_var_union_bounded_string = x.m_var_union_bounded_string; + m_var_union_bounded_string = x.m_var_union_bounded_string; } @@ -14976,7 +14910,7 @@ class UnionBoundedString const UnionBoundedString& x) { - m_var_union_bounded_string = x.m_var_union_bounded_string; + m_var_union_bounded_string = x.m_var_union_bounded_string; return *this; } @@ -15051,8 +14985,6 @@ class UnionBoundedString return m_var_union_bounded_string; } - - private: Union_BoundedString m_var_union_bounded_string; @@ -15087,7 +15019,7 @@ class UnionBoundedWString eProsima_user_DllExport UnionBoundedWString( const UnionBoundedWString& x) { - m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; + m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; } @@ -15109,7 +15041,7 @@ class UnionBoundedWString const UnionBoundedWString& x) { - m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; + m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; return *this; } @@ -15184,8 +15116,6 @@ class UnionBoundedWString return m_var_union_bounded_wstring; } - - private: Union_BoundedWString m_var_union_bounded_wstring; @@ -15220,7 +15150,7 @@ class UnionInnerEnumHelper eProsima_user_DllExport UnionInnerEnumHelper( const UnionInnerEnumHelper& x) { - m_var_union_my_enum = x.m_var_union_my_enum; + m_var_union_my_enum = x.m_var_union_my_enum; } @@ -15242,7 +15172,7 @@ class UnionInnerEnumHelper const UnionInnerEnumHelper& x) { - m_var_union_my_enum = x.m_var_union_my_enum; + m_var_union_my_enum = x.m_var_union_my_enum; return *this; } @@ -15317,8 +15247,6 @@ class UnionInnerEnumHelper return m_var_union_my_enum; } - - private: Union_InnerEnumHelper m_var_union_my_enum; @@ -15353,7 +15281,7 @@ class UnionInnerBitMaskHelper eProsima_user_DllExport UnionInnerBitMaskHelper( const UnionInnerBitMaskHelper& x) { - m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; + m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; } @@ -15375,7 +15303,7 @@ class UnionInnerBitMaskHelper const UnionInnerBitMaskHelper& x) { - m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; + m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; return *this; } @@ -15450,8 +15378,6 @@ class UnionInnerBitMaskHelper return m_var_union_my_bit_mask; } - - private: Union_InnerBitMaskHelper m_var_union_my_bit_mask; @@ -15486,7 +15412,7 @@ class UnionInnerAliasHelper eProsima_user_DllExport UnionInnerAliasHelper( const UnionInnerAliasHelper& x) { - m_var_union_my_alias = x.m_var_union_my_alias; + m_var_union_my_alias = x.m_var_union_my_alias; } @@ -15508,7 +15434,7 @@ class UnionInnerAliasHelper const UnionInnerAliasHelper& x) { - m_var_union_my_alias = x.m_var_union_my_alias; + m_var_union_my_alias = x.m_var_union_my_alias; return *this; } @@ -15583,8 +15509,6 @@ class UnionInnerAliasHelper return m_var_union_my_alias; } - - private: Union_InnerAliasHelper m_var_union_my_alias; @@ -15619,7 +15543,7 @@ class UnionArray eProsima_user_DllExport UnionArray( const UnionArray& x) { - m_var_union_array = x.m_var_union_array; + m_var_union_array = x.m_var_union_array; } @@ -15641,7 +15565,7 @@ class UnionArray const UnionArray& x) { - m_var_union_array = x.m_var_union_array; + m_var_union_array = x.m_var_union_array; return *this; } @@ -15716,8 +15640,6 @@ class UnionArray return m_var_union_array; } - - private: Union_Array m_var_union_array; @@ -15752,7 +15674,7 @@ class UnionSequence eProsima_user_DllExport UnionSequence( const UnionSequence& x) { - m_var_union_sequence = x.m_var_union_sequence; + m_var_union_sequence = x.m_var_union_sequence; } @@ -15774,7 +15696,7 @@ class UnionSequence const UnionSequence& x) { - m_var_union_sequence = x.m_var_union_sequence; + m_var_union_sequence = x.m_var_union_sequence; return *this; } @@ -15849,8 +15771,6 @@ class UnionSequence return m_var_union_sequence; } - - private: Union_Sequence m_var_union_sequence; @@ -15885,7 +15805,7 @@ class UnionMap eProsima_user_DllExport UnionMap( const UnionMap& x) { - m_var_union_map = x.m_var_union_map; + m_var_union_map = x.m_var_union_map; } @@ -15907,7 +15827,7 @@ class UnionMap const UnionMap& x) { - m_var_union_map = x.m_var_union_map; + m_var_union_map = x.m_var_union_map; return *this; } @@ -15982,8 +15902,6 @@ class UnionMap return m_var_union_map; } - - private: Union_Map m_var_union_map; @@ -16018,7 +15936,7 @@ class UnionInnerUnionHelper eProsima_user_DllExport UnionInnerUnionHelper( const UnionInnerUnionHelper& x) { - m_var_union_my_union = x.m_var_union_my_union; + m_var_union_my_union = x.m_var_union_my_union; } @@ -16040,7 +15958,7 @@ class UnionInnerUnionHelper const UnionInnerUnionHelper& x) { - m_var_union_my_union = x.m_var_union_my_union; + m_var_union_my_union = x.m_var_union_my_union; return *this; } @@ -16115,8 +16033,6 @@ class UnionInnerUnionHelper return m_var_union_my_union; } - - private: Union_InnerUnionHelper m_var_union_my_union; @@ -16151,7 +16067,7 @@ class UnionInnerStructureHelper eProsima_user_DllExport UnionInnerStructureHelper( const UnionInnerStructureHelper& x) { - m_var_union_my_structure = x.m_var_union_my_structure; + m_var_union_my_structure = x.m_var_union_my_structure; } @@ -16173,7 +16089,7 @@ class UnionInnerStructureHelper const UnionInnerStructureHelper& x) { - m_var_union_my_structure = x.m_var_union_my_structure; + m_var_union_my_structure = x.m_var_union_my_structure; return *this; } @@ -16248,8 +16164,6 @@ class UnionInnerStructureHelper return m_var_union_my_structure; } - - private: Union_InnerStructureHelper m_var_union_my_structure; @@ -16284,7 +16198,7 @@ class UnionInnerBitsetHelper eProsima_user_DllExport UnionInnerBitsetHelper( const UnionInnerBitsetHelper& x) { - m_var_union_my_bitset = x.m_var_union_my_bitset; + m_var_union_my_bitset = x.m_var_union_my_bitset; } @@ -16306,7 +16220,7 @@ class UnionInnerBitsetHelper const UnionInnerBitsetHelper& x) { - m_var_union_my_bitset = x.m_var_union_my_bitset; + m_var_union_my_bitset = x.m_var_union_my_bitset; return *this; } @@ -16381,8 +16295,6 @@ class UnionInnerBitsetHelper return m_var_union_my_bitset; } - - private: Union_InnerBitsetHelper m_var_union_my_bitset; @@ -16417,7 +16329,7 @@ class UnionDiscriminatorShort eProsima_user_DllExport UnionDiscriminatorShort( const UnionDiscriminatorShort& x) { - m_var_union_discriminator_short = x.m_var_union_discriminator_short; + m_var_union_discriminator_short = x.m_var_union_discriminator_short; } @@ -16439,7 +16351,7 @@ class UnionDiscriminatorShort const UnionDiscriminatorShort& x) { - m_var_union_discriminator_short = x.m_var_union_discriminator_short; + m_var_union_discriminator_short = x.m_var_union_discriminator_short; return *this; } @@ -16514,8 +16426,6 @@ class UnionDiscriminatorShort return m_var_union_discriminator_short; } - - private: Union_Discriminator_short m_var_union_discriminator_short; @@ -16550,7 +16460,7 @@ class UnionDiscriminatorUShort eProsima_user_DllExport UnionDiscriminatorUShort( const UnionDiscriminatorUShort& x) { - m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; + m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; } @@ -16572,7 +16482,7 @@ class UnionDiscriminatorUShort const UnionDiscriminatorUShort& x) { - m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; + m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; return *this; } @@ -16647,8 +16557,6 @@ class UnionDiscriminatorUShort return m_var_union_discriminator_ushort; } - - private: Union_Discriminator_unsigned_short m_var_union_discriminator_ushort; @@ -16683,7 +16591,7 @@ class UnionDiscriminatorLong eProsima_user_DllExport UnionDiscriminatorLong( const UnionDiscriminatorLong& x) { - m_var_union_discriminator_long = x.m_var_union_discriminator_long; + m_var_union_discriminator_long = x.m_var_union_discriminator_long; } @@ -16705,7 +16613,7 @@ class UnionDiscriminatorLong const UnionDiscriminatorLong& x) { - m_var_union_discriminator_long = x.m_var_union_discriminator_long; + m_var_union_discriminator_long = x.m_var_union_discriminator_long; return *this; } @@ -16780,8 +16688,6 @@ class UnionDiscriminatorLong return m_var_union_discriminator_long; } - - private: Union_Discriminator_long m_var_union_discriminator_long; @@ -16816,7 +16722,7 @@ class UnionDiscriminatorULong eProsima_user_DllExport UnionDiscriminatorULong( const UnionDiscriminatorULong& x) { - m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; + m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; } @@ -16838,7 +16744,7 @@ class UnionDiscriminatorULong const UnionDiscriminatorULong& x) { - m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; + m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; return *this; } @@ -16913,8 +16819,6 @@ class UnionDiscriminatorULong return m_var_union_discriminator_ulong; } - - private: Union_Discriminator_unsigned_long m_var_union_discriminator_ulong; @@ -16949,7 +16853,7 @@ class UnionDiscriminatorLongLong eProsima_user_DllExport UnionDiscriminatorLongLong( const UnionDiscriminatorLongLong& x) { - m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; + m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; } @@ -16971,7 +16875,7 @@ class UnionDiscriminatorLongLong const UnionDiscriminatorLongLong& x) { - m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; + m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; return *this; } @@ -17046,8 +16950,6 @@ class UnionDiscriminatorLongLong return m_var_union_discriminator_long_long; } - - private: Union_Discriminator_long_long m_var_union_discriminator_long_long; @@ -17082,7 +16984,7 @@ class UnionDiscriminatorULongLong eProsima_user_DllExport UnionDiscriminatorULongLong( const UnionDiscriminatorULongLong& x) { - m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; + m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; } @@ -17104,7 +17006,7 @@ class UnionDiscriminatorULongLong const UnionDiscriminatorULongLong& x) { - m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; + m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; return *this; } @@ -17179,8 +17081,6 @@ class UnionDiscriminatorULongLong return m_var_union_discriminator_ulong_long; } - - private: Union_Discriminator_unsigned_long_long m_var_union_discriminator_ulong_long; @@ -17215,7 +17115,7 @@ class UnionDiscriminatorBoolean eProsima_user_DllExport UnionDiscriminatorBoolean( const UnionDiscriminatorBoolean& x) { - m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; + m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; } @@ -17237,7 +17137,7 @@ class UnionDiscriminatorBoolean const UnionDiscriminatorBoolean& x) { - m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; + m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; return *this; } @@ -17312,8 +17212,6 @@ class UnionDiscriminatorBoolean return m_var_union_discriminator_boolean; } - - private: Union_Discriminator_boolean m_var_union_discriminator_boolean; @@ -17348,7 +17246,7 @@ class UnionDiscriminatorOctet eProsima_user_DllExport UnionDiscriminatorOctet( const UnionDiscriminatorOctet& x) { - m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; + m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; } @@ -17370,7 +17268,7 @@ class UnionDiscriminatorOctet const UnionDiscriminatorOctet& x) { - m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; + m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; return *this; } @@ -17445,8 +17343,6 @@ class UnionDiscriminatorOctet return m_var_union_discriminator_octet; } - - private: Union_Discriminator_octet m_var_union_discriminator_octet; @@ -17481,7 +17377,7 @@ class UnionDiscriminatorChar eProsima_user_DllExport UnionDiscriminatorChar( const UnionDiscriminatorChar& x) { - m_var_union_discriminator_char = x.m_var_union_discriminator_char; + m_var_union_discriminator_char = x.m_var_union_discriminator_char; } @@ -17503,7 +17399,7 @@ class UnionDiscriminatorChar const UnionDiscriminatorChar& x) { - m_var_union_discriminator_char = x.m_var_union_discriminator_char; + m_var_union_discriminator_char = x.m_var_union_discriminator_char; return *this; } @@ -17578,8 +17474,6 @@ class UnionDiscriminatorChar return m_var_union_discriminator_char; } - - private: Union_Discriminator_char m_var_union_discriminator_char; @@ -17614,7 +17508,7 @@ class UnionDiscriminatorWChar eProsima_user_DllExport UnionDiscriminatorWChar( const UnionDiscriminatorWChar& x) { - m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; + m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; } @@ -17636,7 +17530,7 @@ class UnionDiscriminatorWChar const UnionDiscriminatorWChar& x) { - m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; + m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; return *this; } @@ -17711,8 +17605,6 @@ class UnionDiscriminatorWChar return m_var_union_discriminator_wchar; } - - private: Union_Discriminator_wchar m_var_union_discriminator_wchar; @@ -17747,7 +17639,7 @@ class UnionDiscriminatorEnum eProsima_user_DllExport UnionDiscriminatorEnum( const UnionDiscriminatorEnum& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; } @@ -17769,7 +17661,7 @@ class UnionDiscriminatorEnum const UnionDiscriminatorEnum& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; return *this; } @@ -17844,8 +17736,6 @@ class UnionDiscriminatorEnum return m_var_union_discriminator_enum; } - - private: Union_Discriminator_enum m_var_union_discriminator_enum; @@ -17880,7 +17770,7 @@ class UnionDiscriminatorEnumLabel eProsima_user_DllExport UnionDiscriminatorEnumLabel( const UnionDiscriminatorEnumLabel& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; } @@ -17902,7 +17792,7 @@ class UnionDiscriminatorEnumLabel const UnionDiscriminatorEnumLabel& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; return *this; } @@ -17977,8 +17867,6 @@ class UnionDiscriminatorEnumLabel return m_var_union_discriminator_enum; } - - private: Union_Discriminator_enum_labels m_var_union_discriminator_enum; @@ -18013,7 +17901,7 @@ class UnionDiscriminatorAlias eProsima_user_DllExport UnionDiscriminatorAlias( const UnionDiscriminatorAlias& x) { - m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; + m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; } @@ -18035,7 +17923,7 @@ class UnionDiscriminatorAlias const UnionDiscriminatorAlias& x) { - m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; + m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; return *this; } @@ -18110,8 +17998,6 @@ class UnionDiscriminatorAlias return m_var_union_discriminator_alias; } - - private: Union_Discriminator_alias m_var_union_discriminator_alias; @@ -18146,7 +18032,7 @@ class UnionSeveralFields eProsima_user_DllExport UnionSeveralFields( const UnionSeveralFields& x) { - m_var_union_several_fields = x.m_var_union_several_fields; + m_var_union_several_fields = x.m_var_union_several_fields; } @@ -18168,7 +18054,7 @@ class UnionSeveralFields const UnionSeveralFields& x) { - m_var_union_several_fields = x.m_var_union_several_fields; + m_var_union_several_fields = x.m_var_union_several_fields; return *this; } @@ -18243,8 +18129,6 @@ class UnionSeveralFields return m_var_union_several_fields; } - - private: Union_Several_Fields m_var_union_several_fields; @@ -18279,7 +18163,7 @@ class UnionSeveralFieldsWithDefault eProsima_user_DllExport UnionSeveralFieldsWithDefault( const UnionSeveralFieldsWithDefault& x) { - m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; + m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; } @@ -18301,7 +18185,7 @@ class UnionSeveralFieldsWithDefault const UnionSeveralFieldsWithDefault& x) { - m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; + m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; return *this; } @@ -18376,8 +18260,6 @@ class UnionSeveralFieldsWithDefault return m_var_union_several_fields_with_default; } - - private: Union_Several_Fields_With_Default m_var_union_several_fields_with_default; @@ -18424,17 +18306,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; } } @@ -18450,17 +18332,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; } } @@ -18476,17 +18358,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; } @@ -18504,17 +18386,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; } @@ -18535,17 +18417,17 @@ class DefaultAnnotation { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; } } @@ -18575,32 +18457,33 @@ class DefaultAnnotation switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -18656,7 +18539,6 @@ class DefaultAnnotation return m_a; } - /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -18698,7 +18580,6 @@ class DefaultAnnotation return m_b; } - /*! * @brief This function sets a value in member c * @param _c New value for member c @@ -18740,64 +18621,61 @@ class DefaultAnnotation return m_c; } - - private: - uint8_t& a_() + uint8_t& a_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - } + } - return m_a; - } + return m_a; + } - int16_t& b_() + int16_t& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_b = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_b = {0}; - } + } - return m_b; - } + return m_b; + } - int32_t& c_() + int32_t& c_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_c = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_c = {0}; - return m_c; - } + } + return m_c; + } int32_t m__d {0}; @@ -18849,13 +18727,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; } } @@ -18871,13 +18749,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; } } @@ -18893,13 +18771,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; } @@ -18917,13 +18795,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; } @@ -18944,13 +18822,13 @@ class DefaultAnnotationExternalValue { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; } } @@ -18980,25 +18858,26 @@ class DefaultAnnotationExternalValue switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException( + "Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -19054,7 +18933,6 @@ class DefaultAnnotationExternalValue return m_a; } - /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -19096,7 +18974,6 @@ class DefaultAnnotationExternalValue return m_b; } - void _default() { if (member_destructor_) @@ -19107,45 +18984,43 @@ class DefaultAnnotationExternalValue selected_member_ = 0x0FFFFFFFu; } - private: - uint8_t& a_() + uint8_t& a_() + { + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - if (0x00000001 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - } + } - return m_a; - } + return m_a; + } - int16_t& b_() + int16_t& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); - } - - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_b = {0}; + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_b = {0}; - return m_b; - } + } + return m_b; + } int32_t m__d {2}; diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index 6fcbd9dd..640c119d 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -35,18 +35,18 @@ namespace participants { */ struct TopicInfo { - TopicInfo() = default; - - TopicInfo ( - const std::string& _type_name, - const std::string& _serialized_qos) - : type_name(_type_name) - , serialized_qos(_serialized_qos) - { - } - - std::string type_name; - std::string serialized_qos; + TopicInfo() = default; + + TopicInfo ( + const std::string& _type_name, + const std::string& _serialized_qos) + : type_name(_type_name) + , serialized_qos(_serialized_qos) + { + } + + std::string type_name; + std::string serialized_qos; }; /** @@ -56,18 +56,18 @@ struct TopicInfo */ struct ServiceInfo { - ServiceInfo() = default; - - ServiceInfo( - const TopicInfo& _request, - const TopicInfo& _reply) - : request(_request) - , reply(_reply) - { - } - - TopicInfo request; - TopicInfo reply; + ServiceInfo() = default; + + ServiceInfo( + const TopicInfo& _request, + const TopicInfo& _reply) + : request(_request) + , reply(_reply) + { + } + + TopicInfo request; + TopicInfo reply; }; /** @@ -77,27 +77,27 @@ struct ServiceInfo */ struct ActionInfo { - ActionInfo() = default; - - ActionInfo( - const ServiceInfo& _goal, - const ServiceInfo& _result, - const ServiceInfo& _cancel, - const TopicInfo& _feedback, - const TopicInfo& _status) - : goal(_goal) - , result(_result) - , cancel(_cancel) - , feedback(_feedback) - , status(_status) - { - } - - ServiceInfo goal; - ServiceInfo result; - ServiceInfo cancel; - TopicInfo feedback; - TopicInfo status; + ActionInfo() = default; + + ActionInfo( + const ServiceInfo& _goal, + const ServiceInfo& _result, + const ServiceInfo& _cancel, + const TopicInfo& _feedback, + const TopicInfo& _status) + : goal(_goal) + , result(_result) + , cancel(_cancel) + , feedback(_feedback) + , status(_status) + { + } + + ServiceInfo goal; + ServiceInfo result; + ServiceInfo cancel; + TopicInfo feedback; + TopicInfo status; }; /** @@ -238,7 +238,7 @@ typedef void (* ServiceReplyNotification)( * @param [out] service_info Information about the service, including request and reply types and their serialized QoS. * @return \c true if the service was found and the type information was retrieved successfully, \c false otherwise. */ - typedef bool (* ServiceQuery)( +typedef bool (* ServiceQuery)( const char* service_name, ServiceInfo& service_info); @@ -272,10 +272,10 @@ typedef void (* ActionNotification)( * @return \c true if the goal request has been accepted, \c false otherwise. */ typedef bool (* ActionGoalRequestNotification)( - const char* action_name, - const char* json, - const UUID& goal_id, - int64_t publish_time); + const char* action_name, + const char* json, + const UUID& goal_id, + int64_t publish_time); /** * @brief Callback for notification of an action cancel request. @@ -294,11 +294,11 @@ typedef bool (* ActionGoalRequestNotification)( * @param [in] publish_time The time at which the cancel request was published. */ typedef void (* ActionCancelRequestNotification)( - const char* action_name, - const UUID& goal_id, - int64_t timestamp, - uint64_t request_id, - int64_t publish_time); + const char* action_name, + const UUID& goal_id, + int64_t timestamp, + uint64_t request_id, + int64_t publish_time); /** * @brief Callback for notification of action feedback. @@ -328,11 +328,11 @@ typedef void (* ActionFeedbackNotification)( * @param [in] publish_time The time at which the status was published. */ typedef void (* ActionStatusNotification)( - const char* action_name, - const UUID& goal_id, - STATUS_CODE status_code, - const char* status_message, - int64_t publish_time); + const char* action_name, + const UUID& goal_id, + STATUS_CODE status_code, + const char* status_message, + int64_t publish_time); /** * @brief Callback for notification of action result. @@ -360,8 +360,8 @@ typedef void (* ActionResultNotification)( * @return \c true if the action was found and the types were retrieved successfully, \c false otherwise. */ typedef bool (* ActionQuery)( - const char* action_name, - ActionInfo& action_info); + const char* action_name, + ActionInfo& action_info); } /* namespace participants */ } /* namespace ddsenabler */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index df80801b..e711909e 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -137,9 +137,9 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant std::unique_lock& lck); bool fill_topic_struct_nts_( - const std::string& topic_name, - const TopicInfo& topic_info, - ddspipe::core::types::DdsTopic& topic); + const std::string& topic_name, + const TopicInfo& topic_info, + ddspipe::core::types::DdsTopic& topic); bool fullfill_service_type_nts_( const ServiceInfo& service_info, diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 8766118d..a7c4fb52 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -57,14 +57,19 @@ struct hash }; template<> -struct hash { - std::size_t operator()(const eprosima::ddsenabler::participants::UUID& uuid) const noexcept { +struct hash +{ + std::size_t operator ()( + const eprosima::ddsenabler::participants::UUID& uuid) const noexcept + { std::size_t hash = 0; - for (uint8_t byte : uuid) { + for (uint8_t byte : uuid) + { hash ^= std::hash{}(byte) + 0x9e3779b9 + (hash << 6) + (hash >> 2); } return hash; } + }; } // std @@ -421,9 +426,9 @@ class Handler : public ddspipe::participants::ISchemaHandler * @return \c true if the action request was successfully popped, \c false otherwise. */ bool get_action_request_UUID( - const uint64_t request_id, - const ACTION_TYPE action_type, - UUID& action_id); + const uint64_t request_id, + const ACTION_TYPE action_type, + UUID& action_id); /** * @brief Get the result (if it has been previouly stored) of an action associated to the given \c action_id. @@ -651,7 +656,8 @@ class Handler : public ddspipe::participants::ISchemaHandler std::unordered_map action_request_id_to_uuid_; //! Lambda to send action get result reply - std::function send_action_get_result_reply_callback_; + std::function send_action_get_result_reply_callback_; }; } /* namespace participants */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp b/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp index 38a32634..ed0be3d9 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/InternalRpcReader.hpp @@ -40,62 +40,63 @@ class InternalRpcReader : public ddspipe::participants::InternalReader { public: - DDSENABLER_PARTICIPANTS_DllAPI - InternalRpcReader( - const ddspipe::core::types::ParticipantId& participant_id, - const ddspipe::core::types::DdsTopic& topic) - : topic_(topic), - ddspipe::participants::InternalReader(participant_id) + DDSENABLER_PARTICIPANTS_DllAPI + InternalRpcReader( + const ddspipe::core::types::ParticipantId& participant_id, + const ddspipe::core::types::DdsTopic& topic) + : topic_(topic) + , ddspipe::participants::InternalReader(participant_id) + { + + guid_ = ddspipe::core::types::Guid::new_unique_guid(); + } + + ~InternalRpcReader() = default; + + DDSENABLER_PARTICIPANTS_DllAPI + ddspipe::core::types::Guid guid() const override + { + return guid_; + } + + DDSENABLER_PARTICIPANTS_DllAPI + fastdds::RecursiveTimedMutex& get_rtps_mutex() const override + { + return rtps_mutex_; + } + + DDSENABLER_PARTICIPANTS_DllAPI + uint64_t get_unread_count() const override + { + if (unread_count_ == 0) { - - guid_ = ddspipe::core::types::Guid::new_unique_guid(); - } - - ~InternalRpcReader() = default; - - DDSENABLER_PARTICIPANTS_DllAPI - ddspipe::core::types::Guid guid() const override - { - return guid_; - } - - DDSENABLER_PARTICIPANTS_DllAPI - fastdds::RecursiveTimedMutex& get_rtps_mutex() const override - { - return rtps_mutex_; + return 0; } - DDSENABLER_PARTICIPANTS_DllAPI - uint64_t get_unread_count() const override - { - if(unread_count_ == 0) - { - return 0; - } - - return unread_count_--; - } + return unread_count_--; + } - DDSENABLER_PARTICIPANTS_DllAPI - void simulate_data_reception( - std::unique_ptr&& data) noexcept - { - std::lock_guard lock(rtps_mutex_); - unread_count_++; - ddspipe::participants::InternalReader::simulate_data_reception(std::move(data)); - } + DDSENABLER_PARTICIPANTS_DllAPI + void simulate_data_reception( + std::unique_ptr&& data) noexcept + { + std::lock_guard lock(rtps_mutex_); + unread_count_++; + ddspipe::participants::InternalReader::simulate_data_reception(std::move(data)); + } - DDSENABLER_PARTICIPANTS_DllAPI - ddspipe::core::types::DdsTopic topic() const override - { - return topic_; - } + DDSENABLER_PARTICIPANTS_DllAPI + ddspipe::core::types::DdsTopic topic() const override + { + return topic_; + } private: - ddspipe::core::types::Guid guid_; - mutable fastdds::RecursiveTimedMutex rtps_mutex_; - mutable uint64_t unread_count_ = 0; - ddspipe::core::types::DdsTopic topic_; + + ddspipe::core::types::Guid guid_; + mutable fastdds::RecursiveTimedMutex rtps_mutex_; + mutable uint64_t unread_count_ = 0; + ddspipe::core::types::DdsTopic topic_; }; } /* namespace participants */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index 9eb77b69..4566eabb 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -63,7 +63,8 @@ struct RpcAction struct RpcInfo { - RpcInfo(const std::string& dds_topic_name) + RpcInfo( + const std::string& dds_topic_name) : topic_name(dds_topic_name) , rpc_protocol(RPC_PROTOCOL::PROTOCOL_UNKNOWN) , rpc_type(RPC_TYPE::RPC_NONE) @@ -90,9 +91,9 @@ struct ActionRequestInfo ACTION_TYPE action_type, uint64_t request_id, RPC_PROTOCOL rpc_protocol) - : action_name(_action_name) - , goal_accepted_stamp(std::chrono::system_clock::now()) - , rpc_protocol(rpc_protocol) + : action_name(_action_name) + , goal_accepted_stamp(std::chrono::system_clock::now()) + , rpc_protocol(rpc_protocol) { set_request(request_id, action_type); } @@ -129,7 +130,8 @@ struct ActionRequestInfo } } - bool set_result(const std::string&& str) + bool set_result( + const std::string&& str) { if (str.empty() || !result.empty()) { @@ -139,7 +141,8 @@ struct ActionRequestInfo return true; } - bool erase(ActionEraseReason erase_reason) + bool erase( + ActionEraseReason erase_reason) { switch (erase_reason) { @@ -202,41 +205,46 @@ struct ServiceDiscovered const ddspipe::core::types::DdsTopic& topic, SERVICE_TYPE service_type) { - if(service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::SERVICE_REQUEST) { - if(request_discovered) - return false; - topic_request = topic; - request_discovered = true; + if (request_discovered) + { + return false; + } + topic_request = topic; + request_discovered = true; } else { - if(reply_discovered) - return false; - topic_reply = topic; - reply_discovered = true; + if (reply_discovered) + { + return false; + } + topic_reply = topic; + reply_discovered = true; } - if(request_discovered && reply_discovered) + if (request_discovered && reply_discovered) { - if (service_name.empty()) - { - return false; - } - fully_discovered = true; - rpc_topic = std::make_optional( - service_name, - topic_request, - topic_reply); - return true; + if (service_name.empty()) + { + return false; + } + fully_discovered = true; + rpc_topic = std::make_optional( + service_name, + topic_request, + topic_reply); + return true; } return false; } - bool remove_topic(SERVICE_TYPE service_type) + bool remove_topic( + SERVICE_TYPE service_type) { - if(service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::SERVICE_REQUEST) { request_discovered = false; topic_request = ddspipe::core::types::DdsTopic(); @@ -255,8 +263,10 @@ struct ServiceDiscovered ddspipe::core::types::RpcTopic get_service() { - if(!fully_discovered || rpc_topic == std::nullopt) + if (!fully_discovered || rpc_topic == std::nullopt) + { throw std::runtime_error("Service not fully discovered"); + } return rpc_topic.value(); } @@ -264,17 +274,21 @@ struct ServiceDiscovered SERVICE_TYPE service_type, ddspipe::core::types::DdsTopic& topic) { - if(service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::SERVICE_REQUEST) { - if(!request_discovered) + if (!request_discovered) + { return false; + } topic = topic_request; return true; } if (service_type == SERVICE_TYPE::SERVICE_REPLY) { - if(!reply_discovered) + if (!reply_discovered) + { return false; + } topic = topic_reply; return true; } @@ -285,6 +299,7 @@ struct ServiceDiscovered { return rpc_protocol; } + }; struct ActionDiscovered @@ -316,8 +331,8 @@ struct ActionDiscovered auto c = cancel.lock(); if (g && r && c && - g->fully_discovered && r->fully_discovered && c->fully_discovered && - feedback_discovered && status_discovered) + g->fully_discovered && r->fully_discovered && c->fully_discovered && + feedback_discovered && status_discovered) { fully_discovered = true; return true; @@ -347,7 +362,6 @@ struct ActionDiscovered return true; } - bool add_topic( const ddspipe::core::types::DdsTopic& topic, ACTION_TYPE action_type) @@ -376,7 +390,9 @@ struct ActionDiscovered auto c = cancel.lock(); if (!fully_discovered || !g || !r || !c) + { throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); + } return RpcAction( action_name, @@ -386,6 +402,7 @@ struct ActionDiscovered feedback, status); } + }; } // namespace participants diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp index 0f1ca362..4f131cdb 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -31,55 +31,58 @@ namespace participants { using UUID = std::array; -enum RPC_PROTOCOL { - ROS2 = 0, - FASTDDS, - PROTOCOL_UNKNOWN +enum RPC_PROTOCOL +{ + ROS2 = 0, + FASTDDS, + PROTOCOL_UNKNOWN }; enum RPC_TYPE { - RPC_NONE = 0, - RPC_SERVICE, - RPC_ACTION + RPC_NONE = 0, + RPC_SERVICE, + RPC_ACTION }; enum SERVICE_TYPE { - SERVICE_NONE = 0, - SERVICE_REQUEST, - SERVICE_REPLY + SERVICE_NONE = 0, + SERVICE_REQUEST, + SERVICE_REPLY }; enum ACTION_TYPE { - ACTION_NONE = 0, - ACTION_GOAL, - ACTION_RESULT, - ACTION_CANCEL, - ACTION_FEEDBACK, - ACTION_STATUS + ACTION_NONE = 0, + ACTION_GOAL, + ACTION_RESULT, + ACTION_CANCEL, + ACTION_FEEDBACK, + ACTION_STATUS }; -enum STATUS_CODE { - STATUS_UNKNOWN = 0, - STATUS_ACCEPTED, - STATUS_EXECUTING, - STATUS_CANCELING, - STATUS_SUCCEEDED, - STATUS_CANCELED, - STATUS_ABORTED, - STATUS_REJECTED, - STATUS_TIMEOUT, - STATUS_FAILED, - STATUS_CANCEL_REQUEST_FAILED +enum STATUS_CODE +{ + STATUS_UNKNOWN = 0, + STATUS_ACCEPTED, + STATUS_EXECUTING, + STATUS_CANCELING, + STATUS_SUCCEEDED, + STATUS_CANCELED, + STATUS_ABORTED, + STATUS_REJECTED, + STATUS_TIMEOUT, + STATUS_FAILED, + STATUS_CANCEL_REQUEST_FAILED }; -enum CANCEL_CODE { - ERROR_NONE = 0, - ERROR_REJECTED, - ERROR_UNKNOWN_GOAL_ID, - ERROR_GOAL_TERMINATED +enum CANCEL_CODE +{ + ERROR_NONE = 0, + ERROR_REJECTED, + ERROR_UNKNOWN_GOAL_ID, + ERROR_GOAL_TERMINATED }; } /* namespace participants */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index bcdc40d0..796b163f 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -36,11 +36,15 @@ namespace RpcUtils { * @param [in] topic_name Topic name to extract the service/action name from * @return Extracted service name */ -RpcInfo get_rpc_info(const std::string& topic_name); +RpcInfo get_rpc_info( + const std::string& topic_name); -RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name); +RPC_PROTOCOL detect_rpc_protocol( + const std::string& topic_name); -RpcInfo remove_prefix_suffix(const std::string& topic_name, RPC_PROTOCOL rpc_protocol); +RpcInfo remove_prefix_suffix( + const std::string& topic_name, + RPC_PROTOCOL rpc_protocol); /** * @brief Generates a UUID. @@ -56,7 +60,9 @@ UUID generate_UUID(); * @param goal_json The JSON string representing the goal (without the UUID part). * @return The JSON string for sending the goal request. */ -std::string create_goal_request_msg(const std::string& goal_json, UUID& goal_id); +std::string create_goal_request_msg( + const std::string& goal_json, + UUID& goal_id); /** * @brief Creates a JSON string for sending a goal reply. @@ -138,4 +144,6 @@ std::string create_status_msg( } // namespace ddsenabler } // namespace eprosima -std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid); +std::ostream& operator <<( + std::ostream& os, + const eprosima::ddsenabler::participants::UUID& uuid); diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index 5dc9d583..9d6f1f02 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -261,9 +261,9 @@ class Writer } bool uuid_from_request_json( - const Message& msg, - const fastdds::dds::DynamicType::_ref_type& dyn_type, - UUID& uuid); + const Message& msg, + const fastdds::dds::DynamicType::_ref_type& dyn_type, + UUID& uuid); protected: diff --git a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp index ff2c281c..2efe2fac 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp @@ -88,11 +88,11 @@ class DynamicType eProsima_user_DllExport DynamicType( const DynamicType& x) { - m_type_name = x.m_type_name; + m_type_name = x.m_type_name; - m_type_identifier = x.m_type_identifier; + m_type_identifier = x.m_type_identifier; - m_type_object = x.m_type_object; + m_type_object = x.m_type_object; } @@ -116,11 +116,11 @@ class DynamicType const DynamicType& x) { - m_type_name = x.m_type_name; + m_type_name = x.m_type_name; - m_type_identifier = x.m_type_identifier; + m_type_identifier = x.m_type_identifier; - m_type_object = x.m_type_object; + m_type_object = x.m_type_object; return *this; } @@ -147,8 +147,8 @@ class DynamicType const DynamicType& x) const { return (m_type_name == x.m_type_name && - m_type_identifier == x.m_type_identifier && - m_type_object == x.m_type_object); + m_type_identifier == x.m_type_identifier && + m_type_object == x.m_type_object); } /*! @@ -199,7 +199,6 @@ class DynamicType return m_type_name; } - /*! * @brief This function copies the value in member type_identifier * @param _type_identifier New value to be copied in member type_identifier @@ -238,7 +237,6 @@ class DynamicType return m_type_identifier; } - /*! * @brief This function copies the value in member type_object * @param _type_object New value to be copied in member type_object @@ -277,8 +275,6 @@ class DynamicType return m_type_object; } - - private: std::string m_type_name; @@ -315,7 +311,7 @@ class DynamicTypesCollection eProsima_user_DllExport DynamicTypesCollection( const DynamicTypesCollection& x) { - m_dynamic_types = x.m_dynamic_types; + m_dynamic_types = x.m_dynamic_types; } @@ -337,7 +333,7 @@ class DynamicTypesCollection const DynamicTypesCollection& x) { - m_dynamic_types = x.m_dynamic_types; + m_dynamic_types = x.m_dynamic_types; return *this; } @@ -412,8 +408,6 @@ class DynamicTypesCollection return m_dynamic_types; } - - private: std::vector m_dynamic_types; diff --git a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp index 612a4984..4077fedb 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp @@ -37,176 +37,173 @@ Generated DynamicTypesCollection is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // FASTDDS_GEN_API_VER -namespace eprosima -{ - namespace ddsenabler - { - namespace participants - { +namespace eprosima { +namespace ddsenabler { +namespace participants { - /*! - * @brief This class represents the TopicDataType of the type DynamicType defined by the user in the IDL file. - * @ingroup DynamicTypesCollection - */ - class DynamicTypePubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type DynamicType defined by the user in the IDL file. + * @ingroup DynamicTypesCollection + */ +class DynamicTypePubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef DynamicType type; + typedef DynamicType type; - eProsima_user_DllExport DynamicTypePubSubType(); + eProsima_user_DllExport DynamicTypePubSubType(); - eProsima_user_DllExport ~DynamicTypePubSubType() override; + eProsima_user_DllExport ~DynamicTypePubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; +}; - /*! - * @brief This class represents the TopicDataType of the type DynamicTypesCollection defined by the user in the IDL file. - * @ingroup DynamicTypesCollection - */ - class DynamicTypesCollectionPubSubType : public eprosima::fastdds::dds::TopicDataType - { - public: +/*! + * @brief This class represents the TopicDataType of the type DynamicTypesCollection defined by the user in the IDL file. + * @ingroup DynamicTypesCollection + */ +class DynamicTypesCollectionPubSubType : public eprosima::fastdds::dds::TopicDataType +{ +public: - typedef DynamicTypesCollection type; + typedef DynamicTypesCollection type; - eProsima_user_DllExport DynamicTypesCollectionPubSubType(); + eProsima_user_DllExport DynamicTypesCollectionPubSubType(); - eProsima_user_DllExport ~DynamicTypesCollectionPubSubType() override; + eProsima_user_DllExport ~DynamicTypesCollectionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - private: +private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; - }; - } // namespace participants - } // namespace ddsenabler +}; +} // namespace participants +} // namespace ddsenabler } // namespace eprosima #endif // FAST_DDS_GENERATED__EPROSIMA_DDSENABLER_PARTICIPANTS_DYNAMICTYPESCOLLECTION_PUBSUBTYPES_HPP diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index ea19f4f7..360bbd37 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -50,15 +50,17 @@ bool EnablerParticipant::service_discovered_nts_( const RpcInfo& rpc_info, const DdsTopic& topic) { - auto [it, inserted] = services_.try_emplace(rpc_info.service_name, std::make_shared(rpc_info.service_name, rpc_info.rpc_protocol)); + auto [it, inserted] = services_.try_emplace(rpc_info.service_name, + std::make_shared(rpc_info.service_name, rpc_info.rpc_protocol)); return it->second->add_topic(topic, rpc_info.service_type); } bool EnablerParticipant::action_discovered_nts_( - const RpcInfo& rpc_info, - const DdsTopic& topic) + const RpcInfo& rpc_info, + const DdsTopic& topic) { - auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); + auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, + ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) { service_discovered_nts_(rpc_info, topic); @@ -96,9 +98,13 @@ std::shared_ptr EnablerParticipant::create_reader( if (RPC_TYPE::RPC_NONE != rpc_info.rpc_type) { if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) + { reader = std::make_shared(id(), dds_topic); + } else + { reader = std::make_shared(id()); + } // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) @@ -181,10 +187,10 @@ bool EnablerParticipant::publish( if (nullptr == i_reader) { DdsTopic topic; - if(!query_topic_nts_(topic_name, topic)) + if (!query_topic_nts_(topic_name, topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in topic " << topic_name); + "Failed to publish data in topic " << topic_name); return false; } @@ -222,9 +228,9 @@ bool EnablerParticipant::publish( } bool EnablerParticipant::publish_rpc( - const std::string& topic_name, - const std::string& json, - const uint64_t& request_id) + const std::string& topic_name, + const std::string& json, + const uint64_t& request_id) { std::unique_lock lck(mtx_); @@ -252,7 +258,7 @@ bool EnablerParticipant::publish_rpc( if (nullptr == reader) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); + "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); return false; } @@ -264,7 +270,7 @@ bool EnablerParticipant::publish_rpc( return false; } - if(type_name != topic.type_name) + if (type_name != topic.type_name) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic.m_topic_name << " : type name mismatch."); @@ -312,10 +318,10 @@ bool EnablerParticipant::create_service_request_writer_nts_( { ddspipe::core::types::Endpoint request_edp; if (create_topic_writer_nts_( - service->topic_request, - reader, - request_edp, - lck)) + service->topic_request, + reader, + request_edp, + lck)) { service->endpoint_request = request_edp; return true; @@ -326,13 +332,14 @@ bool EnablerParticipant::create_service_request_writer_nts_( } EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create server as there is already a server running for service " << service->service_name << "."); + "Failed to create server as there is already a server running for service " << service->service_name << + "."); return false; } bool EnablerParticipant::announce_service( - const std::string& service_name, - RPC_PROTOCOL rpc_protocol) + const std::string& service_name, + RPC_PROTOCOL rpc_protocol) { std::unique_lock lck(mtx_); @@ -349,7 +356,7 @@ bool EnablerParticipant::announce_service( } std::shared_ptr service = std::make_shared(service_name, rpc_protocol); - if(!query_service_nts_(service, rpc_protocol)) + if (!query_service_nts_(service, rpc_protocol)) { return false; } @@ -361,13 +368,13 @@ bool EnablerParticipant::announce_service( } EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to announce service " << service_name << " : service writer creation failed."); + "Failed to announce service " << service_name << " : service writer creation failed."); return false; } // TODO after revoking the service the client is still matched bool EnablerParticipant::revoke_service( - const std::string& service_name) + const std::string& service_name) { std::unique_lock lck(mtx_); @@ -375,7 +382,7 @@ bool EnablerParticipant::revoke_service( } bool EnablerParticipant::revoke_service_nts_( - const std::string& service_name) + const std::string& service_name) { auto it = services_.find(service_name); if (it == services_.end()) @@ -407,7 +414,7 @@ bool EnablerParticipant::revoke_service_nts_( } RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( - const std::string& service_name) + const std::string& service_name) { std::unique_lock lck(mtx_); auto it = services_.find(service_name); @@ -420,8 +427,8 @@ RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( } bool EnablerParticipant::announce_action( - const std::string& action_name, - RPC_PROTOCOL rpc_protocol) + const std::string& action_name, + RPC_PROTOCOL rpc_protocol) { std::unique_lock lck(mtx_); @@ -448,7 +455,7 @@ bool EnablerParticipant::announce_action( } ActionDiscovered action(action_name, rpc_protocol); - if(!query_action_nts_(action, rpc_protocol, lck)) + if (!query_action_nts_(action, rpc_protocol, lck)) { return false; } @@ -458,7 +465,7 @@ bool EnablerParticipant::announce_action( } bool EnablerParticipant::revoke_action( - const std::string& action_name) + const std::string& action_name) { std::unique_lock lck(mtx_); @@ -500,14 +507,14 @@ bool EnablerParticipant::revoke_action( } bool EnablerParticipant::query_topic_nts_( - const std::string& topic_name, - DdsTopic& topic) + const std::string& topic_name, + DdsTopic& topic) { if (!topic_query_callback_) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to query data from topic " << topic_name << - " : topic is unknown and topic query callback not set."); + " : topic is unknown and topic query callback not set."); return false; } participants::TopicInfo topic_info; @@ -522,9 +529,9 @@ bool EnablerParticipant::query_topic_nts_( } bool EnablerParticipant::fill_topic_struct_nts_( - const std::string& topic_name, - const TopicInfo& topic_info, - DdsTopic& topic) + const std::string& topic_name, + const TopicInfo& topic_info, + DdsTopic& topic) { // Deserialize QoS if provided by the user (otherwise use default one) @@ -560,9 +567,9 @@ bool EnablerParticipant::fill_topic_struct_nts_( } bool EnablerParticipant::fullfill_service_type_nts_( - const ServiceInfo& service_info, - std::shared_ptr service, - RPC_PROTOCOL rpc_protocol) + const ServiceInfo& service_info, + std::shared_ptr service, + RPC_PROTOCOL rpc_protocol) { std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; switch (rpc_protocol) @@ -587,18 +594,24 @@ bool EnablerParticipant::fullfill_service_type_nts_( DdsTopic topic_request; std::string topic_request_name = rq_prefix + service->service_name + rq_suffix; - if(!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) + if (!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) + { return false; + } service->add_topic(topic_request, SERVICE_TYPE::SERVICE_REQUEST); DdsTopic topic_reply; std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; - if(!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) + if (!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) + { return false; + } service->add_topic(topic_reply, SERVICE_TYPE::SERVICE_REPLY); if (!service->fully_discovered) + { return false; + } service->enabler_as_server = true; return true; @@ -608,11 +621,11 @@ bool EnablerParticipant::query_service_nts_( std::shared_ptr service, RPC_PROTOCOL rpc_protocol) { - if(!service_query_callback_) + if (!service_query_callback_) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce service " << service->service_name << - " : service is unknown and service request callback not set."); + " : service is unknown and service request callback not set."); return false; } @@ -634,15 +647,15 @@ bool EnablerParticipant::query_service_nts_( } bool EnablerParticipant::query_action_nts_( - ActionDiscovered& action, - RPC_PROTOCOL rpc_protocol, - std::unique_lock& lck) + ActionDiscovered& action, + RPC_PROTOCOL rpc_protocol, + std::unique_lock& lck) { - if(!action_query_callback_) + if (!action_query_callback_) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << - " : action is unknown and action request callback not set."); + " : action is unknown and action request callback not set."); return false; } @@ -675,11 +688,12 @@ bool EnablerParticipant::query_action_nts_( } } - std::shared_ptr goal_service = std::make_shared(goal_service_name, rpc_protocol); - if(!fullfill_service_type_nts_( - action_info.goal, - goal_service, - rpc_protocol)) + std::shared_ptr goal_service = std::make_shared(goal_service_name, + rpc_protocol); + if (!fullfill_service_type_nts_( + action_info.goal, + goal_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : goal service type not found."); @@ -694,11 +708,12 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(goal_service_name, goal_service); action.goal = goal_service; - std::shared_ptr cancel_service = std::make_shared(cancel_service_name, rpc_protocol); - if(!fullfill_service_type_nts_( - action_info.cancel, - cancel_service, - rpc_protocol)) + std::shared_ptr cancel_service = std::make_shared(cancel_service_name, + rpc_protocol); + if (!fullfill_service_type_nts_( + action_info.cancel, + cancel_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : cancel service type not found."); @@ -713,11 +728,12 @@ bool EnablerParticipant::query_action_nts_( services_.insert_or_assign(cancel_service_name, cancel_service); action.cancel = cancel_service; - std::shared_ptr result_service = std::make_shared(result_service_name, rpc_protocol); - if(!fullfill_service_type_nts_( - action_info.result, - result_service, - rpc_protocol)) + std::shared_ptr result_service = std::make_shared(result_service_name, + rpc_protocol); + if (!fullfill_service_type_nts_( + action_info.result, + result_service, + rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : result service type not found."); @@ -749,10 +765,10 @@ bool EnablerParticipant::query_action_nts_( std::string feedback_topic_name = prefix + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; DdsTopic feedback_topic; - if(!fill_topic_struct_nts_( - feedback_topic_name, - action_info.feedback, - feedback_topic)) + if (!fill_topic_struct_nts_( + feedback_topic_name, + action_info.feedback, + feedback_topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : feedback topic type not found."); @@ -764,10 +780,10 @@ bool EnablerParticipant::query_action_nts_( { ddspipe::core::types::Endpoint _; create_topic_writer_nts_( - action.feedback, - feedback_reader, - _, - lck); + action.feedback, + feedback_reader, + _, + lck); } } action.feedback = feedback_topic; @@ -775,25 +791,25 @@ bool EnablerParticipant::query_action_nts_( std::string status_topic_name = prefix + action.action_name + participants::ACTION_STATUS_SUFFIX; DdsTopic status_topic; - if(!fill_topic_struct_nts_( - status_topic_name, - action_info.status, - status_topic)) + if (!fill_topic_struct_nts_( + status_topic_name, + action_info.status, + status_topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : status topic type not found."); return false; } - { + { auto status_reader = lookup_reader_nts_(action.status.m_topic_name); if (!status_reader) { ddspipe::core::types::Endpoint _; create_topic_writer_nts_( - action.status, - status_reader, - _, - lck); + action.status, + status_reader, + _, + lck); } } action.status = status_topic; diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 56ac884e..2d17a799 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -48,16 +48,18 @@ Handler::Handler( writer_ = std::make_unique(); writer_->set_is_UUID_active_callback( - [this](const std::string& action_name, const UUID& uuid) { + [this](const std::string& action_name, const UUID& uuid) + { return this->is_UUID_active(action_name, uuid, nullptr); } - ); + ); writer_->set_erase_action_UUID_callback( - [this](const UUID& uuid, ActionEraseReason reason) { + [this](const UUID& uuid, ActionEraseReason reason) + { return this->erase_action_UUID(uuid, reason); } - ); + ); } Handler::~Handler() @@ -175,7 +177,9 @@ void Handler::add_data( } else { - auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + auto request_id = + dynamic_cast(data).write_params.get_reference(). + related_sample_identity().sequence_number().to64long(); write_service_reply_nts_(msg, dyn_type, request_id, rpc_info.service_name); } break; @@ -192,26 +196,36 @@ void Handler::add_data( { case ACTION_TYPE::ACTION_RESULT: { - auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + auto action_id = + dynamic_cast(data).write_params.get_reference() + .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_RESULT, action_id_uuid)) + { write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + } erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); break; } case ACTION_TYPE::ACTION_GOAL: { - auto action_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + auto action_id = + dynamic_cast(data).write_params.get_reference() + .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_GOAL, action_id_uuid)) + { write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + } break; } case ACTION_TYPE::ACTION_CANCEL: { - auto request_id = dynamic_cast(data).write_params.get_reference().related_sample_identity().sequence_number().to64long(); + auto request_id = + dynamic_cast(data).write_params.get_reference() + .related_sample_identity().sequence_number().to64long(); write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_info.action_name); break; } @@ -238,9 +252,9 @@ void Handler::add_data( rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); UUID uuid; if (!writer_->uuid_from_request_json( - msg, - dyn_type, - uuid)) + msg, + dyn_type, + uuid)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to extract UUID from send_goal_request JSON."); @@ -248,12 +262,13 @@ void Handler::add_data( } if (store_action_request( - rpc_info.action_name, - uuid, - requests_id_, - rpc_info.action_type)) + rpc_info.action_name, + uuid, + requests_id_, + rpc_info.action_type)) { - write_action_request_nts_(msg, dyn_type, requests_id_, rpc_info.action_name, rpc_info.action_type); + write_action_request_nts_(msg, dyn_type, requests_id_, rpc_info.action_name, + rpc_info.action_type); } break; @@ -263,9 +278,9 @@ void Handler::add_data( { UUID uuid; if (!writer_->uuid_from_request_json( - msg, - dyn_type, - uuid)) + msg, + dyn_type, + uuid)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to extract UUID from get_result_request JSON."); @@ -276,10 +291,10 @@ void Handler::add_data( RpcPayloadData& rpc_data = dynamic_cast(data); rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); if (!store_action_request( - rpc_info.action_name, - uuid, - requests_id_, - ACTION_TYPE::ACTION_RESULT)) + rpc_info.action_name, + uuid, + requests_id_, + ACTION_TYPE::ACTION_RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to store action request for get_result_request."); @@ -655,7 +670,8 @@ bool Handler::register_type_nts_( if (_type_name != type_name) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, - "Unexpected dynamic types collection format: " << type_name << " expected to be last item, found " << _type_name << + "Unexpected dynamic types collection format: " << type_name << " expected to be last item, found " << + _type_name << " instead."); return false; } @@ -723,16 +739,16 @@ bool Handler::handle_action_result( { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Action name mismatch for action, expected " << it->second.action_name - << ", got " << action_name); + << ", got " << action_name); return false; } if (it->second.result_request_id != 0) { return send_action_get_result_reply_callback_( - action_name, - action_id, - result, - it->second.result_request_id); + action_name, + action_id, + result, + it->second.result_request_id); } if (it->second.set_result(std::move(result))) { @@ -751,8 +767,8 @@ bool Handler::handle_action_result( } void Handler::erase_action_UUID( - const UUID& action_id, - ActionEraseReason erase_reason) + const UUID& action_id, + ActionEraseReason erase_reason) { std::lock_guard lock(mtx_); auto it = action_request_id_to_uuid_.find(action_id); diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 3009aab2..155cff31 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -34,24 +34,26 @@ namespace RpcUtils { * @param [in] topic_name Topic name to extract the service name from * @return Extracted service name */ -RpcInfo get_rpc_info(const std::string& topic_name) +RpcInfo get_rpc_info( + const std::string& topic_name) { RPC_PROTOCOL rpc_protocol = detect_rpc_protocol(topic_name); return remove_prefix_suffix(topic_name, rpc_protocol); } -RPC_PROTOCOL detect_rpc_protocol(const std::string& topic_name) +RPC_PROTOCOL detect_rpc_protocol( + const std::string& topic_name) { if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) + topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) { return RPC_PROTOCOL::ROS2; } else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) + topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) { return RPC_PROTOCOL::FASTDDS; } @@ -90,29 +92,32 @@ RpcInfo remove_prefix_suffix( std::string base = topic_name; if ((base.rfind(request_prefix, 0) == 0) && - (base.size() >= request_suffix.length()) && - (base.substr(base.size() - request_suffix.length()) == request_suffix)) + (base.size() >= request_suffix.length()) && + (base.substr(base.size() - request_suffix.length()) == request_suffix)) { base = base.substr(request_prefix.length()); base = base.substr(0, base.size() - (request_suffix.length())); rpc_info.service_type = SERVICE_REQUEST; rpc_info.service_name = base; - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; rpc_info.action_type = ACTION_GOAL; return rpc_info; } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; rpc_info.action_type = ACTION_RESULT; return rpc_info; } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; @@ -124,29 +129,32 @@ RpcInfo remove_prefix_suffix( return rpc_info; } if ((base.rfind(reply_prefix, 0) == 0) && - (base.size() >= reply_suffix.length()) && - (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) + (base.size() >= reply_suffix.length()) && + (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) { base = base.substr(reply_prefix.length()); base = base.substr(0, base.size() - (reply_suffix.length())); rpc_info.service_type = SERVICE_REPLY; rpc_info.service_name = base; - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; rpc_info.action_type = ACTION_GOAL; return rpc_info; } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; rpc_info.action_type = ACTION_RESULT; return rpc_info; } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; @@ -160,14 +168,18 @@ RpcInfo remove_prefix_suffix( // Check for action feedback/status topics base = base.substr(topic_prefix.length()); - if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == + (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); rpc_info.rpc_type = RPC_ACTION; rpc_info.action_type = ACTION_FEEDBACK; return rpc_info; } - if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == (std::string("/") + ACTION_STATUS_SUFFIX)) + if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == + (std::string("/") + ACTION_STATUS_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); rpc_info.rpc_type = RPC_ACTION; @@ -192,7 +204,9 @@ UUID generate_UUID() return uuid; } -std::string create_goal_request_msg(const std::string& goal_json, UUID& goal_id) +std::string create_goal_request_msg( + const std::string& goal_json, + UUID& goal_id) { goal_id = generate_UUID(); @@ -243,7 +257,8 @@ std::string create_cancel_reply_msg( goal_json["goal_id"]["uuid"] = goal_id; auto duration_since_epoch = timestamp.time_since_epoch(); auto sec = std::chrono::duration_cast(duration_since_epoch).count(); - auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % 1'000'000'000; + auto nanosec = std::chrono::duration_cast(duration_since_epoch).count() % + 1'000'000'000; goal_json["stamp"]["sec"] = static_cast(sec); goal_json["stamp"]["nanosec"] = static_cast(nanosec); j["goals_canceling"].push_back(goal_json); @@ -309,12 +324,16 @@ std::string create_feedback_msg( } // namespace ddsenabler } // namespace eprosima -std::ostream& operator<<(std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid) +std::ostream& operator <<( + std::ostream& os, + const eprosima::ddsenabler::participants::UUID& uuid) { for (size_t i = 0; i < uuid.size(); ++i) { if (i != 0) + { os << "-"; + } os << std::to_string(uuid[i]); } return os; diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 65905f1b..983531b4 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -36,7 +36,8 @@ using namespace eprosima::ddsenabler::participants::serialization; using namespace eprosima::ddspipe::core::types; -UUID json_to_uuid(const nlohmann::json& json) +UUID json_to_uuid( + const nlohmann::json& json) { UUID uuid; if (!json.contains("uuid") || !json["uuid"].is_array() || json["uuid"].size() != sizeof(UUID)) @@ -104,35 +105,40 @@ void Writer::write_schema( // Filter placeholder based on action/service type suffix std::string data_placeholder = ss_data_holder.str(); - try { + try + { using json = nlohmann::json; auto j = json::parse(data_placeholder); - if (type_name.find("SendGoal_Request_") != std::string::npos) { + if (type_name.find("SendGoal_Request_") != std::string::npos) + { // only the 'goal' sub-object data_placeholder = j.at("goal").dump(); } - else if (type_name.find("GetResult_Response_") != std::string::npos) { + else if (type_name.find("GetResult_Response_") != std::string::npos) + { // only the 'result' sub-object data_placeholder = j.at("result").dump(); } - else if (type_name.find("FeedbackMessage_") != std::string::npos) { + else if (type_name.find("FeedbackMessage_") != std::string::npos) + { // only the 'feedback' sub-object data_placeholder = j.at("feedback").dump(); } // all other types (SendGoal_Response, CancelGoal_*, GetResult_Request, // GoalStatusArray_ get an empty placeholder else if (type_name.find("SendGoal_Response_") != std::string::npos || - type_name.find("CancelGoal_Request_") != std::string::npos || - type_name.find("GetResult_Request_") != std::string::npos || - type_name.find("GoalStatusArray_") != std::string::npos) + type_name.find("CancelGoal_Request_") != std::string::npos || + type_name.find("GetResult_Request_") != std::string::npos || + type_name.find("GoalStatusArray_") != std::string::npos) { data_placeholder = "{}"; } } - catch (const std::exception& e) { + catch (const std::exception& e) + { EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, - "JSON filter failed for " << type_name << ": " << e.what()); + "JSON filter failed for " << type_name << ": " << e.what()); } // Notify type reception @@ -187,7 +193,7 @@ void Writer::write_data( } void Writer::write_service_notification( - const ddspipe::core::types::RpcTopic& service) + const ddspipe::core::types::RpcTopic& service) { EPROSIMA_LOG_INFO(DDSENABLER_WRITER, "Writting service: " << service.service_name() << "."); @@ -201,8 +207,8 @@ void Writer::write_service_notification( ServiceInfo( TopicInfo(service.request_topic().type_name, request_serialized_qos), TopicInfo(service.reply_topic().type_name, reply_serialized_qos) - ) - ); + ) + ); } } @@ -277,18 +283,18 @@ void Writer::write_action_notification( ServiceInfo( TopicInfo(action.goal.request_topic().type_name, goal_request_serialized_qos), TopicInfo(action.goal.reply_topic().type_name, goal_reply_serialized_qos) - ), + ), ServiceInfo( TopicInfo(action.cancel.request_topic().type_name, cancel_request_serialized_qos), TopicInfo(action.cancel.reply_topic().type_name, cancel_reply_serialized_qos) - ), + ), ServiceInfo( TopicInfo(action.result.request_topic().type_name, result_request_serialized_qos), TopicInfo(action.result.reply_topic().type_name, result_reply_serialized_qos) - ), + ), TopicInfo(action.feedback.type_name, feedback_serialized_qos), TopicInfo(action.status.type_name, status_serialized_qos) - )); + )); } } @@ -464,8 +470,10 @@ void Writer::write_action_cancel_reply_notification( for (const auto& goal : goals) { UUID msg_action_id = json_to_uuid(goal["goal_id"]); - if(is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, msg_action_id)) + if (is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, msg_action_id)) + { continue; + } if (action_status_notification_callback_) { @@ -506,8 +514,10 @@ void Writer::write_action_status_notification( for (const auto& status : list) { UUID uuid = json_to_uuid(status["goal_info"]["goal_id"]); - if(is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, uuid)) + if (is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, uuid)) + { continue; + } ddsenabler::participants::STATUS_CODE status_code(status["status"]); std::string status_message; @@ -526,29 +536,38 @@ void Writer::write_action_status_notification( break; case ddsenabler::participants::STATUS_CODE::STATUS_CANCELING: - status_message = "The client has requested that the goal be canceled and the action server has accepted the cancel request"; + status_message = + "The client has requested that the goal be canceled and the action server has accepted the cancel request"; break; case ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED: if (erase_action_UUID_callback_) + { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + } status_message = "The goal was achieved successfully by the action server"; break; case ddsenabler::participants::STATUS_CODE::STATUS_CANCELED: if (erase_action_UUID_callback_) + { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + } status_message = "The goal was canceled after an external request from an action client"; break; case ddsenabler::participants::STATUS_CODE::STATUS_ABORTED: if (erase_action_UUID_callback_) + { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + } status_message = "The goal was terminated by the action server without an external request"; break; case ddsenabler::participants::STATUS_CODE::STATUS_REJECTED: if (erase_action_UUID_callback_) + { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); + } status_message = "The goal was rejected by the action server, it will not be executed"; break; default: @@ -597,12 +616,14 @@ void Writer::write_action_request_notification( { bool accepted; if (action_goal_request_notification_callback_) + { accepted = action_goal_request_notification_callback_( - action_name.c_str(), - json_data.dump(4).c_str(), - json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), - msg.publish_time.to_ns() - ); + action_name.c_str(), + json_data.dump(4).c_str(), + json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), + msg.publish_time.to_ns() + ); + } send_action_send_goal_reply_callback_( action_name.c_str(), @@ -618,7 +639,7 @@ void Writer::write_action_request_notification( auto sec = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_info"]["sec"]; auto nanosec = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_info"]["nanosec"]; int64_t timestamp = static_cast(sec.get()) * 1000000000 + - static_cast(nanosec.get()); + static_cast(nanosec.get()); action_cancel_request_notification_callback_( action_name.c_str(), json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), diff --git a/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp b/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp index 840fc12b..5d7eeef5 100644 --- a/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp +++ b/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp @@ -81,7 +81,7 @@ class DDSEnablerTestType1 eProsima_user_DllExport DDSEnablerTestType1( const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -103,7 +103,7 @@ class DDSEnablerTestType1 const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -168,8 +168,6 @@ class DDSEnablerTestType1 return m_value; } - - private: int16_t m_value{0}; @@ -204,7 +202,7 @@ class DDSEnablerTestType2 eProsima_user_DllExport DDSEnablerTestType2( const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -226,7 +224,7 @@ class DDSEnablerTestType2 const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -301,8 +299,6 @@ class DDSEnablerTestType2 return m_value; } - - private: std::string m_value; @@ -337,7 +333,7 @@ class DDSEnablerTestType3 eProsima_user_DllExport DDSEnablerTestType3( const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -359,7 +355,7 @@ class DDSEnablerTestType3 const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -434,8 +430,6 @@ class DDSEnablerTestType3 return m_value; } - - private: std::array m_value{0}; @@ -470,7 +464,7 @@ class DDSEnablerTestType4 eProsima_user_DllExport DDSEnablerTestType4( const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -492,7 +486,7 @@ class DDSEnablerTestType4 const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -567,8 +561,6 @@ class DDSEnablerTestType4 return m_value; } - - private: DDSEnablerTestType1 m_value; From 52b6b41aea206b4151245b84e3491d66866e081c Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Wed, 1 Oct 2025 10:45:53 +0200 Subject: [PATCH 32/87] Dll export Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 12 ++++++++++++ .../include/ddsenabler_participants/Handler.hpp | 1 + .../include/ddsenabler_participants/RpcUtils.hpp | 15 +++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index ad2ae7ac..72ae6280 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -122,6 +122,7 @@ class DDSEnabler * * @return true if the service was successfully announced, false otherwise. */ + DDSENABLER_DllAPI bool announce_service( const std::string& service_name, participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); @@ -136,6 +137,7 @@ class DDSEnabler * @param service_name The name of the service to be stopped. * @return true if the service was successfully stopped, false otherwise. */ + DDSENABLER_DllAPI bool revoke_service( const std::string& service_name); @@ -156,6 +158,7 @@ class DDSEnabler * * @return true if the request was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool send_service_request( const std::string& service_name, const std::string& json, @@ -177,6 +180,7 @@ class DDSEnabler * * @note The request_id must coincide with the one received in the request. */ + DDSENABLER_DllAPI bool send_service_reply( const std::string& service_name, const std::string& json, @@ -198,6 +202,7 @@ class DDSEnabler * * @return true if the action was successfully announced, false otherwise. */ + DDSENABLER_DllAPI bool announce_action( const std::string& action_name, participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); @@ -213,6 +218,7 @@ class DDSEnabler * * @return true if the action was successfully stopped, false otherwise. */ + DDSENABLER_DllAPI bool revoke_action( const std::string& action_name); @@ -228,6 +234,7 @@ class DDSEnabler * * @return true if the feedback was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool send_action_feedback( const char* action_name, const char* json, @@ -246,6 +253,7 @@ class DDSEnabler * * @return true if the result was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool send_action_result( const char* action_name, const participants::UUID& goal_id, @@ -265,6 +273,7 @@ class DDSEnabler * * @return true if the cancel goal reply was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool send_action_cancel_goal_reply( const char* action_name, const std::vector& goal_ids, @@ -285,6 +294,7 @@ class DDSEnabler * @return true if the status update was successfully sent, false otherwise. * */ + DDSENABLER_DllAPI bool update_action_status( const std::string& action_name, const participants::UUID& goal_id, @@ -311,6 +321,7 @@ class DDSEnabler * * @return true if the action goal was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool send_action_goal( const std::string& action_name, const std::string& json, @@ -334,6 +345,7 @@ class DDSEnabler * * @return true if the cancel action request was successfully sent, false otherwise. */ + DDSENABLER_DllAPI bool cancel_action_goal( const std::string& action_name, const participants::UUID& goal_id, diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index a7c4fb52..fb6c7b48 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -413,6 +413,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * * @return A new request ID. */ + DDSENABLER_PARTICIPANTS_DllAPI uint64_t get_new_request_id(); protected: diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index 796b163f..ac1874a0 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -25,6 +25,8 @@ #include #include +#include + namespace eprosima { namespace ddsenabler { namespace participants { @@ -36,12 +38,15 @@ namespace RpcUtils { * @param [in] topic_name Topic name to extract the service/action name from * @return Extracted service name */ +DDSENABLER_PARTICIPANTS_DllAPI RpcInfo get_rpc_info( const std::string& topic_name); +DDSENABLER_PARTICIPANTS_DllAPI RPC_PROTOCOL detect_rpc_protocol( const std::string& topic_name); +DDSENABLER_PARTICIPANTS_DllAPI RpcInfo remove_prefix_suffix( const std::string& topic_name, RPC_PROTOCOL rpc_protocol); @@ -51,6 +56,7 @@ RpcInfo remove_prefix_suffix( * * @return A new UUID. */ +DDSENABLER_PARTICIPANTS_DllAPI UUID generate_UUID(); // ROS 2 ACTION MSGS @@ -60,6 +66,7 @@ UUID generate_UUID(); * @param goal_json The JSON string representing the goal (without the UUID part). * @return The JSON string for sending the goal request. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_goal_request_msg( const std::string& goal_json, UUID& goal_id); @@ -70,6 +77,7 @@ std::string create_goal_request_msg( * @param accepted Indicates whether the goal was accepted or not. * @return A JSON string representing the goal reply. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_goal_reply_msg( bool accepted); @@ -80,6 +88,7 @@ std::string create_goal_reply_msg( * @param timestamp The timestamp for canceling logic. * @return A JSON string representing the cancel message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_cancel_request_msg( const UUID& goal_id, const int64_t timestamp); @@ -91,6 +100,7 @@ std::string create_cancel_request_msg( * @param cancel_code The cancel code indicating the result of the cancellation. * @return A JSON string representing the cancel reply message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_cancel_reply_msg( std::vector> cancelling_goals, const CANCEL_CODE& cancel_code); @@ -101,6 +111,7 @@ std::string create_cancel_reply_msg( * @param goal_id The UUID of the goal for which the result is being requested. * @return A JSON string representing the result request message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_result_request_msg( const UUID& goal_id); @@ -111,6 +122,7 @@ std::string create_result_request_msg( * @param json The JSON string representing the result. * @return A JSON string representing the result reply message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_result_reply_msg( const STATUS_CODE& status_code, const char* json); @@ -122,6 +134,7 @@ std::string create_result_reply_msg( * @param goal_id The UUID of the goal for which the feedback is being sent. * @return A JSON string representing the feedback message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_feedback_msg( const char* json, const UUID& goal_id); @@ -134,6 +147,7 @@ std::string create_feedback_msg( * @param goal_accepted_stamp The timestamp when the goal was accepted. * @return A JSON string representing the status message. */ +DDSENABLER_PARTICIPANTS_DllAPI std::string create_status_msg( const UUID& goal_id, const STATUS_CODE& status_code, @@ -144,6 +158,7 @@ std::string create_status_msg( } // namespace ddsenabler } // namespace eprosima +DDSENABLER_PARTICIPANTS_DllAPI std::ostream& operator <<( std::ostream& os, const eprosima::ddsenabler::participants::UUID& uuid); From 9a0b105b51826c1740625ecd921b13d01861a07b Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 6 Oct 2025 12:45:30 +0200 Subject: [PATCH 33/87] Fix documentation links Signed-off-by: Eugenio Collado --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 34318da7..b94b34bc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![DDS Enabler](resources/images/github_banner_ddsenabler.png)](https://eprosima.com/middleware/tools/DDS-Enabler) +[![DDS Enabler](resources/images/github_banner_ddsenabler.png)](https://dds-enabler.readthedocs.io/en/latest/02-formalia/titlepage.html)
@@ -60,7 +60,6 @@ Find more about us at [eProsima’s webpage](https://eprosima.com/). Explore the full user and developer guide hosted on ReadTheDocs: -- [Introduction](https://dds-enabler.readthedocs.io/en/latest/rst/02-formalia/titlepage.html) -- [Project Overview](https://dds-enabler.readthedocs.io/en/latest/rst/getting_started/project_overview.html) -- [User Manual](https://dds-enabler.readthedocs.io/en/latest/rst/user_manual/context_broker_interface.html) -- [API Reference](https://dds-enabler.readthedocs.io/en/latest/rst/ddsenabler/api_reference/api_reference.html) +- [Introduction](https://dds-enabler.readthedocs.io/en/latest/02-formalia/titlepage.html) +- [Installation Guide](https://dds-enabler.readthedocs.io/en/latest/ddsenabler/installation/linux.html) +- [API Reference](https://dds-enabler.readthedocs.io/en/latest/ddsenabler/api_reference/api_reference.html) From c85e31d84c1ad31e537c948f70391d24c32317c5 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 6 Oct 2025 12:59:53 +0200 Subject: [PATCH 34/87] Unified name convention Signed-off-by: Eugenio Collado --- .github/docker/ddsenabler/Dockerfile | 12 ++++++------ ddsenabler.repos | 10 +++++----- ddsenabler/examples/action/Readme.md | 6 +++--- ddsenabler/examples/service/Readme.md | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/docker/ddsenabler/Dockerfile b/.github/docker/ddsenabler/Dockerfile index c085e8a0..582e2f35 100644 --- a/.github/docker/ddsenabler/Dockerfile +++ b/.github/docker/ddsenabler/Dockerfile @@ -55,12 +55,12 @@ RUN echo "fastcdr branch: <${fastcdr_branch}>" && \ RUN mkdir src && \ wget https://raw.githubusercontent.com/eProsima/DDS-Enabler/${ddsenabler_branch}/ddsenabler.repos && \ vcs import src < ddsenabler.repos && \ - cd src/Fast-CDR && git checkout ${fastcdr_branch} && cd ../.. && \ - cd src/Fast-DDS && git checkout ${fastdds_branch} && cd ../.. && \ - cd src/Dev-Utils && git checkout ${devutils_branch} && cd ../.. && \ - cd src/DDS-Pipe && git checkout ${ddspipe_branch} && cd ../.. && \ - cd src/DDS-Enabler && git checkout ${ddsenabler_branch} && cd ../.. && \ - cp -r src/Fast-DDS/examples/cpp/configuration src/. && \ + cd src/fastcdr && git checkout ${fastcdr_branch} && cd ../.. && \ + cd src/fastdds && git checkout ${fastdds_branch} && cd ../.. && \ + cd src/dev-utils && git checkout ${devutils_branch} && cd ../.. && \ + cd src/ddspipe && git checkout ${ddspipe_branch} && cd ../.. && \ + cd src/ddsenabler && git checkout ${ddsenabler_branch} && cd ../.. && \ + cp -r src/fastdds/examples/cpp/configuration src/. && \ colcon build --packages-skip ddsenabler ddsenabler_docs --event-handlers console_direct+ --cmake-args -DLOG_INFO=ON -DSECURITY=ON && \ colcon build --packages-select ddsenabler --event-handlers console_direct+ --cmake-args -DLOG_INFO=ON -DCOMPILE_EXAMPLES=ON diff --git a/ddsenabler.repos b/ddsenabler.repos index 89f512f4..7d14338f 100644 --- a/ddsenabler.repos +++ b/ddsenabler.repos @@ -3,23 +3,23 @@ repositories: type: git url: https://github.com/eProsima/foonathan_memory_vendor.git version: v1.3.1 - Fast-CDR: + fastcdr: type: git url: https://github.com/eProsima/Fast-CDR.git version: master - Fast-DDS: + fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git version: master - Dev-Utils: + dev-utils: type: git url: https://github.com/eProsima/dev-utils.git version: main - DDS-Pipe: + ddspipe: type: git url: https://github.com/eProsima/DDS-Pipe.git version: main - DDS-Enabler: + ddsenabler: type: git url: https://github.com/eProsima/DDS-Enabler.git version: main diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index f02d194f..a3cea045 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -10,10 +10,10 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +./install/ddsenabler/bin/ddsenabler_example_action -client --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action -server --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 -``` \ No newline at end of file +./install/ddsenabler/bin/ddsenabler_example_action -server --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +``` diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 92832dab..9383739b 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,10 +10,10 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service -server --persistence-path $PATH_TO_WS/DDS-Enabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/DDS-Enabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 -``` \ No newline at end of file +./install/ddsenabler/bin/ddsenabler_example_service -server --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +``` From 0d64c22f89c7cc5798cac6ce35458406bf277faa Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 09:24:27 +0200 Subject: [PATCH 35/87] readers_ as InternalReader Signed-off-by: Eugenio Collado --- .../include/ddsenabler_participants/EnablerParticipant.hpp | 2 +- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index e711909e..7f9143a9 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -164,7 +164,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool revoke_service_nts_( const std::string& service_name); - std::map> readers_; + std::map> readers_; std::map> services_; diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 360bbd37..3601eda6 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -90,7 +90,7 @@ std::shared_ptr EnablerParticipant::create_reader( return std::make_shared(); } - std::shared_ptr reader; + std::shared_ptr reader; { std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); From 4f38de5d0f736275c87005e65f1b92589bfac52b Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 09:43:56 +0200 Subject: [PATCH 36/87] IWYU Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/Writer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 983531b4..0f13d291 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -28,6 +28,8 @@ #include +#include + namespace eprosima { namespace ddsenabler { namespace participants { From 2556e12d88934f84226180fb80988f4b5cbd078a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 10:25:06 +0200 Subject: [PATCH 37/87] Fix flaky test Signed-off-by: Eugenio Collado --- ddsenabler/test/ddsEnablerTypedTests/DdsEnablerTypedTest.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ddsenabler/test/ddsEnablerTypedTests/DdsEnablerTypedTest.cpp b/ddsenabler/test/ddsEnablerTypedTests/DdsEnablerTypedTest.cpp index 01aa630a..040780c2 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/DdsEnablerTypedTest.cpp +++ b/ddsenabler/test/ddsEnablerTypedTests/DdsEnablerTypedTest.cpp @@ -46,6 +46,9 @@ class DDSEnablerTypedTest : public ddsenablertester::DDSEnablerTester a_type.type_sup_.reset(new Type()); \ \ ASSERT_TRUE(create_publisher(a_type)); \ +\ + /* Wait some time for discovery */ \ + std::this_thread::sleep_for(std::chrono::milliseconds(wait_after_publication_ms)); \ \ ASSERT_EQ(get_received_types(), 1); \ ASSERT_EQ(get_received_topics(), 1); \ From 8b9bf8e61769b94e9efa04a4e4d6ef7b79413989 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 10:50:16 +0200 Subject: [PATCH 38/87] Create topic writer Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 6 +++++ .../src/cpp/EnablerParticipant.cpp | 22 ++++++++++++++----- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 7f9143a9..a9e0e77a 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -126,12 +126,18 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant RPC_PROTOCOL rpc_protocol, std::unique_lock& lck); + bool create_topic_writer_nts_( + const ddspipe::core::types::DdsTopic& topic, + std::shared_ptr& reader, + std::unique_lock& lck); + bool create_topic_writer_nts_( const ddspipe::core::types::DdsTopic& topic, std::shared_ptr& reader, ddspipe::core::types::Endpoint& request_edp, std::unique_lock& lck); + bool create_service_request_writer_nts_( std::shared_ptr service, std::unique_lock& lck); diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 3601eda6..a9ad9228 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -142,6 +142,15 @@ std::shared_ptr EnablerParticipant::create_reader( return reader; } +bool EnablerParticipant::create_topic_writer_nts_( + const DdsTopic& topic, + std::shared_ptr& reader, + std::unique_lock& lck) +{ + ddspipe::core::types::Endpoint request_edp; + return create_topic_writer_nts_(topic, reader, request_edp, lck); +} + bool EnablerParticipant::create_topic_writer_nts_( const DdsTopic& topic, std::shared_ptr& reader, @@ -194,8 +203,13 @@ bool EnablerParticipant::publish( return false; } - ddspipe::core::types::Endpoint _; - create_topic_writer_nts_(topic, i_reader, _, lck); + if (!create_topic_writer_nts_(topic, i_reader, lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in topic " << topic_name << " : writer creation failed."); + return false; + } + type_name = topic.type_name; // (Optionally) wait for writer created in DDS participant to match with external readers, to avoid losing this @@ -778,11 +792,9 @@ bool EnablerParticipant::query_action_nts_( auto feedback_reader = lookup_reader_nts_(feedback_topic_name); if (!feedback_reader) { - ddspipe::core::types::Endpoint _; create_topic_writer_nts_( action.feedback, feedback_reader, - _, lck); } } @@ -804,11 +816,9 @@ bool EnablerParticipant::query_action_nts_( auto status_reader = lookup_reader_nts_(action.status.m_topic_name); if (!status_reader) { - ddspipe::core::types::Endpoint _; create_topic_writer_nts_( action.status, status_reader, - _, lck); } } From c4945e7af4b63130340fff655967f670810cf9b1 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 11:33:50 +0200 Subject: [PATCH 39/87] Apply new structures to utils Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 34 +----- ddsenabler/examples/publish/main.cpp | 5 +- ddsenabler/examples/service/main.cpp | 10 +- ddsenabler/examples/utils/CMakeLists.txt | 4 + ddsenabler/examples/utils/Utils.cpp | 144 +++++++++-------------- ddsenabler/examples/utils/Utils.hpp | 58 ++------- 6 files changed, 76 insertions(+), 179 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 2be9a094..d5810177 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -152,22 +152,7 @@ static void test_action_notification_callback( utils::save_action_to_file( action_file, action_name, - action_info.goal.request.type_name.c_str(), - action_info.goal.reply.type_name.c_str(), - action_info.cancel.request.type_name.c_str(), - action_info.cancel.reply.type_name.c_str(), - action_info.result.request.type_name.c_str(), - action_info.result.reply.type_name.c_str(), - action_info.feedback.type_name.c_str(), - action_info.status.type_name.c_str(), - action_info.goal.request.serialized_qos.c_str(), - action_info.goal.reply.serialized_qos.c_str(), - action_info.cancel.request.serialized_qos.c_str(), - action_info.cancel.reply.serialized_qos.c_str(), - action_info.result.request.serialized_qos.c_str(), - action_info.result.reply.serialized_qos.c_str(), - action_info.feedback.serialized_qos.c_str(), - action_info.status.serialized_qos.c_str()); + action_info); action_discovered_ = true; app_cv_.notify_all(); @@ -198,22 +183,7 @@ static bool test_action_query_callback( if (!utils::load_action_from_file( action_file, action_name, - action_info.goal.request.type_name, - action_info.goal.reply.type_name, - action_info.cancel.request.type_name, - action_info.cancel.reply.type_name, - action_info.result.request.type_name, - action_info.result.reply.type_name, - action_info.feedback.type_name, - action_info.status.type_name, - action_info.goal.request.serialized_qos, - action_info.goal.reply.serialized_qos, - action_info.cancel.request.serialized_qos, - action_info.cancel.reply.serialized_qos, - action_info.result.request.serialized_qos, - action_info.result.reply.serialized_qos, - action_info.feedback.serialized_qos, - action_info.status.serialized_qos)) + action_info)) { std::cerr << "Failed to load action: " << action_name << std::endl; return false; diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index aeddb24a..0a1b2bfc 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -138,7 +138,7 @@ static void test_topic_notification_callback( if (!config.persistence_path.empty() && !utils::save_topic_to_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, - topic_info.type_name.c_str(), topic_info.serialized_qos.c_str())) + topic_info)) { std::cerr << "Failed to save topic: " << topic_name << std::endl; } @@ -163,8 +163,7 @@ static bool test_topic_query_callback( // Load the topic from file if (!utils::load_topic_from_file((std::filesystem::path(config.persistence_path) / TOPICS_SUBDIR).string(), topic_name, - topic_info.type_name, - topic_info.serialized_qos)) + topic_info)) { std::cerr << "Failed to load topic: " << topic_name << std::endl; return false; diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index b5a1b882..2e786742 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -151,10 +151,7 @@ static void test_service_notification_callback( utils::save_service_to_file( service_file, service_name, - service_info.request.type_name.c_str(), - service_info.reply.type_name.c_str(), - service_info.request.serialized_qos.c_str(), - service_info.reply.serialized_qos.c_str()); + service_info); service_discovered_ = true; app_cv_.notify_all(); @@ -190,10 +187,7 @@ static bool test_service_query_callback( if (utils::load_service_from_file( service_file, service_name, - service_info.request.type_name, - service_info.reply.type_name, - service_info.request.serialized_qos, - service_info.reply.serialized_qos)) + service_info)) { app_cv_.notify_all(); return true; diff --git a/ddsenabler/examples/utils/CMakeLists.txt b/ddsenabler/examples/utils/CMakeLists.txt index a4b58db8..937e9877 100644 --- a/ddsenabler/examples/utils/CMakeLists.txt +++ b/ddsenabler/examples/utils/CMakeLists.txt @@ -15,6 +15,8 @@ cmake_minimum_required(VERSION 3.20) project(ddsenabler_example_utils LANGUAGES CXX) +find_package(ddsenabler_participants) + add_library(utils STATIC Utils.cpp ) @@ -22,3 +24,5 @@ add_library(utils STATIC target_include_directories(utils PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) + +target_link_libraries(utils PUBLIC ddsenabler_participants) diff --git a/ddsenabler/examples/utils/Utils.cpp b/ddsenabler/examples/utils/Utils.cpp index 5c65e5f6..acf3daf7 100644 --- a/ddsenabler/examples/utils/Utils.cpp +++ b/ddsenabler/examples/utils/Utils.cpp @@ -150,8 +150,7 @@ bool load_type_from_file( bool save_topic_to_file( const std::string& directory, const char* topic_name, - const char* type_name, - const char* serialized_qos) + const TopicInfo& topic_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -182,14 +181,14 @@ bool save_topic_to_file( } // Write type name - uint32_t len_type_name = static_cast(std::strlen(type_name)); + uint32_t len_type_name = static_cast(topic_info.type_name.size()); ofs.write(reinterpret_cast(&len_type_name), sizeof(len_type_name)); - ofs.write(type_name, len_type_name); + ofs.write(topic_info.type_name.data(), len_type_name); // Write serialized QoS - uint32_t len_serialized_qos = static_cast(std::strlen(serialized_qos)); + uint32_t len_serialized_qos = static_cast(topic_info.serialized_qos.size()); ofs.write(reinterpret_cast(&len_serialized_qos), sizeof(len_serialized_qos)); - ofs.write(serialized_qos, len_serialized_qos); + ofs.write(topic_info.serialized_qos.data(), len_serialized_qos); if (!ofs.good()) { @@ -204,8 +203,7 @@ bool save_topic_to_file( bool load_topic_from_file( const std::string& directory, const char* topic_name, - std::string& type_name, - std::string& serialized_qos) + TopicInfo& topic_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -271,8 +269,8 @@ bool load_topic_from_file( return false; } - type_name.assign(type_name_buffer.begin(), type_name_buffer.end()); - serialized_qos.assign(serialized_qos_buffer.begin(), serialized_qos_buffer.end()); + topic_info.type_name.assign(type_name_buffer.begin(), type_name_buffer.end()); + topic_info.serialized_qos.assign(serialized_qos_buffer.begin(), serialized_qos_buffer.end()); return true; } @@ -369,10 +367,7 @@ bool save_data_to_file( void save_service_to_file( const std::string& directory, const char* service_name, - const char* request_type_name, - const char* reply_type_name, - const char* request_serialized_qos, - const char* reply_serialized_qos) + const ServiceInfo& service_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -396,10 +391,10 @@ void save_service_to_file( nlohmann::json j; j["service_name"] = service_name; - j["request_type_name"] = request_type_name; - j["reply_type_name"] = reply_type_name; - j["request_serialized_qos"] = request_serialized_qos; - j["reply_serialized_qos"] = reply_serialized_qos; + j["request_type_name"] = service_info.request.type_name; + j["reply_type_name"] = service_info.reply.type_name; + j["request_serialized_qos"] = service_info.request.serialized_qos; + j["reply_serialized_qos"] = service_info.reply.serialized_qos; std::ofstream ofs(file_path); if (ofs.is_open()) @@ -411,10 +406,7 @@ void save_service_to_file( bool load_service_from_file( const std::string& directory, const char* service_name, - std::string& request_type_name, - std::string& reply_type_name, - std::string& request_serialized_qos, - std::string& reply_serialized_qos) + ServiceInfo& service_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -451,10 +443,10 @@ bool load_service_from_file( return false; // Service name does not match } - request_type_name = j["request_type_name"].get(); - reply_type_name = j["reply_type_name"].get(); - request_serialized_qos = j["request_serialized_qos"].get(); - reply_serialized_qos = j["reply_serialized_qos"].get(); + service_info.request.type_name = j["request_type_name"].get(); + service_info.reply.type_name = j["reply_type_name"].get(); + service_info.request.serialized_qos = j["request_serialized_qos"].get(); + service_info.reply.serialized_qos = j["reply_serialized_qos"].get(); ifs.close(); return true; @@ -463,22 +455,7 @@ bool load_service_from_file( void save_action_to_file( const std::string& directory, const char* action_name, - const char* goal_request_action_type, - const char* goal_reply_action_type, - const char* cancel_request_action_type, - const char* cancel_reply_action_type, - const char* result_request_action_type, - const char* result_reply_action_type, - const char* feedback_action_type, - const char* status_action_type, - const char* goal_request_action_serialized_qos, - const char* goal_reply_action_serialized_qos, - const char* cancel_request_action_serialized_qos, - const char* cancel_reply_action_serialized_qos, - const char* result_request_action_serialized_qos, - const char* result_reply_action_serialized_qos, - const char* feedback_action_serialized_qos, - const char* status_action_serialized_qos) + const ActionInfo& action_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -502,22 +479,22 @@ void save_action_to_file( nlohmann::json j; j["action_name"] = action_name; - j["goal_request_action_type"] = goal_request_action_type; - j["goal_reply_action_type"] = goal_reply_action_type; - j["cancel_request_action_type"] = cancel_request_action_type; - j["cancel_reply_action_type"] = cancel_reply_action_type; - j["result_request_action_type"] = result_request_action_type; - j["result_reply_action_type"] = result_reply_action_type; - j["feedback_action_type"] = feedback_action_type; - j["status_action_type"] = status_action_type; - j["goal_request_action_serialized_qos"] = goal_request_action_serialized_qos; - j["goal_reply_action_serialized_qos"] = goal_reply_action_serialized_qos; - j["cancel_request_action_serialized_qos"] = cancel_request_action_serialized_qos; - j["cancel_reply_action_serialized_qos"] = cancel_reply_action_serialized_qos; - j["result_request_action_serialized_qos"] = result_request_action_serialized_qos; - j["result_reply_action_serialized_qos"] = result_reply_action_serialized_qos; - j["feedback_action_serialized_qos"] = feedback_action_serialized_qos; - j["status_action_serialized_qos"] = status_action_serialized_qos; + j["goal_request_action_type"] = action_info.goal.request.type_name; + j["goal_reply_action_type"] = action_info.goal.reply.type_name; + j["cancel_request_action_type"] = action_info.cancel.request.type_name; + j["cancel_reply_action_type"] = action_info.cancel.reply.type_name; + j["result_request_action_type"] = action_info.result.request.type_name; + j["result_reply_action_type"] = action_info.result.reply.type_name; + j["feedback_action_type"] = action_info.feedback.type_name; + j["status_action_type"] = action_info.status.type_name; + j["goal_request_action_serialized_qos"] = action_info.goal.request.serialized_qos; + j["goal_reply_action_serialized_qos"] = action_info.goal.reply.serialized_qos; + j["cancel_request_action_serialized_qos"] = action_info.cancel.request.serialized_qos; + j["cancel_reply_action_serialized_qos"] = action_info.cancel.reply.serialized_qos; + j["result_request_action_serialized_qos"] = action_info.result.request.serialized_qos; + j["result_reply_action_serialized_qos"] = action_info.result.reply.serialized_qos; + j["feedback_action_serialized_qos"] = action_info.feedback.serialized_qos; + j["status_action_serialized_qos"] = action_info.status.serialized_qos; std::ofstream ofs(file_path); if (ofs.is_open()) @@ -530,22 +507,7 @@ void save_action_to_file( bool load_action_from_file( const std::string& directory, const char* action_name, - std::string& goal_request_action_type, - std::string& goal_reply_action_type, - std::string& cancel_request_action_type, - std::string& cancel_reply_action_type, - std::string& result_request_action_type, - std::string& result_reply_action_type, - std::string& feedback_action_type, - std::string& status_action_type, - std::string& goal_request_action_serialized_qos, - std::string& goal_reply_action_serialized_qos, - std::string& cancel_request_action_serialized_qos, - std::string& cancel_reply_action_serialized_qos, - std::string& result_request_action_serialized_qos, - std::string& result_reply_action_serialized_qos, - std::string& feedback_action_serialized_qos, - std::string& status_action_serialized_qos) + ActionInfo& action_info) { // Check if directory exists if (!std::filesystem::exists(directory)) @@ -581,22 +543,22 @@ bool load_action_from_file( { return false; // Action name does not match } - goal_request_action_type = j["goal_request_action_type"].get(); - goal_reply_action_type = j["goal_reply_action_type"].get(); - cancel_request_action_type = j["cancel_request_action_type"].get(); - cancel_reply_action_type = j["cancel_reply_action_type"].get(); - result_request_action_type = j["result_request_action_type"].get(); - result_reply_action_type = j["result_reply_action_type"].get(); - feedback_action_type = j["feedback_action_type"].get(); - status_action_type = j["status_action_type"].get(); - goal_request_action_serialized_qos = j["goal_request_action_serialized_qos"].get(); - goal_reply_action_serialized_qos = j["goal_reply_action_serialized_qos"].get(); - cancel_request_action_serialized_qos = j["cancel_request_action_serialized_qos"].get(); - cancel_reply_action_serialized_qos = j["cancel_reply_action_serialized_qos"].get(); - result_request_action_serialized_qos = j["result_request_action_serialized_qos"].get(); - result_reply_action_serialized_qos = j["result_reply_action_serialized_qos"].get(); - feedback_action_serialized_qos = j["feedback_action_serialized_qos"].get(); - status_action_serialized_qos = j["status_action_serialized_qos"].get(); + action_info.goal.request.type_name = j["goal_request_action_type"].get(); + action_info.goal.reply.type_name = j["goal_reply_action_type"].get(); + action_info.cancel.request.type_name = j["cancel_request_action_type"].get(); + action_info.cancel.reply.type_name = j["cancel_reply_action_type"].get(); + action_info.result.request.type_name = j["result_request_action_type"].get(); + action_info.result.reply.type_name = j["result_reply_action_type"].get(); + action_info.feedback.type_name = j["feedback_action_type"].get(); + action_info.status.type_name = j["status_action_type"].get(); + action_info.goal.request.serialized_qos = j["goal_request_action_serialized_qos"].get(); + action_info.goal.reply.serialized_qos = j["goal_reply_action_serialized_qos"].get(); + action_info.cancel.request.serialized_qos = j["cancel_request_action_serialized_qos"].get(); + action_info.cancel.reply.serialized_qos = j["cancel_reply_action_serialized_qos"].get(); + action_info.result.request.serialized_qos = j["result_request_action_serialized_qos"].get(); + action_info.result.reply.serialized_qos = j["result_reply_action_serialized_qos"].get(); + action_info.feedback.serialized_qos = j["feedback_action_serialized_qos"].get(); + action_info.status.serialized_qos = j["status_action_serialized_qos"].get(); ifs.close(); return true; @@ -653,4 +615,4 @@ void get_sorted_files( }); } -} // namespace utils \ No newline at end of file +} // namespace utils diff --git a/ddsenabler/examples/utils/Utils.hpp b/ddsenabler/examples/utils/Utils.hpp index 8755932d..f8a0bed4 100644 --- a/ddsenabler/examples/utils/Utils.hpp +++ b/ddsenabler/examples/utils/Utils.hpp @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include @@ -21,6 +23,10 @@ namespace utils { +using eprosima::ddsenabler::participants::TopicInfo; +using eprosima::ddsenabler::participants::ServiceInfo; +using eprosima::ddsenabler::participants::ActionInfo; + std::string safe_file_name( const std::string& name); @@ -39,14 +45,12 @@ bool load_type_from_file( bool save_topic_to_file( const std::string& directory, const char* topic_name, - const char* type_name, - const char* serialized_qos); + const TopicInfo& topic_info); bool load_topic_from_file( const std::string& directory, const char* topic_name, - std::string& type_name, - std::string& serialized_qos); + TopicInfo& topic_info); bool save_data_to_file( const std::string& directory, @@ -57,58 +61,22 @@ bool save_data_to_file( void save_service_to_file( const std::string& directory, const char* service_name, - const char* request_type_name, - const char* reply_type_name, - const char* request_serialized_qos, - const char* reply_serialized_qos); + const ServiceInfo& service_info); bool load_service_from_file( const std::string& directory, const char* service_name, - std::string& request_type_name, - std::string& reply_type_name, - std::string& request_serialized_qos, - std::string& reply_serialized_qos); + ServiceInfo& service_info); void save_action_to_file( const std::string& directory, const char* action_name, - const char* goal_request_action_type, - const char* goal_reply_action_type, - const char* cancel_request_action_type, - const char* cancel_reply_action_type, - const char* result_request_action_type, - const char* result_reply_action_type, - const char* feedback_action_type, - const char* status_action_type, - const char* goal_request_action_serialized_qos, - const char* goal_reply_action_serialized_qos, - const char* cancel_request_action_serialized_qos, - const char* cancel_reply_action_serialized_qos, - const char* result_request_action_serialized_qos, - const char* result_reply_action_serialized_qos, - const char* feedback_action_serialized_qos, - const char* status_action_serialized_qos); + const ActionInfo& action_info); bool load_action_from_file( const std::string& directory, const char* action_name, - std::string& goal_request_action_type, - std::string& goal_reply_action_type, - std::string& cancel_request_action_type, - std::string& cancel_reply_action_type, - std::string& result_request_action_type, - std::string& result_reply_action_type, - std::string& feedback_action_type, - std::string& status_action_type, - std::string& goal_request_action_serialized_qos, - std::string& goal_reply_action_serialized_qos, - std::string& cancel_request_action_serialized_qos, - std::string& cancel_reply_action_serialized_qos, - std::string& result_request_action_serialized_qos, - std::string& result_reply_action_serialized_qos, - std::string& feedback_action_serialized_qos, - std::string& status_action_serialized_qos); + ActionInfo& action_info); void init_persistence( const std::string& persistence_path, @@ -118,4 +86,4 @@ void get_sorted_files( const std::string& directory, std::vector>& files); -} // namespace utils \ No newline at end of file +} // namespace utils From 9d335f92fbf68988055a04ba768db17a58d25465 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 11:45:52 +0200 Subject: [PATCH 40/87] Callbacks doxygen suggestions Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/Callbacks.hpp | 122 +++++++++--------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index 640c119d..52a0aa67 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -28,6 +28,11 @@ namespace eprosima { namespace ddsenabler { namespace participants { + +/*********************/ +/* DDS */ +/*********************/ + /** * @brief Struct that contains information about a DDS topic. * @@ -49,57 +54,6 @@ struct TopicInfo std::string serialized_qos; }; -/** - * @brief Struct that contains information about a DDS service. - * - * This struct is used to encapsulate the request and reply topics of a DDS service. - */ -struct ServiceInfo -{ - ServiceInfo() = default; - - ServiceInfo( - const TopicInfo& _request, - const TopicInfo& _reply) - : request(_request) - , reply(_reply) - { - } - - TopicInfo request; - TopicInfo reply; -}; - -/** - * @brief Struct that contains information about a DDS action. - * - * This struct is used to encapsulate the goal, result and cancel services as well as the feedback and status topics of a DDS action. - */ -struct ActionInfo -{ - ActionInfo() = default; - - ActionInfo( - const ServiceInfo& _goal, - const ServiceInfo& _result, - const ServiceInfo& _cancel, - const TopicInfo& _feedback, - const TopicInfo& _status) - : goal(_goal) - , result(_result) - , cancel(_cancel) - , feedback(_feedback) - , status(_status) - { - } - - ServiceInfo goal; - ServiceInfo result; - ServiceInfo cancel; - TopicInfo feedback; - TopicInfo status; -}; - /** * DdsLogFunc - callback executed when consuming log messages * @@ -178,10 +132,31 @@ typedef bool (* DdsTopicQuery)( const char* topic_name, TopicInfo& topic_info); + /**********************/ /* SERVICES */ /**********************/ +/** + * @brief Struct that contains information about a DDS service. + * + * This struct is used to encapsulate the request and reply topics of a DDS service. + */ +struct ServiceInfo +{ + ServiceInfo() = default; + + ServiceInfo( + const TopicInfo& _request, + const TopicInfo& _reply) + : request(_request) + , reply(_reply) + { + } + + TopicInfo request; + TopicInfo reply; +}; /** * @brief Callback for notification of service discovery and its request and reply types. @@ -230,13 +205,13 @@ typedef void (* ServiceReplyNotification)( int64_t publish_time); /** - * @brief Callback requesting the type information of a given service's request and reply. + * @brief Callback requesting the information of a given service's request and reply. * - * This callback is used to request the type information for a service's request and reply. + * This callback is used to request the information for a service's request and reply. * - * @param [in] service_name The name of the service for which the type information is requested. + * @param [in] service_name The name of the service for which the information is requested. * @param [out] service_info Information about the service, including request and reply types and their serialized QoS. - * @return \c true if the service was found and the type information was retrieved successfully, \c false otherwise. + * @return \c true if the service was found and the information was retrieved successfully, \c false otherwise. */ typedef bool (* ServiceQuery)( const char* service_name, @@ -247,6 +222,35 @@ typedef bool (* ServiceQuery)( /* ACTIONS */ /**********************/ +/** + * @brief Struct that contains information about a DDS action. + * + * This struct is used to encapsulate the goal, result and cancel services as well as the feedback and status topics of a DDS action. + */ +struct ActionInfo +{ + ActionInfo() = default; + + ActionInfo( + const ServiceInfo& _goal, + const ServiceInfo& _result, + const ServiceInfo& _cancel, + const TopicInfo& _feedback, + const TopicInfo& _status) + : goal(_goal) + , result(_result) + , cancel(_cancel) + , feedback(_feedback) + , status(_status) + { + } + + ServiceInfo goal; + ServiceInfo result; + ServiceInfo cancel; + TopicInfo feedback; + TopicInfo status; +}; /** * @brief Callback for notification of action discovery and its associated types. @@ -351,13 +355,13 @@ typedef void (* ActionResultNotification)( int64_t publish_time); /** - * @brief Callback for requesting the action types. + * @brief Callback for requesting action's information. * - * This callback is used to request the action types for a specific action. + * This callback is used to request information about a specific action. * - * @param [in] action_name The name of the action for which the types are being requested. + * @param [in] action_name The name of the action for which the information is being requested. * @param [out] action_info Information about the action, including goal, result, cancel, feedback, and status types and their serialized QoS. - * @return \c true if the action was found and the types were retrieved successfully, \c false otherwise. + * @return \c true if the action was found and the information was retrieved successfully, \c false otherwise. */ typedef bool (* ActionQuery)( const char* action_name, From 0f54a91da6654d6f9eb7d1f5b72f1dfbf2ac3d6a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 11:51:28 +0200 Subject: [PATCH 41/87] Non default value API Signed-off-by: Eugenio Collado --- .../include/ddsenabler_participants/EnablerParticipant.hpp | 6 +++++- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index a9e0e77a..94cd9678 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -102,10 +102,14 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant RPC_PROTOCOL get_service_rpc_protocol( const std::string& service_name); + DDSENABLER_PARTICIPANTS_DllAPI + bool announce_action( + const std::string& action_name); + DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( const std::string& action_name, - RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); + RPC_PROTOCOL rpc_protocol); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_action( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index a9ad9228..4c83baad 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -440,6 +440,12 @@ RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( return RPC_PROTOCOL::PROTOCOL_UNKNOWN; } +bool EnablerParticipant::announce_action( + const std::string& action_name) +{ + return announce_action(action_name, RPC_PROTOCOL::ROS2); +} + bool EnablerParticipant::announce_action( const std::string& action_name, RPC_PROTOCOL rpc_protocol) From 5d1c33f894f2906db41543ab82202a5773c0e809 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 11:53:28 +0200 Subject: [PATCH 42/87] IWYU 2 Signed-off-by: Eugenio Collado --- .../include/ddsenabler_participants/EnablerParticipant.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 94cd9678..df9a2250 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -23,6 +23,7 @@ #include #include +#include #include #include From ce9755f30b862dba30c65dbbb544a214acb7beb6 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 12:57:26 +0200 Subject: [PATCH 43/87] Enum class Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 17 +++-- ddsenabler/src/cpp/DDSEnabler.cpp | 4 +- .../ddsenabler_participants/RpcStructs.hpp | 34 +++++----- .../ddsenabler_participants/RpcTypes.hpp | 66 +++++++++---------- .../src/cpp/EnablerParticipant.cpp | 16 ++--- ddsenabler_participants/src/cpp/Handler.cpp | 40 +++++------ ddsenabler_participants/src/cpp/RpcUtils.cpp | 52 +++++++-------- ddsenabler_participants/src/cpp/Writer.cpp | 44 ++++++------- 8 files changed, 136 insertions(+), 137 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index d5810177..ed8f0c57 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -237,8 +237,7 @@ static void test_action_feedback_notification_callback( int64_t publish_time) { std::lock_guard lock(app_mutex_); - std::cout << "Action feedback callback received for action: " << action_name - << " with UUID: " << goal_id << std::endl; + std::cout << "Action feedback callback received for action: " << action_name << std::endl; } // Static action status notification callback @@ -250,7 +249,7 @@ static void test_action_status_notification_callback( int64_t publish_time) { std::lock_guard lock(app_mutex_); - std::cout << "Action status callback received: " << statusCode << ": " << statusMessage << std::endl; + std::cout << "Action status callback received: " << statusMessage << std::endl; } // Static action cancel request notification callback @@ -357,7 +356,7 @@ bool client_routine( if (enabler->send_action_goal(action_name, file_content, request_id)) { std::cout << "Published content from file: " << path.filename() << " in service: " - << action_name << " with request ID: " << request_id << std::endl; + << action_name << std::endl; sent_requests++; } else @@ -377,10 +376,10 @@ bool client_routine( // Cancel the request after sending it if (!enabler->cancel_action_goal(action_name, request_id)) { - std::cerr << "Failed to send action cancel request for ID: " << request_id << std::endl; + std::cerr << "Failed to send action cancel request." << std::endl; return false; } - std::cout << "Sent cancel request for action: " << action_name << " with ID: " << request_id << std::endl; + std::cout << "Sent cancel request for action: " << action_name << std::endl; } // Wait publish period or until stop signal is received @@ -429,7 +428,7 @@ bool server_specific_logic( if (!enabler->send_action_result( action_name.c_str(), request_id, - eprosima::ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED, + eprosima::ddsenabler::participants::STATUS_CODE::SUCCEEDED, json.c_str())) { std::cerr << "Failed to send action result" << std::endl; @@ -465,7 +464,7 @@ bool server_routine( } uint64_t fibonacci_number = 5; // Default Fibonacci number, can be parsed from json if needed - std::cout << "Received request for action: " << action_name << " with request ID: " << request_id << std::endl; + std::cout << "Received request for action: " << action_name << std::endl; std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time // Send Feedback & Result @@ -475,7 +474,7 @@ bool server_routine( fibonacci_number, request_id)) { - std::cerr << "Failed to process action: " << action_name << " with request ID: " << request_id << std::endl; + std::cerr << "Failed to process action: " << action_name << std::endl; return false; } diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index d84f141c..d1976263 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -394,7 +394,7 @@ bool DDSEnabler::send_action_goal( action_name, action_id, goal_request_id, - ACTION_TYPE::ACTION_GOAL, + ACTION_TYPE::GOAL, rpc_protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, @@ -429,7 +429,7 @@ bool DDSEnabler::send_action_get_result_request( action_name, action_id, get_result_request_id, - ACTION_TYPE::ACTION_RESULT)) + ACTION_TYPE::RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action get result request to action " << action_name diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index 4566eabb..0fe735cf 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -67,9 +67,9 @@ struct RpcInfo const std::string& dds_topic_name) : topic_name(dds_topic_name) , rpc_protocol(RPC_PROTOCOL::PROTOCOL_UNKNOWN) - , rpc_type(RPC_TYPE::RPC_NONE) - , service_type(SERVICE_TYPE::SERVICE_NONE) - , action_type(ACTION_TYPE::ACTION_NONE) + , rpc_type(RPC_TYPE::NONE) + , service_type(SERVICE_TYPE::NONE) + , action_type(ACTION_TYPE::NONE) { } @@ -104,10 +104,10 @@ struct ActionRequestInfo { switch (action_type) { - case ACTION_TYPE::ACTION_GOAL: + case ACTION_TYPE::GOAL: goal_request_id = request_id; break; - case ACTION_TYPE::ACTION_RESULT: + case ACTION_TYPE::RESULT: result_request_id = request_id; break; default: @@ -121,9 +121,9 @@ struct ActionRequestInfo { switch (action_type) { - case ACTION_TYPE::ACTION_GOAL: + case ACTION_TYPE::GOAL: return goal_request_id; - case ACTION_TYPE::ACTION_RESULT: + case ACTION_TYPE::RESULT: return result_request_id; default: return 0; @@ -205,7 +205,7 @@ struct ServiceDiscovered const ddspipe::core::types::DdsTopic& topic, SERVICE_TYPE service_type) { - if (service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::REQUEST) { if (request_discovered) { @@ -244,7 +244,7 @@ struct ServiceDiscovered bool remove_topic( SERVICE_TYPE service_type) { - if (service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::REQUEST) { request_discovered = false; topic_request = ddspipe::core::types::DdsTopic(); @@ -274,7 +274,7 @@ struct ServiceDiscovered SERVICE_TYPE service_type, ddspipe::core::types::DdsTopic& topic) { - if (service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (service_type == SERVICE_TYPE::REQUEST) { if (!request_discovered) { @@ -283,7 +283,7 @@ struct ServiceDiscovered topic = topic_request; return true; } - if (service_type == SERVICE_TYPE::SERVICE_REPLY) + if (service_type == SERVICE_TYPE::REPLY) { if (!reply_discovered) { @@ -347,13 +347,13 @@ struct ActionDiscovered { switch (action_type) { - case ACTION_TYPE::ACTION_GOAL: + case ACTION_TYPE::GOAL: goal = service; break; - case ACTION_TYPE::ACTION_RESULT: + case ACTION_TYPE::RESULT: result = service; break; - case ACTION_TYPE::ACTION_CANCEL: + case ACTION_TYPE::CANCEL: cancel = service; break; default: @@ -368,11 +368,11 @@ struct ActionDiscovered { switch (action_type) { - case ACTION_TYPE::ACTION_FEEDBACK: + case ACTION_TYPE::FEEDBACK: feedback = topic; feedback_discovered = true; break; - case ACTION_TYPE::ACTION_STATUS: + case ACTION_TYPE::STATUS: status = topic; status_discovered = true; break; @@ -407,4 +407,4 @@ struct ActionDiscovered } // namespace participants } // namespace ddsenabler -} // namespace eprosima \ No newline at end of file +} // namespace eprosima diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp index 4f131cdb..51f6f230 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -31,58 +31,58 @@ namespace participants { using UUID = std::array; -enum RPC_PROTOCOL +enum class RPC_PROTOCOL { ROS2 = 0, FASTDDS, PROTOCOL_UNKNOWN }; -enum RPC_TYPE +enum class RPC_TYPE { - RPC_NONE = 0, - RPC_SERVICE, - RPC_ACTION + NONE = 0, + SERVICE, + ACTION }; -enum SERVICE_TYPE +enum class SERVICE_TYPE { - SERVICE_NONE = 0, - SERVICE_REQUEST, - SERVICE_REPLY + NONE = 0, + REQUEST, + REPLY }; -enum ACTION_TYPE +enum class ACTION_TYPE { - ACTION_NONE = 0, - ACTION_GOAL, - ACTION_RESULT, - ACTION_CANCEL, - ACTION_FEEDBACK, - ACTION_STATUS + NONE = 0, + GOAL, + RESULT, + CANCEL, + FEEDBACK, + STATUS }; -enum STATUS_CODE +enum class STATUS_CODE { - STATUS_UNKNOWN = 0, - STATUS_ACCEPTED, - STATUS_EXECUTING, - STATUS_CANCELING, - STATUS_SUCCEEDED, - STATUS_CANCELED, - STATUS_ABORTED, - STATUS_REJECTED, - STATUS_TIMEOUT, - STATUS_FAILED, - STATUS_CANCEL_REQUEST_FAILED + UNKNOWN = 0, + ACCEPTED, + EXECUTING, + CANCELING, + SUCCEEDED, + CANCELED, + ABORTED, + REJECTED, + TIMEOUT, + FAILED, + CANCEL_REQUEST_FAILED }; -enum CANCEL_CODE +enum class CANCEL_CODE { - ERROR_NONE = 0, - ERROR_REJECTED, - ERROR_UNKNOWN_GOAL_ID, - ERROR_GOAL_TERMINATED + NONE = 0, + REJECTED, + UNKNOWN_GOAL_ID, + GOAL_TERMINATED }; } /* namespace participants */ diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 4c83baad..c60852d5 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -61,7 +61,7 @@ bool EnablerParticipant::action_discovered_nts_( { auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); - if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) + if (SERVICE_TYPE::NONE != rpc_info.service_type) { service_discovered_nts_(rpc_info, topic); auto service_it = services_.find(rpc_info.service_name); @@ -95,9 +95,9 @@ std::shared_ptr EnablerParticipant::create_reader( std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); RpcInfo rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); - if (RPC_TYPE::RPC_NONE != rpc_info.rpc_type) + if (RPC_TYPE::NONE != rpc_info.rpc_type) { - if (SERVICE_TYPE::SERVICE_NONE != rpc_info.service_type) + if (SERVICE_TYPE::NONE != rpc_info.service_type) { reader = std::make_shared(id(), dds_topic); } @@ -109,7 +109,7 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - if (ACTION_TYPE::ACTION_NONE == rpc_info.action_type) + if (ACTION_TYPE::NONE == rpc_info.action_type) { if (service_discovered_nts_(rpc_info, dds_topic)) { @@ -250,7 +250,7 @@ bool EnablerParticipant::publish_rpc( std::string service_name; RpcInfo rpc_info = RpcUtils::get_rpc_info(topic_name); - if (SERVICE_TYPE::SERVICE_NONE == rpc_info.service_type) + if (SERVICE_TYPE::NONE == rpc_info.service_type) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic_name << " : not a service topic."); @@ -416,7 +416,7 @@ bool EnablerParticipant::revoke_service_nts_( this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); it->second->endpoint_request.reset(); - it->second->remove_topic(SERVICE_TYPE::SERVICE_REQUEST); + it->second->remove_topic(SERVICE_TYPE::REQUEST); auto reader = lookup_reader_nts_(request_name); if (nullptr != reader) @@ -618,7 +618,7 @@ bool EnablerParticipant::fullfill_service_type_nts_( { return false; } - service->add_topic(topic_request, SERVICE_TYPE::SERVICE_REQUEST); + service->add_topic(topic_request, SERVICE_TYPE::REQUEST); DdsTopic topic_reply; std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; @@ -626,7 +626,7 @@ bool EnablerParticipant::fullfill_service_type_nts_( { return false; } - service->add_topic(topic_reply, SERVICE_TYPE::SERVICE_REPLY); + service->add_topic(topic_reply, SERVICE_TYPE::REPLY); if (!service->fully_discovered) { diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 2d17a799..7bb0af29 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -159,16 +159,16 @@ void Handler::add_data( RpcInfo rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); switch (rpc_info.rpc_type) { - case RPC_TYPE::RPC_NONE: + case RPC_TYPE::NONE: { write_sample_nts_(msg, dyn_type); break; } // SERVICE - case RPC_TYPE::RPC_SERVICE: + case RPC_TYPE::SERVICE: { - if (rpc_info.service_type == SERVICE_TYPE::SERVICE_REQUEST) + if (rpc_info.service_type == SERVICE_TYPE::REQUEST) { requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); @@ -186,21 +186,21 @@ void Handler::add_data( } // ACTIONS CLIENT - case RPC_TYPE::RPC_ACTION: + case RPC_TYPE::ACTION: { switch (rpc_info.service_type) { - case SERVICE_TYPE::SERVICE_REPLY: + case SERVICE_TYPE::REPLY: { switch (rpc_info.action_type) { - case ACTION_TYPE::ACTION_RESULT: + case ACTION_TYPE::RESULT: { auto action_id = dynamic_cast(data).write_params.get_reference() .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; - if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_RESULT, action_id_uuid)) + if (get_action_request_UUID(action_id, ACTION_TYPE::RESULT, action_id_uuid)) { write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); } @@ -208,20 +208,20 @@ void Handler::add_data( break; } - case ACTION_TYPE::ACTION_GOAL: + case ACTION_TYPE::GOAL: { auto action_id = dynamic_cast(data).write_params.get_reference() .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; - if (get_action_request_UUID(action_id, ACTION_TYPE::ACTION_GOAL, action_id_uuid)) + if (get_action_request_UUID(action_id, ACTION_TYPE::GOAL, action_id_uuid)) { write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); } break; } - case ACTION_TYPE::ACTION_CANCEL: + case ACTION_TYPE::CANCEL: { auto request_id = dynamic_cast(data).write_params.get_reference() @@ -240,12 +240,12 @@ void Handler::add_data( break; } - case SERVICE_TYPE::SERVICE_REQUEST: + case SERVICE_TYPE::REQUEST: { switch (rpc_info.action_type) { - case ACTION_TYPE::ACTION_GOAL: - case ACTION_TYPE::ACTION_CANCEL: + case ACTION_TYPE::GOAL: + case ACTION_TYPE::CANCEL: { requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); @@ -274,7 +274,7 @@ void Handler::add_data( break; } - case ACTION_TYPE::ACTION_RESULT: + case ACTION_TYPE::RESULT: { UUID uuid; if (!writer_->uuid_from_request_json( @@ -294,7 +294,7 @@ void Handler::add_data( rpc_info.action_name, uuid, requests_id_, - ACTION_TYPE::ACTION_RESULT)) + ACTION_TYPE::RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to store action request for get_result_request."); @@ -324,17 +324,17 @@ void Handler::add_data( break; } - case SERVICE_TYPE::SERVICE_NONE: + case SERVICE_TYPE::NONE: { switch (rpc_info.action_type) { - case ACTION_TYPE::ACTION_FEEDBACK: + case ACTION_TYPE::FEEDBACK: { write_action_feedback_nts_(msg, dyn_type, rpc_info.action_name); break; } - case ACTION_TYPE::ACTION_STATUS: + case ACTION_TYPE::STATUS: { write_action_status_nts_(msg, dyn_type, rpc_info.action_name); break; @@ -702,7 +702,7 @@ bool Handler::store_action_request( << it->second.action_name << ", got " << action_name); return false; } - if (ACTION_TYPE::ACTION_GOAL == action_type) + if (ACTION_TYPE::GOAL == action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action goal request as action id already exists."); @@ -714,7 +714,7 @@ bool Handler::store_action_request( else { // If it does not exist, create a new entry only if the action type is goal request - if (ACTION_TYPE::ACTION_GOAL != action_type) + if (ACTION_TYPE::GOAL != action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action request, action does not exist and request type is not GOAL."); diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 155cff31..e532db4a 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -97,35 +97,35 @@ RpcInfo remove_prefix_suffix( { base = base.substr(request_prefix.length()); base = base.substr(0, base.size() - (request_suffix.length())); - rpc_info.service_type = SERVICE_REQUEST; + rpc_info.service_type = SERVICE_TYPE::REQUEST; rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_GOAL; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::GOAL; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_RESULT; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::RESULT; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_CANCEL; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::CANCEL; return rpc_info; } - rpc_info.rpc_type = RPC_SERVICE; + rpc_info.rpc_type = RPC_TYPE::SERVICE; return rpc_info; } if ((base.rfind(reply_prefix, 0) == 0) && @@ -134,35 +134,35 @@ RpcInfo remove_prefix_suffix( { base = base.substr(reply_prefix.length()); base = base.substr(0, base.size() - (reply_suffix.length())); - rpc_info.service_type = SERVICE_REPLY; + rpc_info.service_type = SERVICE_TYPE::REPLY; rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_GOAL; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::GOAL; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_RESULT; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::RESULT; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_CANCEL; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::CANCEL; return rpc_info; } - rpc_info.rpc_type = RPC_SERVICE; + rpc_info.rpc_type = RPC_TYPE::SERVICE; return rpc_info; } @@ -173,8 +173,8 @@ RpcInfo remove_prefix_suffix( (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_FEEDBACK; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::FEEDBACK; return rpc_info; } if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && @@ -182,8 +182,8 @@ RpcInfo remove_prefix_suffix( (std::string("/") + ACTION_STATUS_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); - rpc_info.rpc_type = RPC_ACTION; - rpc_info.action_type = ACTION_STATUS; + rpc_info.rpc_type = RPC_TYPE::ACTION; + rpc_info.action_type = ACTION_TYPE::STATUS; return rpc_info; } @@ -319,14 +319,9 @@ std::string create_feedback_msg( return j.dump(4); } -} // namespace RpcUtils -} // namespace participants -} // namespace ddsenabler -} // namespace eprosima - std::ostream& operator <<( std::ostream& os, - const eprosima::ddsenabler::participants::UUID& uuid) + const UUID& uuid) { for (size_t i = 0; i < uuid.size(); ++i) { @@ -338,3 +333,8 @@ std::ostream& operator <<( } return os; } + +} // namespace RpcUtils +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 0f13d291..1085b02c 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -361,7 +361,7 @@ void Writer::write_action_goal_reply_notification( } std::string status_message = "Action goal accepted"; - ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED; + ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::ACCEPTED; std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; try @@ -369,7 +369,7 @@ void Writer::write_action_goal_reply_notification( if (!json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["accepted"]) { status_message = "Action goal rejected"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_REJECTED; + status_code = ddsenabler::participants::STATUS_CODE::REJECTED; } } catch (const nlohmann::json::exception& e) @@ -377,7 +377,7 @@ void Writer::write_action_goal_reply_notification( EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Error parsing action goal reply notification: " << e.what()); status_message = "Action goal reply notification malformed"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; } if (action_status_notification_callback_) { @@ -390,14 +390,14 @@ void Writer::write_action_goal_reply_notification( ); } - if (ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED == status_code && + if (ddsenabler::participants::STATUS_CODE::ACCEPTED == status_code && send_action_get_result_request_callback_ && !send_action_get_result_request_callback_( action_name.c_str(), action_id)) { status_message = "Action goal aborted"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_ABORTED; + status_code = ddsenabler::participants::STATUS_CODE::ABORTED; if (action_status_notification_callback_) { @@ -418,7 +418,7 @@ void Writer::write_action_cancel_reply_notification( const uint64_t request_id, const std::string& action_name) { - ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCELED; + ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::CANCELED; nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -439,30 +439,30 @@ void Writer::write_action_cancel_reply_notification( { EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Error parsing action cancel reply notification: " << e.what()); - status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; return; } switch (return_code) { case 0: status_message = "Action canceled successfully"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCELED; + status_code = ddsenabler::participants::STATUS_CODE::CANCELED; break; case 1: status_message = "Action cancel request rejected"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_REJECTED; + status_code = ddsenabler::participants::STATUS_CODE::REJECTED; break; case 2: status_message = "Action cancel request unknown goal ID"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCEL_REQUEST_FAILED; + status_code = ddsenabler::participants::STATUS_CODE::CANCEL_REQUEST_FAILED; break; case 3: status_message = "Action cancel request rejected as goal was already terminated"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_CANCEL_REQUEST_FAILED; + status_code = ddsenabler::participants::STATUS_CODE::CANCEL_REQUEST_FAILED; break; default: status_message = "Action cancel request unknown code"; - status_code = ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN; + status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; break; } @@ -525,24 +525,24 @@ void Writer::write_action_status_notification( std::string status_message; switch (status_code) { - case ddsenabler::participants::STATUS_CODE::STATUS_UNKNOWN: + case ddsenabler::participants::STATUS_CODE::UNKNOWN: status_message = "The status has not been properly set"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_ACCEPTED: + case ddsenabler::participants::STATUS_CODE::ACCEPTED: status_message = "The goal has been accepted and is awaiting execution"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_EXECUTING: + case ddsenabler::participants::STATUS_CODE::EXECUTING: status_message = "The goal is currently being executed by the action server"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_CANCELING: + case ddsenabler::participants::STATUS_CODE::CANCELING: status_message = "The client has requested that the goal be canceled and the action server has accepted the cancel request"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_SUCCEEDED: + case ddsenabler::participants::STATUS_CODE::SUCCEEDED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -550,7 +550,7 @@ void Writer::write_action_status_notification( status_message = "The goal was achieved successfully by the action server"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_CANCELED: + case ddsenabler::participants::STATUS_CODE::CANCELED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -558,14 +558,14 @@ void Writer::write_action_status_notification( status_message = "The goal was canceled after an external request from an action client"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_ABORTED: + case ddsenabler::participants::STATUS_CODE::ABORTED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); } status_message = "The goal was terminated by the action server without an external request"; break; - case ddsenabler::participants::STATUS_CODE::STATUS_REJECTED: + case ddsenabler::participants::STATUS_CODE::REJECTED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -614,7 +614,7 @@ void Writer::write_action_request_notification( instanceHandle << msg.instanceHandle; try { - if (ACTION_TYPE::ACTION_GOAL == action_type) + if (ACTION_TYPE::GOAL == action_type) { bool accepted; if (action_goal_request_notification_callback_) @@ -634,7 +634,7 @@ void Writer::write_action_request_notification( return; } - if (ACTION_TYPE::ACTION_CANCEL == action_type) + if (ACTION_TYPE::CANCEL == action_type) { if (action_cancel_request_notification_callback_) { From 430bfa4f9b511c99f7792aa7d2c06001470f6b99 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 13:35:23 +0200 Subject: [PATCH 44/87] Enum Camel Case Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 4 +- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 22 +++--- ddsenabler/src/cpp/DDSEnabler.cpp | 52 ++++++------- .../ddsenabler_participants/Callbacks.hpp | 2 +- .../EnablerParticipant.hpp | 12 +-- .../ddsenabler_participants/Handler.hpp | 14 ++-- .../ddsenabler_participants/RpcStructs.hpp | 74 +++++++++---------- .../ddsenabler_participants/RpcTypes.hpp | 12 +-- .../ddsenabler_participants/RpcUtils.hpp | 10 +-- .../ddsenabler_participants/Writer.hpp | 2 +- .../src/cpp/EnablerParticipant.cpp | 68 ++++++++--------- ddsenabler_participants/src/cpp/Handler.cpp | 54 +++++++------- ddsenabler_participants/src/cpp/RpcUtils.cpp | 64 ++++++++-------- ddsenabler_participants/src/cpp/Writer.cpp | 48 ++++++------ 14 files changed, 219 insertions(+), 219 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index ed8f0c57..a5a5ecf3 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -244,7 +244,7 @@ static void test_action_feedback_notification_callback( static void test_action_status_notification_callback( const char* action_name, const eprosima::ddsenabler::participants::UUID& goal_id, - eprosima::ddsenabler::participants::STATUS_CODE statusCode, + eprosima::ddsenabler::participants::StatusCode statusCode, const char* statusMessage, int64_t publish_time) { @@ -428,7 +428,7 @@ bool server_specific_logic( if (!enabler->send_action_result( action_name.c_str(), request_id, - eprosima::ddsenabler::participants::STATUS_CODE::SUCCEEDED, + eprosima::ddsenabler::participants::StatusCode::SUCCEEDED, json.c_str())) { std::cerr << "Failed to send action result" << std::endl; diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 72ae6280..75af41e1 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -118,14 +118,14 @@ class DDSEnabler * for the corresponding request and reply topics. * * @param service_name The name of the service to be announced. - * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (default is ROS2). * * @return true if the service was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_service( const std::string& service_name, - participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); + participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); /** * @brief Stops the server for the given service. @@ -154,7 +154,7 @@ class DDSEnabler * @param service_name The target service name. * @param json The JSON-formatted request data. * @param request_id Reference to store the unique request identifier. - * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (default is ROS2). * * @return true if the request was successfully sent, false otherwise. */ @@ -163,7 +163,7 @@ class DDSEnabler const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); + participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); /** * @brief Sends a reply to the given service. @@ -198,14 +198,14 @@ class DDSEnabler * Failure may occur if there is an issue requesting the data types to user's app. * * @param action_name The name of the action to be announced. - * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (default is ROS2). * * @return true if the action was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_action( const std::string& action_name, - participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); + participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); /** * @brief Stops the server for the given action. @@ -257,7 +257,7 @@ class DDSEnabler bool send_action_result( const char* action_name, const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code, + const participants::StatusCode& status_code, const char* json); /** @@ -277,7 +277,7 @@ class DDSEnabler bool send_action_cancel_goal_reply( const char* action_name, const std::vector& goal_ids, - const participants::CANCEL_CODE& cancel_code, + const participants::CancelCode& cancel_code, const uint64_t request_id); /** @@ -298,7 +298,7 @@ class DDSEnabler bool update_action_status( const std::string& action_name, const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code); + const participants::StatusCode& status_code); /*****************************************/ /* ACTION CLIENT */ @@ -317,7 +317,7 @@ class DDSEnabler * @param action_name The name of the action to send the goal to. * @param json The JSON data to be sent with the action goal. * @param goal_id Reference to store the unique identifier of the action goal. - * @param rpc_protocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (default is ROS2). * * @return true if the action goal was successfully sent, false otherwise. */ @@ -326,7 +326,7 @@ class DDSEnabler const std::string& action_name, const std::string& json, participants::UUID& goal_id, - participants::RPC_PROTOCOL rpc_protocol = participants::RPC_PROTOCOL::ROS2); + participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); /** * @brief Cancels an action goal for the specified action. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index d1976263..21f5457e 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -296,16 +296,16 @@ bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RPC_PROTOCOL rpc_protocol) + participants::RpcProtocol RpcProtocol) { std::string prefix, suffix; - switch (rpc_protocol) + switch (RpcProtocol) { - case participants::RPC_PROTOCOL::ROS2: + case participants::RpcProtocol::ROS2: prefix = participants::ROS_REQUEST_PREFIX; suffix = participants::ROS_REQUEST_SUFFIX; break; - case participants::RPC_PROTOCOL::FASTDDS: + case participants::RpcProtocol::FASTDDS: prefix = participants::FASTDDS_REQUEST_PREFIX; suffix = participants::FASTDDS_REQUEST_SUFFIX; break; @@ -329,9 +329,9 @@ bool DDSEnabler::send_service_request( bool DDSEnabler::announce_service( const std::string& service_name, - participants::RPC_PROTOCOL rpc_protocol) + participants::RpcProtocol RpcProtocol) { - return enabler_participant_->announce_service(service_name, rpc_protocol); + return enabler_participant_->announce_service(service_name, RpcProtocol); } bool DDSEnabler::revoke_service( @@ -345,15 +345,15 @@ bool DDSEnabler::send_service_reply( const std::string& json, const uint64_t request_id) { - RPC_PROTOCOL rpc_protocol = enabler_participant_->get_service_rpc_protocol(service_name); + RpcProtocol RpcProtocol = enabler_participant_->get_service_rpc_protocol(service_name); std::string prefix, suffix; - switch (rpc_protocol) + switch (RpcProtocol) { - case participants::RPC_PROTOCOL::ROS2: + case participants::RpcProtocol::ROS2: prefix = participants::ROS_REPLY_PREFIX; suffix = participants::ROS_REPLY_SUFFIX; break; - case participants::RPC_PROTOCOL::FASTDDS: + case participants::RpcProtocol::FASTDDS: prefix = participants::FASTDDS_REPLY_PREFIX; suffix = participants::FASTDDS_REPLY_SUFFIX; break; @@ -373,7 +373,7 @@ bool DDSEnabler::send_action_goal( const std::string& action_name, const std::string& json, UUID& action_id, - participants::RPC_PROTOCOL rpc_protocol) + participants::RpcProtocol RpcProtocol) { std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; @@ -383,7 +383,7 @@ bool DDSEnabler::send_action_goal( goal_request_topic, goal_json, goal_request_id, - rpc_protocol)) + RpcProtocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal request to action " << action_name); @@ -394,8 +394,8 @@ bool DDSEnabler::send_action_goal( action_name, action_id, goal_request_id, - ACTION_TYPE::GOAL, - rpc_protocol)) + ActionType::GOAL, + RpcProtocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action goal request to action " << action_name); @@ -429,7 +429,7 @@ bool DDSEnabler::send_action_get_result_request( action_name, action_id, get_result_request_id, - ACTION_TYPE::RESULT)) + ActionType::RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action get result request to action " << action_name @@ -475,9 +475,9 @@ bool DDSEnabler::cancel_action_goal( bool DDSEnabler::announce_action( const std::string& action_name, - participants::RPC_PROTOCOL rpc_protocol) + participants::RpcProtocol RpcProtocol) { - return enabler_participant_->announce_action(action_name, rpc_protocol); + return enabler_participant_->announce_action(action_name, RpcProtocol); } bool DDSEnabler::revoke_action( @@ -508,7 +508,7 @@ void DDSEnabler::send_action_send_goal_reply( bool DDSEnabler::send_action_cancel_goal_reply( const char* action_name, const std::vector& goal_ids, - const participants::CANCEL_CODE& cancel_code, + const participants::CancelCode& cancel_code, const uint64_t request_id) { std::vector> cancelling_goals; @@ -540,7 +540,7 @@ bool DDSEnabler::send_action_cancel_goal_reply( bool DDSEnabler::send_action_result( const char* action_name, const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code, + const participants::StatusCode& status_code, const char* json) { if (!handler_->is_UUID_active(action_name, goal_id)) @@ -589,15 +589,15 @@ bool DDSEnabler::send_action_feedback( return false; } - RPC_PROTOCOL protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); std::string prefix; switch (protocol) { - case RPC_PROTOCOL::ROS2: + case RpcProtocol::ROS2: prefix = participants::ROS_TOPIC_PREFIX; break; - case RPC_PROTOCOL::FASTDDS: + case RpcProtocol::FASTDDS: prefix = participants::FASTDDS_TOPIC_PREFIX; break; default: @@ -616,7 +616,7 @@ bool DDSEnabler::send_action_feedback( bool DDSEnabler::update_action_status( const std::string& action_name, const participants::UUID& goal_id, - const participants::STATUS_CODE& status_code) + const participants::StatusCode& status_code) { std::chrono::system_clock::time_point goal_accepted_stamp; if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) @@ -627,15 +627,15 @@ bool DDSEnabler::update_action_status( return false; } - RPC_PROTOCOL protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); std::string prefix; switch (protocol) { - case RPC_PROTOCOL::ROS2: + case RpcProtocol::ROS2: prefix = participants::ROS_TOPIC_PREFIX; break; - case RPC_PROTOCOL::FASTDDS: + case RpcProtocol::FASTDDS: prefix = participants::FASTDDS_TOPIC_PREFIX; break; default: diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index 52a0aa67..a6c2f749 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -334,7 +334,7 @@ typedef void (* ActionFeedbackNotification)( typedef void (* ActionStatusNotification)( const char* action_name, const UUID& goal_id, - STATUS_CODE status_code, + StatusCode status_code, const char* status_message, int64_t publish_time); diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index df9a2250..fa85f477 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -93,14 +93,14 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_service( const std::string& service_name, - RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); + RpcProtocol RpcProtocol = RpcProtocol::ROS2); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_service( const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI - RPC_PROTOCOL get_service_rpc_protocol( + RpcProtocol get_service_rpc_protocol( const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI @@ -110,7 +110,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( const std::string& action_name, - RPC_PROTOCOL rpc_protocol); + RpcProtocol RpcProtocol); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_action( @@ -124,11 +124,11 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool query_service_nts_( std::shared_ptr service, - RPC_PROTOCOL rpc_protocol); + RpcProtocol RpcProtocol); bool query_action_nts_( ActionDiscovered& action, - RPC_PROTOCOL rpc_protocol, + RpcProtocol RpcProtocol, std::unique_lock& lck); bool create_topic_writer_nts_( @@ -155,7 +155,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool fullfill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, - RPC_PROTOCOL rpc_protocol); + RpcProtocol RpcProtocol); std::shared_ptr lookup_reader_nts_( const std::string& topic_name, diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index fb6c7b48..91635cd6 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -196,7 +196,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * @param [in] action_id UUID of the action. * @param [in] request_id Request ID of the action request. * @param [in] action_type Type of the action (GOAL, RESULT, CANCEL). - * @param [in] rpc_protocol Protocol of the action, only used to create the ActionRequestInfo if action_type is GOAL. + * @param [in] RpcProtocol Protocol of the action, only used to create the ActionRequestInfo if action_type is GOAL. * @return \c true if the action request was successfully stored, \c false otherwise. */ DDSENABLER_PARTICIPANTS_DllAPI @@ -204,8 +204,8 @@ class Handler : public ddspipe::participants::ISchemaHandler const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const ACTION_TYPE action_type, - const RPC_PROTOCOL rpc_protocol = RPC_PROTOCOL::ROS2); + const ActionType action_type, + const RpcProtocol RpcProtocol = RpcProtocol::ROS2); /** * @brief Send the reply containing the result of an action or store it for a later reply. @@ -258,10 +258,10 @@ class Handler : public ddspipe::participants::ISchemaHandler * * @param [in] action_name Name of the action. * @param [in] action_id UUID of the action to be checked. - * @return The RPC protocol of the action, or RPC_PROTOCOL::PROTOCOL_UNKNOWN if the action is not found. + * @return The RPC protocol of the action, or RpcProtocol::PROTOCOL_UNKNOWN if the action is not found. */ DDSENABLER_PARTICIPANTS_DllAPI - RPC_PROTOCOL get_action_rpc_protocol( + RpcProtocol get_action_rpc_protocol( const std::string& action_name, const UUID& action_id); @@ -428,7 +428,7 @@ class Handler : public ddspipe::participants::ISchemaHandler */ bool get_action_request_UUID( const uint64_t request_id, - const ACTION_TYPE action_type, + const ActionType action_type, UUID& action_id); /** @@ -609,7 +609,7 @@ class Handler : public ddspipe::participants::ISchemaHandler const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const ACTION_TYPE action_type); + const ActionType action_type); /** * @brief Register a type using the given serialized type data. diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index 0fe735cf..e6a0ff56 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -66,20 +66,20 @@ struct RpcInfo RpcInfo( const std::string& dds_topic_name) : topic_name(dds_topic_name) - , rpc_protocol(RPC_PROTOCOL::PROTOCOL_UNKNOWN) - , rpc_type(RPC_TYPE::NONE) - , service_type(SERVICE_TYPE::NONE) - , action_type(ACTION_TYPE::NONE) + , rpc_protocol(RpcProtocol::PROTOCOL_UNKNOWN) + , rpc_type(RpcType::NONE) + , service_type(ServiceType::NONE) + , action_type(ActionType::NONE) { } std::string topic_name; std::string service_name; std::string action_name; - RPC_PROTOCOL rpc_protocol; - RPC_TYPE rpc_type; - SERVICE_TYPE service_type; - ACTION_TYPE action_type; + RpcProtocol rpc_protocol; + RpcType rpc_type; + ServiceType service_type; + ActionType action_type; }; struct ActionRequestInfo @@ -88,9 +88,9 @@ struct ActionRequestInfo ActionRequestInfo( const std::string& _action_name, - ACTION_TYPE action_type, + ActionType action_type, uint64_t request_id, - RPC_PROTOCOL rpc_protocol) + RpcProtocol rpc_protocol) : action_name(_action_name) , goal_accepted_stamp(std::chrono::system_clock::now()) , rpc_protocol(rpc_protocol) @@ -100,14 +100,14 @@ struct ActionRequestInfo void set_request( uint64_t request_id, - ACTION_TYPE action_type) + ActionType action_type) { switch (action_type) { - case ACTION_TYPE::GOAL: + case ActionType::GOAL: goal_request_id = request_id; break; - case ACTION_TYPE::RESULT: + case ActionType::RESULT: result_request_id = request_id; break; default: @@ -117,13 +117,13 @@ struct ActionRequestInfo } uint64_t get_request( - ACTION_TYPE action_type) const + ActionType action_type) const { switch (action_type) { - case ACTION_TYPE::GOAL: + case ActionType::GOAL: return goal_request_id; - case ACTION_TYPE::RESULT: + case ActionType::RESULT: return result_request_id; default: return 0; @@ -160,13 +160,13 @@ struct ActionRequestInfo return final_status_received && result_received; } - RPC_PROTOCOL get_rpc_protocol() const + RpcProtocol get_rpc_protocol() const { return rpc_protocol; } std::string action_name; - RPC_PROTOCOL rpc_protocol; + RpcProtocol rpc_protocol; uint64_t goal_request_id = 0; uint64_t result_request_id = 0; std::chrono::system_clock::time_point goal_accepted_stamp; @@ -180,14 +180,14 @@ struct ServiceDiscovered ServiceDiscovered( const std::string& service_name, - RPC_PROTOCOL rpc_protocol) + RpcProtocol rpc_protocol) : service_name(service_name) , rpc_protocol(rpc_protocol) { } std::string service_name; - RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::PROTOCOL_UNKNOWN}; + RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; ddspipe::core::types::DdsTopic topic_request; bool request_discovered{false}; @@ -203,9 +203,9 @@ struct ServiceDiscovered bool add_topic( const ddspipe::core::types::DdsTopic& topic, - SERVICE_TYPE service_type) + ServiceType service_type) { - if (service_type == SERVICE_TYPE::REQUEST) + if (service_type == ServiceType::REQUEST) { if (request_discovered) { @@ -242,9 +242,9 @@ struct ServiceDiscovered } bool remove_topic( - SERVICE_TYPE service_type) + ServiceType service_type) { - if (service_type == SERVICE_TYPE::REQUEST) + if (service_type == ServiceType::REQUEST) { request_discovered = false; topic_request = ddspipe::core::types::DdsTopic(); @@ -271,10 +271,10 @@ struct ServiceDiscovered } bool get_topic( - SERVICE_TYPE service_type, + ServiceType service_type, ddspipe::core::types::DdsTopic& topic) { - if (service_type == SERVICE_TYPE::REQUEST) + if (service_type == ServiceType::REQUEST) { if (!request_discovered) { @@ -283,7 +283,7 @@ struct ServiceDiscovered topic = topic_request; return true; } - if (service_type == SERVICE_TYPE::REPLY) + if (service_type == ServiceType::REPLY) { if (!reply_discovered) { @@ -295,7 +295,7 @@ struct ServiceDiscovered return false; } - RPC_PROTOCOL get_rpc_protocol() const + RpcProtocol get_rpc_protocol() const { return rpc_protocol; } @@ -306,14 +306,14 @@ struct ActionDiscovered { ActionDiscovered( const std::string& action_name, - RPC_PROTOCOL rpc_protocol) + RpcProtocol rpc_protocol) : action_name(action_name) , rpc_protocol(rpc_protocol) { } std::string action_name; - RPC_PROTOCOL rpc_protocol{RPC_PROTOCOL::PROTOCOL_UNKNOWN}; + RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; std::weak_ptr goal; std::weak_ptr result; std::weak_ptr cancel; @@ -343,17 +343,17 @@ struct ActionDiscovered bool add_service( std::shared_ptr service, - ACTION_TYPE action_type) + ActionType action_type) { switch (action_type) { - case ACTION_TYPE::GOAL: + case ActionType::GOAL: goal = service; break; - case ACTION_TYPE::RESULT: + case ActionType::RESULT: result = service; break; - case ACTION_TYPE::CANCEL: + case ActionType::CANCEL: cancel = service; break; default: @@ -364,15 +364,15 @@ struct ActionDiscovered bool add_topic( const ddspipe::core::types::DdsTopic& topic, - ACTION_TYPE action_type) + ActionType action_type) { switch (action_type) { - case ACTION_TYPE::FEEDBACK: + case ActionType::FEEDBACK: feedback = topic; feedback_discovered = true; break; - case ACTION_TYPE::STATUS: + case ActionType::STATUS: status = topic; status_discovered = true; break; diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp index 51f6f230..646136b5 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp @@ -31,28 +31,28 @@ namespace participants { using UUID = std::array; -enum class RPC_PROTOCOL +enum class RpcProtocol { ROS2 = 0, FASTDDS, PROTOCOL_UNKNOWN }; -enum class RPC_TYPE +enum class RpcType { NONE = 0, SERVICE, ACTION }; -enum class SERVICE_TYPE +enum class ServiceType { NONE = 0, REQUEST, REPLY }; -enum class ACTION_TYPE +enum class ActionType { NONE = 0, GOAL, @@ -62,7 +62,7 @@ enum class ACTION_TYPE STATUS }; -enum class STATUS_CODE +enum class StatusCode { UNKNOWN = 0, ACCEPTED, @@ -77,7 +77,7 @@ enum class STATUS_CODE CANCEL_REQUEST_FAILED }; -enum class CANCEL_CODE +enum class CancelCode { NONE = 0, REJECTED, diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index ac1874a0..c75c64ac 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -43,13 +43,13 @@ RpcInfo get_rpc_info( const std::string& topic_name); DDSENABLER_PARTICIPANTS_DllAPI -RPC_PROTOCOL detect_rpc_protocol( +RpcProtocol detect_rpc_protocol( const std::string& topic_name); DDSENABLER_PARTICIPANTS_DllAPI RpcInfo remove_prefix_suffix( const std::string& topic_name, - RPC_PROTOCOL rpc_protocol); + RpcProtocol RpcProtocol); /** * @brief Generates a UUID. @@ -103,7 +103,7 @@ std::string create_cancel_request_msg( DDSENABLER_PARTICIPANTS_DllAPI std::string create_cancel_reply_msg( std::vector> cancelling_goals, - const CANCEL_CODE& cancel_code); + const CancelCode& cancel_code); /** * @brief Creates a result request message for an action. @@ -124,7 +124,7 @@ std::string create_result_request_msg( */ DDSENABLER_PARTICIPANTS_DllAPI std::string create_result_reply_msg( - const STATUS_CODE& status_code, + const StatusCode& status_code, const char* json); /** @@ -150,7 +150,7 @@ std::string create_feedback_msg( DDSENABLER_PARTICIPANTS_DllAPI std::string create_status_msg( const UUID& goal_id, - const STATUS_CODE& status_code, + const StatusCode& status_code, std::chrono::system_clock::time_point goal_accepted_stamp); } // namespace RpcUtils diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index 9d6f1f02..d9df3d4e 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -230,7 +230,7 @@ class Writer const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const ACTION_TYPE action_type); + const ActionType action_type); DDSENABLER_PARTICIPANTS_DllAPI void set_is_UUID_active_callback( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index c60852d5..4ddab180 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -61,7 +61,7 @@ bool EnablerParticipant::action_discovered_nts_( { auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); - if (SERVICE_TYPE::NONE != rpc_info.service_type) + if (ServiceType::NONE != rpc_info.service_type) { service_discovered_nts_(rpc_info, topic); auto service_it = services_.find(rpc_info.service_name); @@ -95,9 +95,9 @@ std::shared_ptr EnablerParticipant::create_reader( std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); RpcInfo rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); - if (RPC_TYPE::NONE != rpc_info.rpc_type) + if (RpcType::NONE != rpc_info.rpc_type) { - if (SERVICE_TYPE::NONE != rpc_info.service_type) + if (ServiceType::NONE != rpc_info.service_type) { reader = std::make_shared(id(), dds_topic); } @@ -109,7 +109,7 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - if (ACTION_TYPE::NONE == rpc_info.action_type) + if (ActionType::NONE == rpc_info.action_type) { if (service_discovered_nts_(rpc_info, dds_topic)) { @@ -250,7 +250,7 @@ bool EnablerParticipant::publish_rpc( std::string service_name; RpcInfo rpc_info = RpcUtils::get_rpc_info(topic_name); - if (SERVICE_TYPE::NONE == rpc_info.service_type) + if (ServiceType::NONE == rpc_info.service_type) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic_name << " : not a service topic."); @@ -353,7 +353,7 @@ bool EnablerParticipant::create_service_request_writer_nts_( bool EnablerParticipant::announce_service( const std::string& service_name, - RPC_PROTOCOL rpc_protocol) + RpcProtocol RpcProtocol) { std::unique_lock lck(mtx_); @@ -369,8 +369,8 @@ bool EnablerParticipant::announce_service( services_.erase(it); } - std::shared_ptr service = std::make_shared(service_name, rpc_protocol); - if (!query_service_nts_(service, rpc_protocol)) + std::shared_ptr service = std::make_shared(service_name, RpcProtocol); + if (!query_service_nts_(service, RpcProtocol)) { return false; } @@ -416,7 +416,7 @@ bool EnablerParticipant::revoke_service_nts_( this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); it->second->endpoint_request.reset(); - it->second->remove_topic(SERVICE_TYPE::REQUEST); + it->second->remove_topic(ServiceType::REQUEST); auto reader = lookup_reader_nts_(request_name); if (nullptr != reader) @@ -427,7 +427,7 @@ bool EnablerParticipant::revoke_service_nts_( return true; } -RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( +RpcProtocol EnablerParticipant::get_service_rpc_protocol( const std::string& service_name) { std::unique_lock lck(mtx_); @@ -437,22 +437,22 @@ RPC_PROTOCOL EnablerParticipant::get_service_rpc_protocol( return it->second->get_rpc_protocol(); } - return RPC_PROTOCOL::PROTOCOL_UNKNOWN; + return RpcProtocol::PROTOCOL_UNKNOWN; } bool EnablerParticipant::announce_action( const std::string& action_name) { - return announce_action(action_name, RPC_PROTOCOL::ROS2); + return announce_action(action_name, RpcProtocol::ROS2); } bool EnablerParticipant::announce_action( const std::string& action_name, - RPC_PROTOCOL rpc_protocol) + RpcProtocol RpcProtocol) { std::unique_lock lck(mtx_); - if (rpc_protocol != RPC_PROTOCOL::ROS2) + if (RpcProtocol != RpcProtocol::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action_name << " : only ROS2 actions are currently supported."); @@ -474,8 +474,8 @@ bool EnablerParticipant::announce_action( } } - ActionDiscovered action(action_name, rpc_protocol); - if (!query_action_nts_(action, rpc_protocol, lck)) + ActionDiscovered action(action_name, RpcProtocol); + if (!query_action_nts_(action, RpcProtocol, lck)) { return false; } @@ -589,18 +589,18 @@ bool EnablerParticipant::fill_topic_struct_nts_( bool EnablerParticipant::fullfill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, - RPC_PROTOCOL rpc_protocol) + RpcProtocol RpcProtocol) { std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; - switch (rpc_protocol) + switch (RpcProtocol) { - case RPC_PROTOCOL::ROS2: + case RpcProtocol::ROS2: rq_prefix = ROS_REQUEST_PREFIX; rq_suffix = ROS_REQUEST_SUFFIX; rp_prefix = ROS_REPLY_PREFIX; rp_suffix = ROS_REPLY_SUFFIX; break; - case RPC_PROTOCOL::FASTDDS: + case RpcProtocol::FASTDDS: rq_prefix = FASTDDS_REQUEST_PREFIX; rq_suffix = FASTDDS_REQUEST_SUFFIX; rp_prefix = FASTDDS_REPLY_PREFIX; @@ -618,7 +618,7 @@ bool EnablerParticipant::fullfill_service_type_nts_( { return false; } - service->add_topic(topic_request, SERVICE_TYPE::REQUEST); + service->add_topic(topic_request, ServiceType::REQUEST); DdsTopic topic_reply; std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; @@ -626,7 +626,7 @@ bool EnablerParticipant::fullfill_service_type_nts_( { return false; } - service->add_topic(topic_reply, SERVICE_TYPE::REPLY); + service->add_topic(topic_reply, ServiceType::REPLY); if (!service->fully_discovered) { @@ -639,7 +639,7 @@ bool EnablerParticipant::fullfill_service_type_nts_( bool EnablerParticipant::query_service_nts_( std::shared_ptr service, - RPC_PROTOCOL rpc_protocol) + RpcProtocol RpcProtocol) { if (!service_query_callback_) { @@ -663,12 +663,12 @@ bool EnablerParticipant::query_service_nts_( return false; } - return fullfill_service_type_nts_(service_info, service, rpc_protocol); + return fullfill_service_type_nts_(service_info, service, RpcProtocol); } bool EnablerParticipant::query_action_nts_( ActionDiscovered& action, - RPC_PROTOCOL rpc_protocol, + RpcProtocol RpcProtocol, std::unique_lock& lck) { if (!action_query_callback_) @@ -709,11 +709,11 @@ bool EnablerParticipant::query_action_nts_( } std::shared_ptr goal_service = std::make_shared(goal_service_name, - rpc_protocol); + RpcProtocol); if (!fullfill_service_type_nts_( action_info.goal, goal_service, - rpc_protocol)) + RpcProtocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : goal service type not found."); @@ -729,11 +729,11 @@ bool EnablerParticipant::query_action_nts_( action.goal = goal_service; std::shared_ptr cancel_service = std::make_shared(cancel_service_name, - rpc_protocol); + RpcProtocol); if (!fullfill_service_type_nts_( action_info.cancel, cancel_service, - rpc_protocol)) + RpcProtocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : cancel service type not found."); @@ -749,11 +749,11 @@ bool EnablerParticipant::query_action_nts_( action.cancel = cancel_service; std::shared_ptr result_service = std::make_shared(result_service_name, - rpc_protocol); + RpcProtocol); if (!fullfill_service_type_nts_( action_info.result, result_service, - rpc_protocol)) + RpcProtocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : result service type not found."); @@ -769,12 +769,12 @@ bool EnablerParticipant::query_action_nts_( action.result = result_service; std::string prefix; - switch (rpc_protocol) + switch (RpcProtocol) { - case RPC_PROTOCOL::ROS2: + case RpcProtocol::ROS2: prefix = ROS_TOPIC_PREFIX; break; - case RPC_PROTOCOL::FASTDDS: + case RpcProtocol::FASTDDS: prefix = FASTDDS_TOPIC_PREFIX; break; default: diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 7bb0af29..c3ee6f8c 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -159,16 +159,16 @@ void Handler::add_data( RpcInfo rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); switch (rpc_info.rpc_type) { - case RPC_TYPE::NONE: + case RpcType::NONE: { write_sample_nts_(msg, dyn_type); break; } // SERVICE - case RPC_TYPE::SERVICE: + case RpcType::SERVICE: { - if (rpc_info.service_type == SERVICE_TYPE::REQUEST) + if (rpc_info.service_type == ServiceType::REQUEST) { requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); @@ -186,21 +186,21 @@ void Handler::add_data( } // ACTIONS CLIENT - case RPC_TYPE::ACTION: + case RpcType::ACTION: { switch (rpc_info.service_type) { - case SERVICE_TYPE::REPLY: + case ServiceType::REPLY: { switch (rpc_info.action_type) { - case ACTION_TYPE::RESULT: + case ActionType::RESULT: { auto action_id = dynamic_cast(data).write_params.get_reference() .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; - if (get_action_request_UUID(action_id, ACTION_TYPE::RESULT, action_id_uuid)) + if (get_action_request_UUID(action_id, ActionType::RESULT, action_id_uuid)) { write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); } @@ -208,20 +208,20 @@ void Handler::add_data( break; } - case ACTION_TYPE::GOAL: + case ActionType::GOAL: { auto action_id = dynamic_cast(data).write_params.get_reference() .related_sample_identity().sequence_number().to64long(); UUID action_id_uuid; - if (get_action_request_UUID(action_id, ACTION_TYPE::GOAL, action_id_uuid)) + if (get_action_request_UUID(action_id, ActionType::GOAL, action_id_uuid)) { write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); } break; } - case ACTION_TYPE::CANCEL: + case ActionType::CANCEL: { auto request_id = dynamic_cast(data).write_params.get_reference() @@ -240,12 +240,12 @@ void Handler::add_data( break; } - case SERVICE_TYPE::REQUEST: + case ServiceType::REQUEST: { switch (rpc_info.action_type) { - case ACTION_TYPE::GOAL: - case ACTION_TYPE::CANCEL: + case ActionType::GOAL: + case ActionType::CANCEL: { requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); @@ -274,7 +274,7 @@ void Handler::add_data( break; } - case ACTION_TYPE::RESULT: + case ActionType::RESULT: { UUID uuid; if (!writer_->uuid_from_request_json( @@ -294,7 +294,7 @@ void Handler::add_data( rpc_info.action_name, uuid, requests_id_, - ACTION_TYPE::RESULT)) + ActionType::RESULT)) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to store action request for get_result_request."); @@ -324,17 +324,17 @@ void Handler::add_data( break; } - case SERVICE_TYPE::NONE: + case ServiceType::NONE: { switch (rpc_info.action_type) { - case ACTION_TYPE::FEEDBACK: + case ActionType::FEEDBACK: { write_action_feedback_nts_(msg, dyn_type, rpc_info.action_name); break; } - case ACTION_TYPE::STATUS: + case ActionType::STATUS: { write_action_status_nts_(msg, dyn_type, rpc_info.action_name); break; @@ -618,7 +618,7 @@ void Handler::write_action_request_nts_( const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const ACTION_TYPE action_type) + const ActionType action_type) { writer_->write_action_request_notification(msg, dyn_type, request_id, action_name, action_type); } @@ -687,8 +687,8 @@ bool Handler::store_action_request( const std::string& action_name, const UUID& action_id, const uint64_t request_id, - const ACTION_TYPE action_type, - const RPC_PROTOCOL rpc_protocol) + const ActionType action_type, + const RpcProtocol RpcProtocol) { std::lock_guard lock(mtx_); @@ -702,7 +702,7 @@ bool Handler::store_action_request( << it->second.action_name << ", got " << action_name); return false; } - if (ACTION_TYPE::GOAL == action_type) + if (ActionType::GOAL == action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action goal request as action id already exists."); @@ -714,13 +714,13 @@ bool Handler::store_action_request( else { // If it does not exist, create a new entry only if the action type is goal request - if (ACTION_TYPE::GOAL != action_type) + if (ActionType::GOAL != action_type) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Cannot store action request, action does not exist and request type is not GOAL."); return false; } - action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id, rpc_protocol); + action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id, RpcProtocol); } return true; @@ -800,7 +800,7 @@ bool Handler::is_UUID_active( return false; } -RPC_PROTOCOL Handler::get_action_rpc_protocol( +RpcProtocol Handler::get_action_rpc_protocol( const std::string& action_name, const UUID& action_id) { @@ -811,12 +811,12 @@ RPC_PROTOCOL Handler::get_action_rpc_protocol( return it->second.rpc_protocol; } - return RPC_PROTOCOL::PROTOCOL_UNKNOWN; + return RpcProtocol::PROTOCOL_UNKNOWN; } bool Handler::get_action_request_UUID( const uint64_t request_id, - const ACTION_TYPE action_type, + const ActionType action_type, UUID& action_id) { std::lock_guard lock(mtx_); diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index e532db4a..6aa7bbf6 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -37,32 +37,32 @@ namespace RpcUtils { RpcInfo get_rpc_info( const std::string& topic_name) { - RPC_PROTOCOL rpc_protocol = detect_rpc_protocol(topic_name); + RpcProtocol RpcProtocol = detect_rpc_protocol(topic_name); - return remove_prefix_suffix(topic_name, rpc_protocol); + return remove_prefix_suffix(topic_name, RpcProtocol); } -RPC_PROTOCOL detect_rpc_protocol( +RpcProtocol detect_rpc_protocol( const std::string& topic_name) { if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) { - return RPC_PROTOCOL::ROS2; + return RpcProtocol::ROS2; } else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) { - return RPC_PROTOCOL::FASTDDS; + return RpcProtocol::FASTDDS; } - return RPC_PROTOCOL::PROTOCOL_UNKNOWN; + return RpcProtocol::PROTOCOL_UNKNOWN; } RpcInfo remove_prefix_suffix( const std::string& topic_name, - RPC_PROTOCOL rpc_protocol) + RpcProtocol rpc_protocol) { RpcInfo rpc_info(topic_name); rpc_info.rpc_protocol = rpc_protocol; @@ -70,14 +70,14 @@ RpcInfo remove_prefix_suffix( std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; switch (rpc_protocol) { - case RPC_PROTOCOL::ROS2: + case RpcProtocol::ROS2: request_prefix = ROS_REQUEST_PREFIX; request_suffix = ROS_REQUEST_SUFFIX; reply_prefix = ROS_REPLY_PREFIX; reply_suffix = ROS_REPLY_SUFFIX; topic_prefix = ROS_TOPIC_PREFIX; break; - case RPC_PROTOCOL::FASTDDS: + case RpcProtocol::FASTDDS: request_prefix = FASTDDS_REQUEST_PREFIX; request_suffix = FASTDDS_REQUEST_SUFFIX; reply_prefix = FASTDDS_REPLY_PREFIX; @@ -97,35 +97,35 @@ RpcInfo remove_prefix_suffix( { base = base.substr(request_prefix.length()); base = base.substr(0, base.size() - (request_suffix.length())); - rpc_info.service_type = SERVICE_TYPE::REQUEST; + rpc_info.service_type = ServiceType::REQUEST; rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::GOAL; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::GOAL; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::RESULT; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::RESULT; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::CANCEL; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::CANCEL; return rpc_info; } - rpc_info.rpc_type = RPC_TYPE::SERVICE; + rpc_info.rpc_type = RpcType::SERVICE; return rpc_info; } if ((base.rfind(reply_prefix, 0) == 0) && @@ -134,35 +134,35 @@ RpcInfo remove_prefix_suffix( { base = base.substr(reply_prefix.length()); base = base.substr(0, base.size() - (reply_suffix.length())); - rpc_info.service_type = SERVICE_TYPE::REPLY; + rpc_info.service_type = ServiceType::REPLY; rpc_info.service_name = base; if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::GOAL; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::GOAL; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::RESULT; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::RESULT; return rpc_info; } else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::CANCEL; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::CANCEL; return rpc_info; } - rpc_info.rpc_type = RPC_TYPE::SERVICE; + rpc_info.rpc_type = RpcType::SERVICE; return rpc_info; } @@ -173,8 +173,8 @@ RpcInfo remove_prefix_suffix( (std::string("/") + ACTION_FEEDBACK_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::FEEDBACK; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::FEEDBACK; return rpc_info; } if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && @@ -182,8 +182,8 @@ RpcInfo remove_prefix_suffix( (std::string("/") + ACTION_STATUS_SUFFIX)) { rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); - rpc_info.rpc_type = RPC_TYPE::ACTION; - rpc_info.action_type = ACTION_TYPE::STATUS; + rpc_info.rpc_type = RpcType::ACTION; + rpc_info.action_type = ActionType::STATUS; return rpc_info; } @@ -246,7 +246,7 @@ std::string create_cancel_request_msg( std::string create_cancel_reply_msg( std::vector> cancelling_goals, - const CANCEL_CODE& cancel_code) + const CancelCode& cancel_code) { nlohmann::json j; j["return_code"] = cancel_code; @@ -275,7 +275,7 @@ std::string create_result_request_msg( } std::string create_result_reply_msg( - const STATUS_CODE& status_code, + const StatusCode& status_code, const char* json) { nlohmann::json j; @@ -286,7 +286,7 @@ std::string create_result_reply_msg( std::string create_status_msg( const UUID& goal_id, - const STATUS_CODE& status_code, + const StatusCode& status_code, std::chrono::system_clock::time_point goal_accepted_stamp) { auto duration_since_epoch = goal_accepted_stamp.time_since_epoch(); diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 1085b02c..6a628b0c 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -361,7 +361,7 @@ void Writer::write_action_goal_reply_notification( } std::string status_message = "Action goal accepted"; - ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::ACCEPTED; + ddsenabler::participants::StatusCode status_code = ddsenabler::participants::StatusCode::ACCEPTED; std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; try @@ -369,7 +369,7 @@ void Writer::write_action_goal_reply_notification( if (!json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["accepted"]) { status_message = "Action goal rejected"; - status_code = ddsenabler::participants::STATUS_CODE::REJECTED; + status_code = ddsenabler::participants::StatusCode::REJECTED; } } catch (const nlohmann::json::exception& e) @@ -377,7 +377,7 @@ void Writer::write_action_goal_reply_notification( EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Error parsing action goal reply notification: " << e.what()); status_message = "Action goal reply notification malformed"; - status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; + status_code = ddsenabler::participants::StatusCode::UNKNOWN; } if (action_status_notification_callback_) { @@ -390,14 +390,14 @@ void Writer::write_action_goal_reply_notification( ); } - if (ddsenabler::participants::STATUS_CODE::ACCEPTED == status_code && + if (ddsenabler::participants::StatusCode::ACCEPTED == status_code && send_action_get_result_request_callback_ && !send_action_get_result_request_callback_( action_name.c_str(), action_id)) { status_message = "Action goal aborted"; - status_code = ddsenabler::participants::STATUS_CODE::ABORTED; + status_code = ddsenabler::participants::StatusCode::ABORTED; if (action_status_notification_callback_) { @@ -418,7 +418,7 @@ void Writer::write_action_cancel_reply_notification( const uint64_t request_id, const std::string& action_name) { - ddsenabler::participants::STATUS_CODE status_code = ddsenabler::participants::STATUS_CODE::CANCELED; + ddsenabler::participants::StatusCode status_code = ddsenabler::participants::StatusCode::CANCELED; nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -439,30 +439,30 @@ void Writer::write_action_cancel_reply_notification( { EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, "Error parsing action cancel reply notification: " << e.what()); - status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; + status_code = ddsenabler::participants::StatusCode::UNKNOWN; return; } switch (return_code) { case 0: status_message = "Action canceled successfully"; - status_code = ddsenabler::participants::STATUS_CODE::CANCELED; + status_code = ddsenabler::participants::StatusCode::CANCELED; break; case 1: status_message = "Action cancel request rejected"; - status_code = ddsenabler::participants::STATUS_CODE::REJECTED; + status_code = ddsenabler::participants::StatusCode::REJECTED; break; case 2: status_message = "Action cancel request unknown goal ID"; - status_code = ddsenabler::participants::STATUS_CODE::CANCEL_REQUEST_FAILED; + status_code = ddsenabler::participants::StatusCode::CANCEL_REQUEST_FAILED; break; case 3: status_message = "Action cancel request rejected as goal was already terminated"; - status_code = ddsenabler::participants::STATUS_CODE::CANCEL_REQUEST_FAILED; + status_code = ddsenabler::participants::StatusCode::CANCEL_REQUEST_FAILED; break; default: status_message = "Action cancel request unknown code"; - status_code = ddsenabler::participants::STATUS_CODE::UNKNOWN; + status_code = ddsenabler::participants::StatusCode::UNKNOWN; break; } @@ -521,28 +521,28 @@ void Writer::write_action_status_notification( continue; } - ddsenabler::participants::STATUS_CODE status_code(status["status"]); + ddsenabler::participants::StatusCode status_code(status["status"]); std::string status_message; switch (status_code) { - case ddsenabler::participants::STATUS_CODE::UNKNOWN: + case ddsenabler::participants::StatusCode::UNKNOWN: status_message = "The status has not been properly set"; break; - case ddsenabler::participants::STATUS_CODE::ACCEPTED: + case ddsenabler::participants::StatusCode::ACCEPTED: status_message = "The goal has been accepted and is awaiting execution"; break; - case ddsenabler::participants::STATUS_CODE::EXECUTING: + case ddsenabler::participants::StatusCode::EXECUTING: status_message = "The goal is currently being executed by the action server"; break; - case ddsenabler::participants::STATUS_CODE::CANCELING: + case ddsenabler::participants::StatusCode::CANCELING: status_message = "The client has requested that the goal be canceled and the action server has accepted the cancel request"; break; - case ddsenabler::participants::STATUS_CODE::SUCCEEDED: + case ddsenabler::participants::StatusCode::SUCCEEDED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -550,7 +550,7 @@ void Writer::write_action_status_notification( status_message = "The goal was achieved successfully by the action server"; break; - case ddsenabler::participants::STATUS_CODE::CANCELED: + case ddsenabler::participants::StatusCode::CANCELED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -558,14 +558,14 @@ void Writer::write_action_status_notification( status_message = "The goal was canceled after an external request from an action client"; break; - case ddsenabler::participants::STATUS_CODE::ABORTED: + case ddsenabler::participants::StatusCode::ABORTED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); } status_message = "The goal was terminated by the action server without an external request"; break; - case ddsenabler::participants::STATUS_CODE::REJECTED: + case ddsenabler::participants::StatusCode::REJECTED: if (erase_action_UUID_callback_) { erase_action_UUID_callback_(uuid, ActionEraseReason::FINAL_STATUS); @@ -602,7 +602,7 @@ void Writer::write_action_request_notification( const fastdds::dds::DynamicType::_ref_type& dyn_type, const uint64_t request_id, const std::string& action_name, - const ACTION_TYPE action_type) + const ActionType action_type) { nlohmann::json json_data; if (!prepare_json_data_(msg, dyn_type, json_data)) @@ -614,7 +614,7 @@ void Writer::write_action_request_notification( instanceHandle << msg.instanceHandle; try { - if (ACTION_TYPE::GOAL == action_type) + if (ActionType::GOAL == action_type) { bool accepted; if (action_goal_request_notification_callback_) @@ -634,7 +634,7 @@ void Writer::write_action_request_notification( return; } - if (ACTION_TYPE::CANCEL == action_type) + if (ActionType::CANCEL == action_type) { if (action_cancel_request_notification_callback_) { From 5eeacd2062665340f199c14e272538cab7804df2 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Fri, 17 Oct 2025 13:42:01 +0200 Subject: [PATCH 45/87] Optimize prepare data Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/Writer.cpp | 39 +++------------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 6a628b0c..bfc70b90 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -178,13 +178,7 @@ void Writer::write_data( const fastdds::dds::DynamicType::_ref_type& dyn_type) { nlohmann::json json_data; - if (!prepare_json_data_(msg, dyn_type, json_data)) - { - return; - } - - //STORE DATA - if (data_notification_callback_) + if (data_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { data_notification_callback_( msg.topic.topic_name().c_str(), @@ -221,13 +215,7 @@ void Writer::write_service_reply_notification( const std::string& service_name) { nlohmann::json json_data; - if (!prepare_json_data_(msg, dyn_type, json_data)) - { - return; - } - - //STORE DATA - if (service_reply_notification_callback_) + if (service_reply_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { service_reply_notification_callback_( service_name.c_str(), @@ -245,13 +233,7 @@ void Writer::write_service_request_notification( const std::string& service_name) { nlohmann::json json_data; - if (!prepare_json_data_(msg, dyn_type, json_data)) - { - return; - } - - //STORE DATA - if (service_request_notification_callback_) + if (service_request_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { service_request_notification_callback_( service_name.c_str(), @@ -307,13 +289,7 @@ void Writer::write_action_result_notification( const std::string& action_name) { nlohmann::json json_data; - if (!prepare_json_data_(msg, dyn_type, json_data)) - { - return; - } - - //STORE DATA - if (action_result_notification_callback_) + if (action_result_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { action_result_notification_callback_( action_name.c_str(), @@ -330,14 +306,9 @@ void Writer::write_action_feedback_notification( const std::string& action_name) { nlohmann::json json_data; - if (!prepare_json_data_(msg, dyn_type, json_data)) - { - return; - } - std::stringstream instanceHandle; instanceHandle << msg.instanceHandle; - if (action_feedback_notification_callback_) + if (action_feedback_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { action_feedback_notification_callback_( action_name.c_str(), From b37b108363c1d54e0f1de46a12b750e8822861b2 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 07:49:12 +0200 Subject: [PATCH 46/87] Catch json exceptions Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/Writer.cpp | 44 +++++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index bfc70b90..bfcea2af 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -310,10 +310,22 @@ void Writer::write_action_feedback_notification( instanceHandle << msg.instanceHandle; if (action_feedback_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { + UUID uuid; + try + { + uuid = json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]); + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing UUID from JSON: " << e.what()); + return; + } + action_feedback_notification_callback_( action_name.c_str(), json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["feedback"].dump(4).c_str(), - json_to_uuid(json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goal_id"]), + uuid, msg.publish_time.to_ns() ); } @@ -442,8 +454,19 @@ void Writer::write_action_cancel_reply_notification( const auto& goals = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["goals_canceling"]; for (const auto& goal : goals) { - UUID msg_action_id = json_to_uuid(goal["goal_id"]); - if (is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, msg_action_id)) + UUID uuid; + try + { + uuid = json_to_uuid(goal["goal_id"]); + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing UUID from JSON: " << e.what()); + return; + } + + if (is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, uuid)) { continue; } @@ -452,7 +475,7 @@ void Writer::write_action_cancel_reply_notification( { action_status_notification_callback_( action_name.c_str(), - msg_action_id, + uuid, status_code, status_message.c_str(), msg.publish_time.to_ns() @@ -486,7 +509,18 @@ void Writer::write_action_status_notification( const auto& list = json_data[msg.topic.topic_name()]["data"][instanceHandle.str()]["status_list"]; for (const auto& status : list) { - UUID uuid = json_to_uuid(status["goal_info"]["goal_id"]); + UUID uuid; + try + { + uuid = json_to_uuid(status["goal_info"]["goal_id"]); + } + catch (const nlohmann::json::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_WRITER, + "Error parsing UUID from JSON: " << e.what()); + return; + } + if (is_UUID_active_callback_ && !is_UUID_active_callback_(action_name, uuid)) { continue; From 71a79a2023206874cd97d344add07c01a62ed84b Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 08:11:52 +0200 Subject: [PATCH 47/87] Use RpcType for Rpc discrimination Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 4ddab180..90dad468 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -109,7 +109,7 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - if (ActionType::NONE == rpc_info.action_type) + if (RpcType::SERVICE == rpc_info.rpc_type) { if (service_discovered_nts_(rpc_info, dds_topic)) { @@ -117,7 +117,7 @@ std::shared_ptr EnablerParticipant::create_reader( std::static_pointer_cast(schema_handler_)->add_service(service); } } - else + else if (RpcType::ACTION == rpc_info.rpc_type) { if (action_discovered_nts_(rpc_info, dds_topic)) { From 0ea2a79f4d9fe42fe2585d04b8569732e2c4cb90 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 08:30:27 +0200 Subject: [PATCH 48/87] actions_ map with shared ptr Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 2 +- .../src/cpp/EnablerParticipant.cpp | 40 +++++++++++-------- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index fa85f477..57c89297 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -179,7 +179,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant std::map> services_; - std::map actions_; + std::map> actions_; std::mutex mtx_; diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 90dad468..50f054a0 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -60,7 +60,7 @@ bool EnablerParticipant::action_discovered_nts_( const DdsTopic& topic) { auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, - ActionDiscovered(rpc_info.action_name, rpc_info.rpc_protocol)); + std::make_shared(rpc_info.action_name, rpc_info.rpc_protocol)); if (ServiceType::NONE != rpc_info.service_type) { service_discovered_nts_(rpc_info, topic); @@ -72,14 +72,14 @@ bool EnablerParticipant::action_discovered_nts_( return false; } - it->second.add_service(service_it->second, rpc_info.action_type); + it->second->add_service(service_it->second, rpc_info.action_type); } else { - it->second.add_topic(topic, rpc_info.action_type); + it->second->add_topic(topic, rpc_info.action_type); } - return it->second.check_fully_discovered(); + return it->second->check_fully_discovered(); } std::shared_ptr EnablerParticipant::create_reader( @@ -121,8 +121,16 @@ std::shared_ptr EnablerParticipant::create_reader( { if (action_discovered_nts_(rpc_info, dds_topic)) { - auto action = actions_.find(rpc_info.action_name)->second.get_action(); - std::static_pointer_cast(schema_handler_)->add_action(action); + try + { + auto action = actions_.find(rpc_info.action_name)->second->get_action(); + std::static_pointer_cast(schema_handler_)->add_action(action); + } + catch (const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to add action " << rpc_info.action_name << ": " << e.what()); + } } } } @@ -463,7 +471,7 @@ bool EnablerParticipant::announce_action( auto it = actions_.find(action_name); if (it != actions_.end()) { - if (it->second.enabler_as_server) + if (it->second->enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action_name << " : action already announced."); @@ -474,8 +482,8 @@ bool EnablerParticipant::announce_action( } } - ActionDiscovered action(action_name, RpcProtocol); - if (!query_action_nts_(action, RpcProtocol, lck)) + std::shared_ptr action = std::make_shared(action_name, RpcProtocol); + if (!query_action_nts_(*action, RpcProtocol, lck)) { return false; } @@ -496,18 +504,18 @@ bool EnablerParticipant::revoke_action( "Failed to stop action " << action_name << " : action not found."); return false; } - if (!it->second.enabler_as_server) + if (!it->second->enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to stop action " << action_name << " : action not announced as server."); return false; } - auto& action = it->second; + auto action = it->second; - auto goal = action.goal.lock(); - auto result = action.result.lock(); - auto cancel = action.cancel.lock(); + auto goal = action->goal.lock(); + auto result = action->result.lock(); + auto cancel = action->cancel.lock(); if (!goal || !result || !cancel) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -518,8 +526,8 @@ bool EnablerParticipant::revoke_action( this->revoke_service_nts_(result->service_name) && this->revoke_service_nts_(cancel->service_name)) { - action.enabler_as_server = false; - action.fully_discovered = false; + action->enabler_as_server = false; + action->fully_discovered = false; return true; } From 9f35126e427f7478fd83aa4694feb4ba825bdb22 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 09:09:01 +0200 Subject: [PATCH 49/87] Use discovered external server Signed-off-by: Eugenio Collado --- .../src/cpp/EnablerParticipant.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 50f054a0..dc241e49 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -374,7 +374,8 @@ bool EnablerParticipant::announce_service( "Failed to announce service " << service_name << " : service already announced."); return false; } - services_.erase(it); + it->second->enabler_as_server = true; + return true; } std::shared_ptr service = std::make_shared(service_name, RpcProtocol); @@ -478,6 +479,17 @@ bool EnablerParticipant::announce_action( return false; } // Erase the action, to allow re-announcing it + auto goal = it->second->goal.lock(); + auto result = it->second->result.lock(); + auto cancel = it->second->cancel.lock(); + if (goal && result && cancel) + { + it->second->enabler_as_server = true; + goal->enabler_as_server = true; + result->enabler_as_server = true; + cancel->enabler_as_server = true; + return true; + } actions_.erase(it); } } From cbfda13c479990a244d516f740bd0060889f8000 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 10:04:36 +0200 Subject: [PATCH 50/87] Fix parameter not initialized Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index dc241e49..d762b777 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -819,7 +819,7 @@ bool EnablerParticipant::query_action_nts_( if (!feedback_reader) { create_topic_writer_nts_( - action.feedback, + feedback_topic, feedback_reader, lck); } @@ -843,7 +843,7 @@ bool EnablerParticipant::query_action_nts_( if (!status_reader) { create_topic_writer_nts_( - action.status, + status_topic, status_reader, lck); } From ff1055aaf0f4063a316929b22a90adb5fb556009 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 11:27:00 +0200 Subject: [PATCH 51/87] Error handling Signed-off-by: Eugenio Collado --- .../ddsenabler_participants/RpcStructs.hpp | 25 +++++++++++------ .../src/cpp/EnablerParticipant.cpp | 28 ++++++++++++++++--- ddsenabler_participants/src/cpp/Handler.cpp | 27 ++++++++++++++---- ddsenabler_participants/src/cpp/RpcUtils.cpp | 12 ++++++-- 4 files changed, 71 insertions(+), 21 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index e6a0ff56..c2e94ba8 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -126,7 +126,7 @@ struct ActionRequestInfo case ActionType::RESULT: return result_request_id; default: - return 0; + throw std::runtime_error("Invalid action type for request retrieval"); } } @@ -265,7 +265,7 @@ struct ServiceDiscovered { if (!fully_discovered || rpc_topic == std::nullopt) { - throw std::runtime_error("Service not fully discovered"); + throw std::runtime_error("Service " + service_name + " not fully discovered"); } return rpc_topic.value(); } @@ -394,13 +394,20 @@ struct ActionDiscovered throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); } - return RpcAction( - action_name, - g->get_service(), - r->get_service(), - c->get_service(), - feedback, - status); + try + { + return RpcAction( + action_name, + g->get_service(), + r->get_service(), + c->get_service(), + feedback, + status); + } + catch(const std::exception& e) + { + throw std::runtime_error("Failed to create action " + action_name + ": " + e.what()); + } } }; diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index d762b777..cb58cd68 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -94,7 +94,17 @@ std::shared_ptr EnablerParticipant::create_reader( { std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); - RpcInfo rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); + RpcInfo rpc_info(dds_topic.m_topic_name); + try + { + rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); + } + catch(const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); + return std::make_shared(); + } + if (RpcType::NONE != rpc_info.rpc_type) { if (ServiceType::NONE != rpc_info.service_type) @@ -130,6 +140,7 @@ std::shared_ptr EnablerParticipant::create_reader( { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to add action " << rpc_info.action_name << ": " << e.what()); + return std::make_shared(); } } } @@ -256,8 +267,17 @@ bool EnablerParticipant::publish_rpc( { std::unique_lock lck(mtx_); - std::string service_name; - RpcInfo rpc_info = RpcUtils::get_rpc_info(topic_name); + RpcInfo rpc_info(topic_name); + try + { + rpc_info = RpcUtils::get_rpc_info(topic_name); + } + catch(const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); + return false; + } + if (ServiceType::NONE == rpc_info.service_type) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -288,7 +308,7 @@ bool EnablerParticipant::publish_rpc( if (!it->second->get_topic(rpc_info.service_type, topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << service_name << " : topic not found."); + "Failed to publish data in service " << rpc_info.service_name << " : topic not found."); return false; } diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index c3ee6f8c..1eb2f5a7 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -156,7 +156,16 @@ void Handler::add_data( throw utils::InconsistencyException(STR_ENTRY << "Received sample with no payload."); } - RpcInfo rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); + RpcInfo rpc_info(topic.m_topic_name); + try + { + rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); + } + catch(const std::exception& e) + { + throw utils::InconsistencyException(STR_ENTRY << e.what()); + } + switch (rpc_info.rpc_type) { case RpcType::NONE: @@ -822,11 +831,19 @@ bool Handler::get_action_request_UUID( std::lock_guard lock(mtx_); for (auto it = action_request_id_to_uuid_.begin(); it != action_request_id_to_uuid_.end(); ++it) { - uint64_t action_request_id = it->second.get_request(action_type); - if (request_id == action_request_id) + try { - action_id = it->first; - return true; + uint64_t action_request_id = it->second.get_request(action_type); + if (request_id == action_request_id) + { + action_id = it->first; + return true; + } + } + catch(const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Error getting action request ID: " << e.what()); } } return false; diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 6aa7bbf6..c58df3f6 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -38,8 +38,14 @@ RpcInfo get_rpc_info( const std::string& topic_name) { RpcProtocol RpcProtocol = detect_rpc_protocol(topic_name); - - return remove_prefix_suffix(topic_name, RpcProtocol); + try + { + return remove_prefix_suffix(topic_name, RpcProtocol); + } + catch(const std::exception& e) + { + throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); + } } RpcProtocol detect_rpc_protocol( @@ -87,7 +93,7 @@ RpcInfo remove_prefix_suffix( default: EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, "Invalid RPC protocol"); - return rpc_info; + throw std::runtime_error("Invalid RPC protocol"); } std::string base = topic_name; From 6b1f53d08a4cf4b1630cd692b4d6b144c356c9a9 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 20 Oct 2025 16:33:07 +0200 Subject: [PATCH 52/87] Remove pre/suf as RpcInfo constructor Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 4 +- .../ddsenabler_participants/RpcStructs.hpp | 162 ++++++++++++++++- .../ddsenabler_participants/RpcUtils.hpp | 19 -- .../src/cpp/EnablerParticipant.cpp | 58 +++--- ddsenabler_participants/src/cpp/Handler.cpp | 42 ++--- ddsenabler_participants/src/cpp/RpcUtils.cpp | 168 ------------------ 6 files changed, 212 insertions(+), 241 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 57c89297..7bd6f0f2 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -165,11 +165,11 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& topic_name) const; bool service_discovered_nts_( - const RpcInfo& rpc_info, + const std::shared_ptr rpc_info, const ddspipe::core::types::DdsTopic& topic); bool action_discovered_nts_( - const RpcInfo& rpc_info, + const std::shared_ptr rpc_info, const ddspipe::core::types::DdsTopic& topic); bool revoke_service_nts_( diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp index c2e94ba8..3371e6a8 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp @@ -18,10 +18,13 @@ #pragma once -#include -#include #include +#include + +#include + +#include namespace eprosima { namespace ddsenabler { @@ -71,6 +74,161 @@ struct RpcInfo , service_type(ServiceType::NONE) , action_type(ActionType::NONE) { + detect_rpc_protocol(); + try + { + remove_prefix_suffix(); + } + catch(const std::exception& e) + { + throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); + } + } + + void detect_rpc_protocol() + { + if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) + { + rpc_protocol = RpcProtocol::ROS2; + return; + } + else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) + { + rpc_protocol = RpcProtocol::FASTDDS; + return; + } + rpc_protocol = RpcProtocol::PROTOCOL_UNKNOWN; + } + + void remove_prefix_suffix() + { + rpc_protocol = rpc_protocol; + + std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; + switch (rpc_protocol) + { + case RpcProtocol::ROS2: + request_prefix = ROS_REQUEST_PREFIX; + request_suffix = ROS_REQUEST_SUFFIX; + reply_prefix = ROS_REPLY_PREFIX; + reply_suffix = ROS_REPLY_SUFFIX; + topic_prefix = ROS_TOPIC_PREFIX; + break; + case RpcProtocol::FASTDDS: + request_prefix = FASTDDS_REQUEST_PREFIX; + request_suffix = FASTDDS_REQUEST_SUFFIX; + reply_prefix = FASTDDS_REPLY_PREFIX; + reply_suffix = FASTDDS_REPLY_SUFFIX; + topic_prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, + "Invalid RPC protocol"); + throw std::runtime_error("Invalid RPC protocol"); + } + + std::string base = topic_name; + if ((base.rfind(request_prefix, 0) == 0) && + (base.size() >= request_suffix.length()) && + (base.substr(base.size() - request_suffix.length()) == request_suffix)) + { + base = base.substr(request_prefix.length()); + base = base.substr(0, base.size() - (request_suffix.length())); + service_type = ServiceType::REQUEST; + service_name = base; + + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::GOAL; + return; + } + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::RESULT; + return; + } + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::CANCEL; + return; + } + + rpc_type = RpcType::SERVICE; + return; + } + if ((base.rfind(reply_prefix, 0) == 0) && + (base.size() >= reply_suffix.length()) && + (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) + { + base = base.substr(reply_prefix.length()); + base = base.substr(0, base.size() - (reply_suffix.length())); + service_type = ServiceType::REPLY; + service_name = base; + + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::GOAL; + return; + } + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::RESULT; + return; + } + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::CANCEL; + return; + } + + rpc_type = RpcType::SERVICE; + return; + } + + // Check for action feedback/status topics + base = base.substr(topic_prefix.length()); + if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == + (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + { + action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); + rpc_type = RpcType::ACTION; + action_type = ActionType::FEEDBACK; + return; + } + if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == + (std::string("/") + ACTION_STATUS_SUFFIX)) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::STATUS; + return; + } + + return; } std::string topic_name; diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp index c75c64ac..678d8245 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp @@ -32,25 +32,6 @@ namespace ddsenabler { namespace participants { namespace RpcUtils { -/** - * @brief Extracts the service/action name from a given topic name. - * - * @param [in] topic_name Topic name to extract the service/action name from - * @return Extracted service name - */ -DDSENABLER_PARTICIPANTS_DllAPI -RpcInfo get_rpc_info( - const std::string& topic_name); - -DDSENABLER_PARTICIPANTS_DllAPI -RpcProtocol detect_rpc_protocol( - const std::string& topic_name); - -DDSENABLER_PARTICIPANTS_DllAPI -RpcInfo remove_prefix_suffix( - const std::string& topic_name, - RpcProtocol RpcProtocol); - /** * @brief Generates a UUID. * diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index cb58cd68..aab04664 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -47,36 +47,36 @@ EnablerParticipant::EnablerParticipant( } bool EnablerParticipant::service_discovered_nts_( - const RpcInfo& rpc_info, + const std::shared_ptr rpc_info, const DdsTopic& topic) { - auto [it, inserted] = services_.try_emplace(rpc_info.service_name, - std::make_shared(rpc_info.service_name, rpc_info.rpc_protocol)); - return it->second->add_topic(topic, rpc_info.service_type); + auto [it, inserted] = services_.try_emplace(rpc_info->service_name, + std::make_shared(rpc_info->service_name, rpc_info->rpc_protocol)); + return it->second->add_topic(topic, rpc_info->service_type); } bool EnablerParticipant::action_discovered_nts_( - const RpcInfo& rpc_info, + const std::shared_ptr rpc_info, const DdsTopic& topic) { - auto [it, inserted] = actions_.try_emplace(rpc_info.action_name, - std::make_shared(rpc_info.action_name, rpc_info.rpc_protocol)); - if (ServiceType::NONE != rpc_info.service_type) + auto [it, inserted] = actions_.try_emplace(rpc_info->action_name, + std::make_shared(rpc_info->action_name, rpc_info->rpc_protocol)); + if (ServiceType::NONE != rpc_info->service_type) { service_discovered_nts_(rpc_info, topic); - auto service_it = services_.find(rpc_info.service_name); + auto service_it = services_.find(rpc_info->service_name); if (services_.end() == service_it) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Service " << rpc_info.service_name << " not found in action " << rpc_info.action_name); + "Service " << rpc_info->service_name << " not found in action " << rpc_info->action_name); return false; } - it->second->add_service(service_it->second, rpc_info.action_type); + it->second->add_service(service_it->second, rpc_info->action_type); } else { - it->second->add_topic(topic, rpc_info.action_type); + it->second->add_topic(topic, rpc_info->action_type); } return it->second->check_fully_discovered(); @@ -94,10 +94,10 @@ std::shared_ptr EnablerParticipant::create_reader( { std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); - RpcInfo rpc_info(dds_topic.m_topic_name); + std::shared_ptr rpc_info; try { - rpc_info = RpcUtils::get_rpc_info(dds_topic.m_topic_name); + rpc_info = std::make_shared(dds_topic.m_topic_name); } catch(const std::exception& e) { @@ -105,9 +105,9 @@ std::shared_ptr EnablerParticipant::create_reader( return std::make_shared(); } - if (RpcType::NONE != rpc_info.rpc_type) + if (RpcType::NONE != rpc_info->rpc_type) { - if (ServiceType::NONE != rpc_info.service_type) + if (ServiceType::NONE != rpc_info->service_type) { reader = std::make_shared(id(), dds_topic); } @@ -119,27 +119,27 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - if (RpcType::SERVICE == rpc_info.rpc_type) + if (RpcType::SERVICE == rpc_info->rpc_type) { if (service_discovered_nts_(rpc_info, dds_topic)) { - RpcTopic service = services_.find(rpc_info.service_name)->second->get_service(); + RpcTopic service = services_.find(rpc_info->service_name)->second->get_service(); std::static_pointer_cast(schema_handler_)->add_service(service); } } - else if (RpcType::ACTION == rpc_info.rpc_type) + else if (RpcType::ACTION == rpc_info->rpc_type) { if (action_discovered_nts_(rpc_info, dds_topic)) { try { - auto action = actions_.find(rpc_info.action_name)->second->get_action(); + auto action = actions_.find(rpc_info->action_name)->second->get_action(); std::static_pointer_cast(schema_handler_)->add_action(action); } catch (const std::exception& e) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to add action " << rpc_info.action_name << ": " << e.what()); + "Failed to add action " << rpc_info->action_name << ": " << e.what()); return std::make_shared(); } } @@ -267,10 +267,10 @@ bool EnablerParticipant::publish_rpc( { std::unique_lock lck(mtx_); - RpcInfo rpc_info(topic_name); + std::shared_ptr rpc_info; try { - rpc_info = RpcUtils::get_rpc_info(topic_name); + rpc_info = std::make_shared(topic_name); } catch(const std::exception& e) { @@ -278,19 +278,19 @@ bool EnablerParticipant::publish_rpc( return false; } - if (ServiceType::NONE == rpc_info.service_type) + if (ServiceType::NONE == rpc_info->service_type) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic_name << " : not a service topic."); return false; } - auto it = services_.find(rpc_info.service_name); + auto it = services_.find(rpc_info->service_name); if (it == services_.end()) { // There is no case where none of the service topics are discovered and yet the publish should be done EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); + "Failed to publish data in service " << rpc_info->service_name << " : service does not exist."); return false; } @@ -300,15 +300,15 @@ bool EnablerParticipant::publish_rpc( if (nullptr == reader) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << rpc_info.service_name << " : service does not exist."); + "Failed to publish data in service " << rpc_info->service_name << " : service does not exist."); return false; } DdsTopic topic; - if (!it->second->get_topic(rpc_info.service_type, topic)) + if (!it->second->get_topic(rpc_info->service_type, topic)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << rpc_info.service_name << " : topic not found."); + "Failed to publish data in service " << rpc_info->service_name << " : topic not found."); return false; } diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 1eb2f5a7..4498eb73 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -156,17 +156,17 @@ void Handler::add_data( throw utils::InconsistencyException(STR_ENTRY << "Received sample with no payload."); } - RpcInfo rpc_info(topic.m_topic_name); + std::shared_ptr rpc_info; try { - rpc_info = RpcUtils::get_rpc_info(topic.m_topic_name); + rpc_info = std::make_shared(topic.m_topic_name); } catch(const std::exception& e) { throw utils::InconsistencyException(STR_ENTRY << e.what()); } - switch (rpc_info.rpc_type) + switch (rpc_info->rpc_type) { case RpcType::NONE: { @@ -177,19 +177,19 @@ void Handler::add_data( // SERVICE case RpcType::SERVICE: { - if (rpc_info.service_type == ServiceType::REQUEST) + if (rpc_info->service_type == ServiceType::REQUEST) { requests_id_++; RpcPayloadData& rpc_data = dynamic_cast(data); rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); - write_service_request_nts_(msg, dyn_type, requests_id_, rpc_info.service_name); + write_service_request_nts_(msg, dyn_type, requests_id_, rpc_info->service_name); } else { auto request_id = dynamic_cast(data).write_params.get_reference(). related_sample_identity().sequence_number().to64long(); - write_service_reply_nts_(msg, dyn_type, request_id, rpc_info.service_name); + write_service_reply_nts_(msg, dyn_type, request_id, rpc_info->service_name); } break; } @@ -197,11 +197,11 @@ void Handler::add_data( // ACTIONS CLIENT case RpcType::ACTION: { - switch (rpc_info.service_type) + switch (rpc_info->service_type) { case ServiceType::REPLY: { - switch (rpc_info.action_type) + switch (rpc_info->action_type) { case ActionType::RESULT: { @@ -211,7 +211,7 @@ void Handler::add_data( UUID action_id_uuid; if (get_action_request_UUID(action_id, ActionType::RESULT, action_id_uuid)) { - write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + write_action_result_nts_(msg, dyn_type, action_id_uuid, rpc_info->action_name); } erase_action_UUID(action_id_uuid, ActionEraseReason::RESULT); break; @@ -225,7 +225,7 @@ void Handler::add_data( UUID action_id_uuid; if (get_action_request_UUID(action_id, ActionType::GOAL, action_id_uuid)) { - write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info.action_name); + write_action_goal_reply_nts_(msg, dyn_type, action_id_uuid, rpc_info->action_name); } break; } @@ -235,7 +235,7 @@ void Handler::add_data( auto request_id = dynamic_cast(data).write_params.get_reference() .related_sample_identity().sequence_number().to64long(); - write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_info.action_name); + write_action_cancel_reply_nts_(msg, dyn_type, request_id, rpc_info->action_name); break; } @@ -251,7 +251,7 @@ void Handler::add_data( case ServiceType::REQUEST: { - switch (rpc_info.action_type) + switch (rpc_info->action_type) { case ActionType::GOAL: case ActionType::CANCEL: @@ -271,13 +271,13 @@ void Handler::add_data( } if (store_action_request( - rpc_info.action_name, + rpc_info->action_name, uuid, requests_id_, - rpc_info.action_type)) + rpc_info->action_type)) { - write_action_request_nts_(msg, dyn_type, requests_id_, rpc_info.action_name, - rpc_info.action_type); + write_action_request_nts_(msg, dyn_type, requests_id_, rpc_info->action_name, + rpc_info->action_type); } break; @@ -300,7 +300,7 @@ void Handler::add_data( RpcPayloadData& rpc_data = dynamic_cast(data); rpc_data.sent_sequence_number = eprosima::fastdds::rtps::SequenceNumber_t(requests_id_); if (!store_action_request( - rpc_info.action_name, + rpc_info->action_name, uuid, requests_id_, ActionType::RESULT)) @@ -316,7 +316,7 @@ void Handler::add_data( if (send_action_get_result_reply_callback_) { send_action_get_result_reply_callback_( - rpc_info.action_name, + rpc_info->action_name, uuid, result, requests_id_); @@ -335,17 +335,17 @@ void Handler::add_data( case ServiceType::NONE: { - switch (rpc_info.action_type) + switch (rpc_info->action_type) { case ActionType::FEEDBACK: { - write_action_feedback_nts_(msg, dyn_type, rpc_info.action_name); + write_action_feedback_nts_(msg, dyn_type, rpc_info->action_name); break; } case ActionType::STATUS: { - write_action_status_nts_(msg, dyn_type, rpc_info.action_name); + write_action_status_nts_(msg, dyn_type, rpc_info->action_name); break; } diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index c58df3f6..b846a491 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -28,174 +28,6 @@ namespace ddsenabler { namespace participants { namespace RpcUtils { -/** - * @brief Extracts the service name from a given topic name. - * - * @param [in] topic_name Topic name to extract the service name from - * @return Extracted service name - */ -RpcInfo get_rpc_info( - const std::string& topic_name) -{ - RpcProtocol RpcProtocol = detect_rpc_protocol(topic_name); - try - { - return remove_prefix_suffix(topic_name, RpcProtocol); - } - catch(const std::exception& e) - { - throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); - } -} - -RpcProtocol detect_rpc_protocol( - const std::string& topic_name) -{ - if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) - { - return RpcProtocol::ROS2; - } - else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) - { - return RpcProtocol::FASTDDS; - } - return RpcProtocol::PROTOCOL_UNKNOWN; -} - -RpcInfo remove_prefix_suffix( - const std::string& topic_name, - RpcProtocol rpc_protocol) -{ - RpcInfo rpc_info(topic_name); - rpc_info.rpc_protocol = rpc_protocol; - - std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; - switch (rpc_protocol) - { - case RpcProtocol::ROS2: - request_prefix = ROS_REQUEST_PREFIX; - request_suffix = ROS_REQUEST_SUFFIX; - reply_prefix = ROS_REPLY_PREFIX; - reply_suffix = ROS_REPLY_SUFFIX; - topic_prefix = ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - request_prefix = FASTDDS_REQUEST_PREFIX; - request_suffix = FASTDDS_REQUEST_SUFFIX; - reply_prefix = FASTDDS_REPLY_PREFIX; - reply_suffix = FASTDDS_REPLY_SUFFIX; - topic_prefix = FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, - "Invalid RPC protocol"); - throw std::runtime_error("Invalid RPC protocol"); - } - - std::string base = topic_name; - if ((base.rfind(request_prefix, 0) == 0) && - (base.size() >= request_suffix.length()) && - (base.substr(base.size() - request_suffix.length()) == request_suffix)) - { - base = base.substr(request_prefix.length()); - base = base.substr(0, base.size() - (request_suffix.length())); - rpc_info.service_type = ServiceType::REQUEST; - rpc_info.service_name = base; - - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::GOAL; - return rpc_info; - } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::RESULT; - return rpc_info; - } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::CANCEL; - return rpc_info; - } - - rpc_info.rpc_type = RpcType::SERVICE; - return rpc_info; - } - if ((base.rfind(reply_prefix, 0) == 0) && - (base.size() >= reply_suffix.length()) && - (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) - { - base = base.substr(reply_prefix.length()); - base = base.substr(0, base.size() - (reply_suffix.length())); - rpc_info.service_type = ServiceType::REPLY; - rpc_info.service_name = base; - - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::GOAL; - return rpc_info; - } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::RESULT; - return rpc_info; - } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::CANCEL; - return rpc_info; - } - - rpc_info.rpc_type = RpcType::SERVICE; - return rpc_info; - } - - // Check for action feedback/status topics - base = base.substr(topic_prefix.length()); - if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && - base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == - (std::string("/") + ACTION_FEEDBACK_SUFFIX)) - { - rpc_info.action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::FEEDBACK; - return rpc_info; - } - if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && - base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == - (std::string("/") + ACTION_STATUS_SUFFIX)) - { - rpc_info.action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); - rpc_info.rpc_type = RpcType::ACTION; - rpc_info.action_type = ActionType::STATUS; - return rpc_info; - } - - return rpc_info; -} - UUID generate_UUID() { UUID uuid; From 944277c92941547aa08576474f9320e6296648e2 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 08:08:27 +0200 Subject: [PATCH 53/87] Move RPC logic to enabler participant Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 28 +- ddsenabler/src/cpp/DDSEnabler.cpp | 324 ++++------------ .../EnablerParticipant.hpp | 76 +++- .../src/cpp/EnablerParticipant.cpp | 363 +++++++++++++++++- 4 files changed, 518 insertions(+), 273 deletions(-) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 75af41e1..8d2306fa 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -154,7 +154,7 @@ class DDSEnabler * @param service_name The target service name. * @param json The JSON-formatted request data. * @param request_id Reference to store the unique request identifier. - * @param RpcProtocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the request was successfully sent, false otherwise. */ @@ -163,7 +163,13 @@ class DDSEnabler const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); + participants::RpcProtocol RpcProtocol); + + DDSENABLER_DllAPI + bool send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id); /** * @brief Sends a reply to the given service. @@ -198,14 +204,18 @@ class DDSEnabler * Failure may occur if there is an issue requesting the data types to user's app. * * @param action_name The name of the action to be announced. - * @param RpcProtocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the action was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_action( const std::string& action_name, - participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); + participants::RpcProtocol RpcProtocol); + + DDSENABLER_DllAPI + bool announce_action( + const std::string& action_name); /** * @brief Stops the server for the given action. @@ -317,7 +327,7 @@ class DDSEnabler * @param action_name The name of the action to send the goal to. * @param json The JSON data to be sent with the action goal. * @param goal_id Reference to store the unique identifier of the action goal. - * @param RpcProtocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the action goal was successfully sent, false otherwise. */ @@ -326,7 +336,13 @@ class DDSEnabler const std::string& action_name, const std::string& json, participants::UUID& goal_id, - participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); + participants::RpcProtocol RpcProtocol); + + DDSENABLER_DllAPI + bool send_action_goal( + const std::string& action_name, + const std::string& json, + participants::UUID& goal_id); /** * @brief Cancels an action goal for the specified action. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 21f5457e..dc54ed75 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -295,36 +295,27 @@ bool DDSEnabler::publish( bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, - uint64_t& request_id, - participants::RpcProtocol RpcProtocol) + uint64_t& request_id) { - std::string prefix, suffix; - switch (RpcProtocol) - { - case participants::RpcProtocol::ROS2: - prefix = participants::ROS_REQUEST_PREFIX; - suffix = participants::ROS_REQUEST_SUFFIX; - break; - case participants::RpcProtocol::FASTDDS: - prefix = participants::FASTDDS_REQUEST_PREFIX; - suffix = participants::FASTDDS_REQUEST_SUFFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send service request to service " << service_name << ": unknown RPC protocol."); - return false; - } + return send_service_request( + service_name, + json, + request_id, + participants::RpcProtocol::ROS2); +} - request_id = handler_->get_new_request_id(); - if (!enabler_participant_->publish_rpc( - prefix + service_name + suffix, - json, - request_id)) - { - return false; - } - return true; +bool DDSEnabler::send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id, + participants::RpcProtocol RpcProtocol) +{ + return enabler_participant_->send_service_request( + service_name, + json, + request_id, + RpcProtocol); } bool DDSEnabler::announce_service( @@ -345,100 +336,44 @@ bool DDSEnabler::send_service_reply( const std::string& json, const uint64_t request_id) { - RpcProtocol RpcProtocol = enabler_participant_->get_service_rpc_protocol(service_name); - std::string prefix, suffix; - switch (RpcProtocol) - { - case participants::RpcProtocol::ROS2: - prefix = participants::ROS_REPLY_PREFIX; - suffix = participants::ROS_REPLY_SUFFIX; - break; - case participants::RpcProtocol::FASTDDS: - prefix = participants::FASTDDS_REPLY_PREFIX; - suffix = participants::FASTDDS_REPLY_SUFFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send service reply to unknown service " << service_name); - return false; - } - - return enabler_participant_->publish_rpc( - prefix + service_name + suffix, + return enabler_participant_->send_service_reply( + service_name, json, request_id); } +bool DDSEnabler::send_action_goal( + const std::string& action_name, + const std::string& json, + UUID& action_id) +{ + return send_action_goal( + action_name, + json, + action_id, + participants::RpcProtocol::ROS2); +} + bool DDSEnabler::send_action_goal( const std::string& action_name, const std::string& json, UUID& action_id, participants::RpcProtocol RpcProtocol) { - std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); - std::string goal_request_topic = action_name + participants::ACTION_GOAL_SUFFIX; - uint64_t goal_request_id = 0; - - if (!send_service_request( - goal_request_topic, - goal_json, - goal_request_id, - RpcProtocol)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal request to action " << action_name); - return false; - } - - if (!handler_->store_action_request( - action_name, - action_id, - goal_request_id, - ActionType::GOAL, - RpcProtocol)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to store action goal request to action " << action_name); - handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); - return false; - } - - return true; + return enabler_participant_->send_action_goal( + action_name, + json, + action_id, + RpcProtocol); } bool DDSEnabler::send_action_get_result_request( const std::string& action_name, const UUID& action_id) { - std::string json = participants::RpcUtils::create_result_request_msg(action_id); - - std::string get_result_request_topic = action_name + participants::ACTION_RESULT_SUFFIX; - uint64_t get_result_request_id = 0; - - if (!send_service_request( - get_result_request_topic, - json, - get_result_request_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action get result request to action " << action_name); - return false; - } - - if (!handler_->store_action_request( - action_name, - action_id, - get_result_request_id, - ActionType::RESULT)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to store action get result request to action " << action_name - << ": cancelling."); - cancel_action_goal(action_name, action_id, 0); - return false; - } - - return true; + return enabler_participant_->send_action_get_result_request( + action_name, + action_id); } bool DDSEnabler::cancel_action_goal( @@ -446,31 +381,16 @@ bool DDSEnabler::cancel_action_goal( const participants::UUID& goal_id, const int64_t timestamp) { - if (goal_id != participants::UUID() && - !handler_->is_UUID_active(action_name, goal_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to cancel action goal for action " << action_name - << ": goal id not found."); - return false; - } - - std::string cancel_json = participants::RpcUtils::create_cancel_request_msg(goal_id, timestamp); - - uint64_t cancel_request_id = 0; - std::string cancel_request_topic = action_name + participants::ACTION_CANCEL_SUFFIX; - - if (send_service_request( - cancel_request_topic, - cancel_json, - cancel_request_id)) - { - return true; - } + return enabler_participant_->cancel_action_goal( + action_name, + goal_id, + timestamp); +} - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action cancel goal to action " << action_name); - return false; +bool DDSEnabler::announce_action( + const std::string& action_name) +{ + return announce_action(action_name, participants::RpcProtocol::ROS2); } bool DDSEnabler::announce_action( @@ -491,18 +411,10 @@ void DDSEnabler::send_action_send_goal_reply( const uint64_t goal_id, bool accepted) { - std::string reply_json = participants::RpcUtils::create_goal_reply_msg(accepted); - - if (!send_service_reply( - action_name + participants::ACTION_GOAL_SUFFIX, - reply_json, - goal_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal reply to action " << action_name - << ": goal id not found."); - } - return; + enabler_participant_->send_action_send_goal_reply( + action_name, + goal_id, + accepted); } bool DDSEnabler::send_action_cancel_goal_reply( @@ -511,30 +423,11 @@ bool DDSEnabler::send_action_cancel_goal_reply( const participants::CancelCode& cancel_code, const uint64_t request_id) { - std::vector> cancelling_goals; - for (const auto& goal_id : goal_ids) - { - std::chrono::system_clock::time_point timestamp; - if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) - { - continue; - } - - cancelling_goals.emplace_back(goal_id, timestamp); - } - std::string reply_json = participants::RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); - - if (!send_service_reply( - std::string(action_name) + participants::ACTION_CANCEL_SUFFIX, - reply_json, - request_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action cancel reply to action " << action_name - << ": request id not found."); - return false; - } - return true; + return enabler_participant_->send_action_cancel_goal_reply( + action_name, + goal_ids, + cancel_code, + request_id); } bool DDSEnabler::send_action_result( @@ -543,17 +436,11 @@ bool DDSEnabler::send_action_result( const participants::StatusCode& status_code, const char* json) { - if (!handler_->is_UUID_active(action_name, goal_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action result to action " << action_name - << ": goal id not found."); - return false; - } - - std::string reply_json = participants::RpcUtils::create_result_reply_msg(status_code, json); - - return handler_->handle_action_result(action_name, goal_id, reply_json); + return enabler_participant_->send_action_result( + action_name, + goal_id, + status_code, + json); } bool DDSEnabler::send_action_get_result_reply( @@ -562,18 +449,11 @@ bool DDSEnabler::send_action_get_result_reply( const std::string& reply_json, const uint64_t request_id) { - std::string result_topic = action_name + participants::ACTION_RESULT_SUFFIX; - - if (send_service_reply( - result_topic, - reply_json, - request_id)) - { - handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); - return true; - } - - return false; + return enabler_participant_->send_action_get_result_reply( + action_name, + goal_id, + reply_json, + request_id); } bool DDSEnabler::send_action_feedback( @@ -581,36 +461,10 @@ bool DDSEnabler::send_action_feedback( const char* json, const participants::UUID& goal_id) { - if (!handler_->is_UUID_active(action_name, goal_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action feedback to action " << action_name - << ": goal id not found."); - return false; - } - - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); - - std::string prefix; - switch (protocol) - { - case RpcProtocol::ROS2: - prefix = participants::ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - prefix = participants::FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send feedback to action " << action_name - << ": unsupported RPC protocol."); - return false; - } - - std::string feedback_json = participants::RpcUtils::create_feedback_msg(json, goal_id); - std::string feedback_topic = prefix + std::string(action_name) + participants::ACTION_FEEDBACK_SUFFIX; - - return enabler_participant_->publish(feedback_topic, feedback_json); + return enabler_participant_->send_action_feedback( + action_name, + json, + goal_id); } bool DDSEnabler::update_action_status( @@ -618,36 +472,10 @@ bool DDSEnabler::update_action_status( const participants::UUID& goal_id, const participants::StatusCode& status_code) { - std::chrono::system_clock::time_point goal_accepted_stamp; - if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to update action status to action " << action_name - << ": goal id not found."); - return false; - } - - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); - - std::string prefix; - switch (protocol) - { - case RpcProtocol::ROS2: - prefix = participants::ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - prefix = participants::FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send status to action " << action_name - << ": unsupported RPC protocol."); - return false; - } - - std::string status_json = participants::RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); - std::string status_topic = prefix + action_name + participants::ACTION_STATUS_SUFFIX; - return enabler_participant_->publish(status_topic, status_json); + return enabler_participant_->update_action_status( + action_name, + goal_id, + status_code); } } /* namespace ddsenabler */ diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 7bd6f0f2..cf2e872a 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -100,12 +100,21 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI - RpcProtocol get_service_rpc_protocol( - const std::string& service_name); + bool send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id, + participants::RpcProtocol RpcProtocol); DDSENABLER_PARTICIPANTS_DllAPI - bool announce_action( - const std::string& action_name); + bool send_service_reply( + const std::string& service_name, + const std::string& json, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + RpcProtocol get_service_rpc_protocol( + const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( @@ -116,6 +125,63 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool revoke_action( const std::string& action_name); + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_goal( + const std::string& action_name, + const std::string& json, + UUID& action_id, + participants::RpcProtocol RpcProtocol); + + DDSENABLER_PARTICIPANTS_DllAPI + bool cancel_action_goal( + const std::string& action_name, + const UUID& goal_id, + const int64_t timestamp); + + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_get_result_request( + const std::string& action_name, + const UUID& action_id); + + DDSENABLER_PARTICIPANTS_DllAPI + void send_action_send_goal_reply( + const std::string& action_name, + const uint64_t goal_id, + bool accepted); + + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_cancel_goal_reply( + const char* action_name, + const std::vector& goal_ids, + const CancelCode& cancel_code, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_result( + const char* action_name, + const UUID& goal_id, + const StatusCode& status_code, + const char* json); + + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_get_result_reply( + const std::string& action_name, + const UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id); + + DDSENABLER_PARTICIPANTS_DllAPI + bool send_action_feedback( + const char* action_name, + const char* json, + const UUID& goal_id); + + DDSENABLER_PARTICIPANTS_DllAPI + bool update_action_status( + const std::string& action_name, + const UUID& goal_id, + const StatusCode& status_code); + protected: bool query_topic_nts_( @@ -190,6 +256,8 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant ServiceQuery service_query_callback_; ActionQuery action_query_callback_; + + std::shared_ptr handler_; }; } /* namespace participants */ diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index aab04664..79f9124d 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -43,6 +43,7 @@ EnablerParticipant::EnablerParticipant( std::shared_ptr schema_handler) : ddspipe::participants::SchemaParticipant(participant_configuration, payload_pool, discovery_database, schema_handler) + , handler_(std::static_pointer_cast(schema_handler_)) { } @@ -124,7 +125,7 @@ std::shared_ptr EnablerParticipant::create_reader( if (service_discovered_nts_(rpc_info, dds_topic)) { RpcTopic service = services_.find(rpc_info->service_name)->second->get_service(); - std::static_pointer_cast(schema_handler_)->add_service(service); + handler_->add_service(service); } } else if (RpcType::ACTION == rpc_info->rpc_type) @@ -134,7 +135,7 @@ std::shared_ptr EnablerParticipant::create_reader( try { auto action = actions_.find(rpc_info->action_name)->second->get_action(); - std::static_pointer_cast(schema_handler_)->add_action(action); + handler_->add_action(action); } catch (const std::exception& e) { @@ -152,7 +153,7 @@ std::shared_ptr EnablerParticipant::create_reader( // Only notify the discovery of topics that do not originate from a topic query callback if (dds_topic.topic_discoverer() != this->id()) { - std::static_pointer_cast(schema_handler_)->add_topic(dds_topic); + handler_->add_topic(dds_topic); } } readers_[dds_topic] = reader; @@ -242,7 +243,7 @@ bool EnablerParticipant::publish( auto data = std::make_unique(); Payload payload; - if (!std::static_pointer_cast(schema_handler_)->get_serialized_data(type_name, json, payload)) + if (!handler_->get_serialized_data(type_name, json, payload)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic_name << " : data serialization failed."); @@ -322,7 +323,7 @@ bool EnablerParticipant::publish_rpc( auto data = std::make_unique(); Payload payload; - if (!std::static_pointer_cast(schema_handler_)->get_serialized_data(type_name, json, payload)) + if (!handler_->get_serialized_data(type_name, json, payload)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in topic " << topic.m_topic_name << " : data serialization failed."); @@ -456,6 +457,70 @@ bool EnablerParticipant::revoke_service_nts_( return true; } +bool EnablerParticipant::send_service_request( + const std::string& service_name, + const std::string& json, + uint64_t& request_id, + RpcProtocol RpcProtocol) +{ + std::string prefix, suffix; + switch (RpcProtocol) + { + case RpcProtocol::ROS2: + prefix = ROS_REQUEST_PREFIX; + suffix = ROS_REQUEST_SUFFIX; + break; + case RpcProtocol::FASTDDS: + prefix = FASTDDS_REQUEST_PREFIX; + suffix = FASTDDS_REQUEST_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service request to service " << service_name << ": unknown RPC protocol."); + return false; + } + + request_id = handler_->get_new_request_id(); + if (!publish_rpc( + prefix + service_name + suffix, + json, + request_id)) + { + return false; + } + + return true; +} + +bool EnablerParticipant::send_service_reply( + const std::string& service_name, + const std::string& json, + const uint64_t request_id) +{ + RpcProtocol RpcProtocol = get_service_rpc_protocol(service_name); + std::string prefix, suffix; + switch (RpcProtocol) + { + case RpcProtocol::ROS2: + prefix = ROS_REPLY_PREFIX; + suffix = ROS_REPLY_SUFFIX; + break; + case RpcProtocol::FASTDDS: + prefix = FASTDDS_REPLY_PREFIX; + suffix = FASTDDS_REPLY_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service reply to unknown service " << service_name); + return false; + } + + return publish_rpc( + prefix + service_name + suffix, + json, + request_id); +} + RpcProtocol EnablerParticipant::get_service_rpc_protocol( const std::string& service_name) { @@ -469,12 +534,6 @@ RpcProtocol EnablerParticipant::get_service_rpc_protocol( return RpcProtocol::PROTOCOL_UNKNOWN; } -bool EnablerParticipant::announce_action( - const std::string& action_name) -{ - return announce_action(action_name, RpcProtocol::ROS2); -} - bool EnablerParticipant::announce_action( const std::string& action_name, RpcProtocol RpcProtocol) @@ -577,7 +636,7 @@ bool EnablerParticipant::query_topic_nts_( " : topic is unknown and topic query callback not set."); return false; } - participants::TopicInfo topic_info; + TopicInfo topic_info; if (!topic_query_callback_(topic_name.c_str(), topic_info)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -611,7 +670,7 @@ bool EnablerParticipant::fill_topic_struct_nts_( } fastdds::dds::xtypes::TypeIdentifier type_identifier; - if (!std::static_pointer_cast(schema_handler_)->get_type_identifier(topic_info.type_name, type_identifier)) + if (!handler_->get_type_identifier(topic_info.type_name, type_identifier)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to create topic " << topic_name << " : type identifier not found."); @@ -823,7 +882,7 @@ bool EnablerParticipant::query_action_nts_( return false; } - std::string feedback_topic_name = prefix + action.action_name + participants::ACTION_FEEDBACK_SUFFIX; + std::string feedback_topic_name = prefix + action.action_name + ACTION_FEEDBACK_SUFFIX; DdsTopic feedback_topic; if (!fill_topic_struct_nts_( feedback_topic_name, @@ -847,7 +906,7 @@ bool EnablerParticipant::query_action_nts_( action.feedback = feedback_topic; action.feedback_discovered = true; - std::string status_topic_name = prefix + action.action_name + participants::ACTION_STATUS_SUFFIX; + std::string status_topic_name = prefix + action.action_name + ACTION_STATUS_SUFFIX; DdsTopic status_topic; if (!fill_topic_struct_nts_( status_topic_name, @@ -898,6 +957,280 @@ std::shared_ptr EnablerParticipant::lookup_reader_nts_( return lookup_reader_nts_(topic_name, _); } +bool EnablerParticipant::send_action_goal( + const std::string& action_name, + const std::string& json, + UUID& action_id, + RpcProtocol RpcProtocol) +{ + std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); + std::string goal_request_topic = action_name + ACTION_GOAL_SUFFIX; + uint64_t goal_request_id = 0; + + if (!send_service_request( + goal_request_topic, + goal_json, + goal_request_id, + RpcProtocol)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal request to action " << action_name); + return false; + } + + if (!handler_->store_action_request( + action_name, + action_id, + goal_request_id, + ActionType::GOAL, + RpcProtocol)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action goal request to action " << action_name); + handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); + return false; + } + + return true; +} + +bool EnablerParticipant::cancel_action_goal( + const std::string& action_name, + const UUID& goal_id, + const int64_t timestamp) +{ + if (goal_id != UUID() && + !handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to cancel action goal for action " << action_name + << ": goal id not found."); + return false; + } + + std::string cancel_json = RpcUtils::create_cancel_request_msg(goal_id, timestamp); + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + uint64_t cancel_request_id = 0; + std::string cancel_request_topic = action_name + ACTION_CANCEL_SUFFIX; + + if (send_service_request( + cancel_request_topic, + cancel_json, + cancel_request_id, + protocol)) + { + return true; + } + + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel goal to action " << action_name); + return false; +} + +bool EnablerParticipant::send_action_get_result_request( + const std::string& action_name, + const UUID& action_id) +{ + std::string json = RpcUtils::create_result_request_msg(action_id); + + std::string get_result_request_topic = action_name + ACTION_RESULT_SUFFIX; + uint64_t get_result_request_id = 0; + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, action_id); + + if (!send_service_request( + get_result_request_topic, + json, + get_result_request_id, + protocol)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result request to action " << action_name); + return false; + } + + if (!handler_->store_action_request( + action_name, + action_id, + get_result_request_id, + ActionType::RESULT)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action get result request to action " << action_name + << ": cancelling."); + cancel_action_goal(action_name, action_id, 0); + return false; + } + + return true; +} + +void EnablerParticipant::send_action_send_goal_reply( + const std::string& action_name, + const uint64_t goal_id, + bool accepted) +{ + std::string reply_json = RpcUtils::create_goal_reply_msg(accepted); + + if (!send_service_reply( + action_name + ACTION_GOAL_SUFFIX, + reply_json, + goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal reply to action " << action_name + << ": goal id not found."); + } + return; +} + +bool EnablerParticipant::send_action_cancel_goal_reply( + const char* action_name, + const std::vector& goal_ids, + const CancelCode& cancel_code, + const uint64_t request_id) +{ + std::vector> cancelling_goals; + for (const auto& goal_id : goal_ids) + { + std::chrono::system_clock::time_point timestamp; + if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) + { + continue; + } + + cancelling_goals.emplace_back(goal_id, timestamp); + } + std::string reply_json = RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); + + if (!send_service_reply( + std::string(action_name) + ACTION_CANCEL_SUFFIX, + reply_json, + request_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel reply to action " << action_name + << ": request id not found."); + return false; + } + return true; +} + +bool EnablerParticipant::send_action_result( + const char* action_name, + const UUID& goal_id, + const StatusCode& status_code, + const char* json) +{ + if (!handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action result to action " << action_name + << ": goal id not found."); + return false; + } + + std::string reply_json = RpcUtils::create_result_reply_msg(status_code, json); + + return handler_->handle_action_result(action_name, goal_id, reply_json); +} + +bool EnablerParticipant::send_action_get_result_reply( + const std::string& action_name, + const UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id) +{ + std::string result_topic = action_name + ACTION_RESULT_SUFFIX; + + if (send_service_reply( + result_topic, + reply_json, + request_id)) + { + handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); + return true; + } + + return false; +} + +bool EnablerParticipant::send_action_feedback( + const char* action_name, + const char* json, + const UUID& goal_id) +{ + if (!handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action feedback to action " << action_name + << ": goal id not found."); + return false; + } + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) + { + case RpcProtocol::ROS2: + prefix = ROS_TOPIC_PREFIX; + break; + case RpcProtocol::FASTDDS: + prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send feedback to action " << action_name + << ": unsupported RPC protocol."); + return false; + } + + std::string feedback_json = RpcUtils::create_feedback_msg(json, goal_id); + std::string feedback_topic = prefix + std::string(action_name) + ACTION_FEEDBACK_SUFFIX; + + return publish(feedback_topic, feedback_json); +} + +bool EnablerParticipant::update_action_status( + const std::string& action_name, + const UUID& goal_id, + const StatusCode& status_code) +{ + std::chrono::system_clock::time_point goal_accepted_stamp; + if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to update action status to action " << action_name + << ": goal id not found."); + return false; + } + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) + { + case RpcProtocol::ROS2: + prefix = ROS_TOPIC_PREFIX; + break; + case RpcProtocol::FASTDDS: + prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send status to action " << action_name + << ": unsupported RPC protocol."); + return false; + } + + std::string status_json = RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); + std::string status_topic = prefix + action_name + ACTION_STATUS_SUFFIX; + return publish(status_topic, status_json); +} + } /* namespace participants */ } /* namespace ddsenabler */ } /* namespace eprosima */ From 1973b991b8af1527b6cb9c4df180ef116a90f884 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 08:46:32 +0200 Subject: [PATCH 54/87] rpc specific subfolder Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 2 +- ddsenabler/src/cpp/DDSEnabler.cpp | 5 +++-- .../include/ddsenabler_participants/Callbacks.hpp | 2 +- .../include/ddsenabler_participants/EnablerParticipant.hpp | 4 ++-- .../include/ddsenabler_participants/Handler.hpp | 4 ++-- .../include/ddsenabler_participants/Writer.hpp | 4 ++-- .../include/ddsenabler_participants/{ => rpc}/RpcStructs.hpp | 2 +- .../include/ddsenabler_participants/{ => rpc}/RpcTypes.hpp | 0 .../include/ddsenabler_participants/{ => rpc}/RpcUtils.hpp | 4 ++-- ddsenabler_participants/src/cpp/RpcUtils.cpp | 2 +- ddsenabler_participants/src/cpp/Writer.cpp | 2 +- 11 files changed, 16 insertions(+), 15 deletions(-) rename ddsenabler_participants/include/ddsenabler_participants/{ => rpc}/RpcStructs.hpp (99%) rename ddsenabler_participants/include/ddsenabler_participants/{ => rpc}/RpcTypes.hpp (100%) rename ddsenabler_participants/include/ddsenabler_participants/{ => rpc}/RpcUtils.hpp (97%) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 8d2306fa..bb39d512 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index dc54ed75..584363c8 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include #include #include -#include "ddsenabler/DDSEnabler.hpp" -#include "ddsenabler_participants/RpcUtils.hpp" +#include namespace eprosima { namespace ddsenabler { diff --git a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp index a6c2f749..99347e17 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Callbacks.hpp @@ -22,7 +22,7 @@ #include #include -#include "RpcTypes.hpp" +#include namespace eprosima { namespace ddsenabler { diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index cf2e872a..10f1a90d 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include namespace eprosima { diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 91635cd6..7b2b4043 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include namespace std { diff --git a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp index d9df3d4e..8f14eac7 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Writer.hpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include namespace eprosima { namespace ddsenabler { diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp similarity index 99% rename from ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp rename to ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index 3371e6a8..3b2fbc22 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -19,7 +19,7 @@ #pragma once -#include +#include #include #include diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp similarity index 100% rename from ddsenabler_participants/include/ddsenabler_participants/RpcTypes.hpp rename to ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp diff --git a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcUtils.hpp similarity index 97% rename from ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp rename to ddsenabler_participants/include/ddsenabler_participants/rpc/RpcUtils.hpp index 678d8245..44281312 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/RpcUtils.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcUtils.hpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index b846a491..3ef0e821 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -16,7 +16,7 @@ * @file RpcUtils.cpp */ -#include +#include #include #include diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index bfcea2af..1a923b83 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include From 378600cf08ab95cdf24aa8e07189b103cb0c358a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 08:58:12 +0200 Subject: [PATCH 55/87] Random from dev utils Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/RpcUtils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/RpcUtils.cpp index 3ef0e821..f70ec2f3 100644 --- a/ddsenabler_participants/src/cpp/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/RpcUtils.cpp @@ -18,6 +18,8 @@ #include +#include + #include #include #include @@ -31,13 +33,11 @@ namespace RpcUtils { UUID generate_UUID() { UUID uuid; - std::random_device rd; - std::mt19937 gen(rd()); - std::uniform_int_distribution dis(0, 255); + utils::RandomManager rm; for (size_t i = 0; i < sizeof(uuid); ++i) { - uuid[i] = static_cast(dis(gen)); + uuid[i] = static_cast(rm.pure_rand()); } return uuid; } From f0adba67c0399e55c8f91e263632eb78ae3c34ce Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 09:17:47 +0200 Subject: [PATCH 56/87] General fixes Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 2 +- .../src/cpp/EnablerParticipant.cpp | 19 ++++++++++++++----- .../services/service_client/compose.yml | 2 +- .../services/service_server/compose.yml | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 10f1a90d..2565faf3 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -218,7 +218,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const TopicInfo& topic_info, ddspipe::core::types::DdsTopic& topic); - bool fullfill_service_type_nts_( + bool fulfill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, RpcProtocol RpcProtocol); diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 79f9124d..62685a35 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -486,6 +486,8 @@ bool EnablerParticipant::send_service_request( json, request_id)) { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send service request to service " << service_name); return false; } @@ -576,6 +578,8 @@ bool EnablerParticipant::announce_action( std::shared_ptr action = std::make_shared(action_name, RpcProtocol); if (!query_action_nts_(*action, RpcProtocol, lck)) { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action_name << " : action type request failed."); return false; } @@ -622,6 +626,8 @@ bool EnablerParticipant::revoke_action( return true; } + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to stop action " << action_name << " : error revoking action services."); return false; } @@ -685,7 +691,7 @@ bool EnablerParticipant::fill_topic_struct_nts_( return true; } -bool EnablerParticipant::fullfill_service_type_nts_( +bool EnablerParticipant::fulfill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, RpcProtocol RpcProtocol) @@ -762,7 +768,7 @@ bool EnablerParticipant::query_service_nts_( return false; } - return fullfill_service_type_nts_(service_info, service, RpcProtocol); + return fulfill_service_type_nts_(service_info, service, RpcProtocol); } bool EnablerParticipant::query_action_nts_( @@ -809,7 +815,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr goal_service = std::make_shared(goal_service_name, RpcProtocol); - if (!fullfill_service_type_nts_( + if (!fulfill_service_type_nts_( action_info.goal, goal_service, RpcProtocol)) @@ -829,7 +835,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr cancel_service = std::make_shared(cancel_service_name, RpcProtocol); - if (!fullfill_service_type_nts_( + if (!fulfill_service_type_nts_( action_info.cancel, cancel_service, RpcProtocol)) @@ -849,7 +855,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr result_service = std::make_shared(result_service_name, RpcProtocol); - if (!fullfill_service_type_nts_( + if (!fulfill_service_type_nts_( action_info.result, result_service, RpcProtocol)) @@ -1154,6 +1160,9 @@ bool EnablerParticipant::send_action_get_result_reply( return true; } + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result to action " << action_name); + return false; } diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml index 52d460d6..5eb61a70 100644 --- a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -30,4 +30,4 @@ services: networks: std_net: default: - driver: none \ No newline at end of file + driver: none diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index a51e2e0a..0f2b0ef2 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -51,4 +51,4 @@ services: networks: std_net: default: - driver: none \ No newline at end of file + driver: none From dd9e88de674c9313825b9190f8d84a45a9050435 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 10:46:47 +0200 Subject: [PATCH 57/87] Servers as external Signed-off-by: Eugenio Collado --- .../rpc/RpcStructs.hpp | 2 + .../src/cpp/EnablerParticipant.cpp | 51 +++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index 3b2fbc22..d70e30c9 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -358,6 +358,7 @@ struct ServiceDiscovered std::optional endpoint_request; bool enabler_as_server{false}; + bool external_server{false}; bool add_topic( const ddspipe::core::types::DdsTopic& topic, @@ -481,6 +482,7 @@ struct ActionDiscovered bool status_discovered{false}; bool fully_discovered{false}; bool enabler_as_server{false}; + bool external_server{false}; bool check_fully_discovered() { diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 62685a35..2713af4d 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -53,7 +53,12 @@ bool EnablerParticipant::service_discovered_nts_( { auto [it, inserted] = services_.try_emplace(rpc_info->service_name, std::make_shared(rpc_info->service_name, rpc_info->rpc_protocol)); - return it->second->add_topic(topic, rpc_info->service_type); + if (it->second->add_topic(topic, rpc_info->service_type)) + { + it->second->external_server = true; + return true; + } + return false; } bool EnablerParticipant::action_discovered_nts_( @@ -80,7 +85,12 @@ bool EnablerParticipant::action_discovered_nts_( it->second->add_topic(topic, rpc_info->action_type); } - return it->second->check_fully_discovered(); + if (it->second->check_fully_discovered()) + { + it->second->external_server = true; + return true; + } + return false; } std::shared_ptr EnablerParticipant::create_reader( @@ -124,8 +134,17 @@ std::shared_ptr EnablerParticipant::create_reader( { if (service_discovered_nts_(rpc_info, dds_topic)) { - RpcTopic service = services_.find(rpc_info->service_name)->second->get_service(); - handler_->add_service(service); + try + { + RpcTopic service = services_.find(rpc_info->service_name)->second->get_service(); + handler_->add_service(service); + } + catch (const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to add service " << rpc_info->service_name << ": " << e.what()); + return std::make_shared(); + } } } else if (RpcType::ACTION == rpc_info->rpc_type) @@ -146,6 +165,10 @@ std::shared_ptr EnablerParticipant::create_reader( } } } + else + { + std::cout << "Topic " << dds_topic.m_topic_name << " discovered from topic query callback. Not adding RPC." << std::endl; + } } else { @@ -295,6 +318,13 @@ bool EnablerParticipant::publish_rpc( return false; } + if (!it->second->external_server && rpc_info->service_type == ServiceType::REQUEST) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to publish data in service " << rpc_info->service_name << " : service is only announced on the enabler side."); + return false; + } + std::string type_name; auto reader = std::dynamic_pointer_cast(lookup_reader_nts_(topic_name, type_name)); @@ -442,6 +472,12 @@ bool EnablerParticipant::revoke_service_nts_( return false; } + if (it->second->external_server) + { + it->second->enabler_as_server = false; + return true; + } + std::string request_name = it->second->topic_request.m_topic_name; this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); @@ -599,6 +635,7 @@ bool EnablerParticipant::revoke_action( "Failed to stop action " << action_name << " : action not found."); return false; } + if (!it->second->enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -606,6 +643,12 @@ bool EnablerParticipant::revoke_action( return false; } + if (it->second->external_server) + { + it->second->enabler_as_server = false; + return true; + } + auto action = it->second; auto goal = action->goal.lock(); From e1b389c225286cba5d4fdf7c9fe5e20d36679d67 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 11:00:54 +0200 Subject: [PATCH 58/87] Right variable name Signed-off-by: Eugenio Collado --- ddsenabler/examples/service/main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 2e786742..91d9964b 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -38,6 +38,7 @@ CLIParser::example_config config; bool service_discovered_ = false; uint32_t received_replies_ = 0; +uint32_t sent_replies_ = 0; std::vector> received_requests_; std::mutex app_mutex_; std::condition_variable app_cv_; @@ -355,7 +356,7 @@ bool server_specific_logic( const std::string& request, uint64_t request_id) { - std::this_thread::sleep_for(std::chrono::milliseconds(500)); // Simulate processing time + std::this_thread::sleep_for(std::chrono::milliseconds(200)); // Simulate processing time std::string json = "{\"sum\": 3}"; // Example response, replace with actual logic if (!enabler->send_service_reply(service_name, json, request_id)) { @@ -403,8 +404,10 @@ bool server_routine( // Check if we have received the expected number of requests { std::lock_guard lock(app_mutex_); - if (++received_replies_ >= expected_requests) + if (++sent_replies_ >= expected_requests) { + // Wait to ensure the last sent reply reaches destination + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); return true; } } From 94ca6c72f1b7f2e3a9e6f4bf17e6a8c43f88b090 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 11:11:22 +0200 Subject: [PATCH 59/87] No need for signal handler Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 12 ------------ ddsenabler/examples/service/main.cpp | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index a5a5ecf3..177aa1e7 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -41,7 +41,6 @@ uint32_t received_results_ = 0; std::vector> received_requests_; std::mutex app_mutex_; std::condition_variable app_cv_; -bool stop_app_ = false; const std::string REQUESTS_SUBDIR = "goals"; const std::string TYPES_SUBDIR = "types"; @@ -498,17 +497,6 @@ bool server_routine( return true; } -void signal_handler( - int signum) -{ - std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; - { - std::lock_guard lock(app_mutex_); - stop_app_ = true; - } - app_cv_.notify_all(); -} - int main( int argc, char** argv) diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 91d9964b..b8b6f816 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -42,7 +42,6 @@ uint32_t sent_replies_ = 0; std::vector> received_requests_; std::mutex app_mutex_; std::condition_variable app_cv_; -bool stop_app_ = false; const std::string REQUESTS_SUBDIR = "requests"; const std::string TYPES_SUBDIR = "types"; @@ -421,17 +420,6 @@ bool server_routine( } } -void signal_handler( - int signum) -{ - std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; - { - std::lock_guard lock(app_mutex_); - stop_app_ = true; - } - app_cv_.notify_all(); -} - int main( int argc, char** argv) From bbed852a7cff00332ae8d3d3e2065e2b752fdd7e Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 11:26:33 +0200 Subject: [PATCH 60/87] Mandatory arguments in examples Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 56 +++++++++++------------ ddsenabler/examples/action/Readme.md | 11 ++++- ddsenabler/examples/service/CLIParser.hpp | 56 +++++++++++------------ ddsenabler/examples/service/Readme.md | 10 +++- 4 files changed, 73 insertions(+), 60 deletions(-) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 26f698e7..26efaa13 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -49,7 +49,7 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_action [options]" << + std::cout << "Usage: ddsenabler_example_action [options]" << std::endl; std::cout << "" << std::endl; @@ -61,10 +61,6 @@ class CLIParser std::endl; std::cout << " (Default: 'Fibonacci/_action/')" << std::endl; - std::cout << "-client Run as a client (mutually exclusive with -server)" << - std::endl; - std::cout << "-server Run as a server (mutually exclusive with -client)" << - std::endl; std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; std::cout << " program if expectations are not met" << @@ -111,14 +107,37 @@ class CLIParser if (argc < 2) { - std::cerr << "Configuration file path is required" << std::endl; + std::cerr << "Mode is required as the first argument: 'client' or 'server'" << std::endl; print_help(EXIT_FAILURE); } bool client_flag = false; bool server_flag = false; - for (int i = 1; i < argc; ++i) + // First positional argument must be the mode + std::string mode = argv[1]; + if (mode == "-h" || mode == "--help") + { + print_help(EXIT_SUCCESS); + } + else if (mode == "client") + { + client_flag = true; + config.announce_server = false; + } + else if (mode == "server") + { + server_flag = true; + config.announce_server = true; + } + else + { + std::cerr << "Invalid mode '" << mode << "'. First argument must be 'client' or 'server'" << std::endl; + print_help(EXIT_FAILURE); + } + + // Parse optional arguments starting from index 2 + for (int i = 2; i < argc; ++i) { std::string arg = argv[i]; @@ -155,26 +174,6 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "-client") - { - if (server_flag) - { - std::cerr << "Cannot specify both -client and -server flags" << std::endl; - print_help(EXIT_FAILURE); - } - client_flag = true; - config.announce_server = false; - } - else if (arg == "-server") - { - if (client_flag) - { - std::cerr << "Cannot specify both -client and -server flags" << std::endl; - print_help(EXIT_FAILURE); - } - server_flag = true; - config.announce_server = true; - } else if (arg == "--timeout") { if (++i < argc) @@ -270,9 +269,10 @@ class CLIParser } } + // Sanity check (should be set from the positional mode) if (!client_flag && !server_flag) { - std::cerr << "Either -client or -server flag must be specified" << std::endl; + std::cerr << "Either 'client' or 'server' must be specified as the first argument" << std::endl; print_help(EXIT_FAILURE); } diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index a3cea045..1f002f0d 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -10,10 +10,17 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action -client --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 --cancel-requests false +./install/ddsenabler/bin/ddsenabler_example_action client \ + --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ + --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --request-initial-wait 3 \ + --cancel-requests false ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action -server --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_action server \ + --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ + --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --expected-requests 3 ``` diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index 83e0938b..d1d86d4f 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -48,7 +48,7 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_service [options]" << + std::cout << "Usage: ddsenabler_example_service [options]" << std::endl; std::cout << "" << std::endl; @@ -60,10 +60,6 @@ class CLIParser std::endl; std::cout << " (Default: 'add_two_ints')" << std::endl; - std::cout << "-client Run as a client (mutually exclusive with -server)" << - std::endl; - std::cout << "-server Run as a server (mutually exclusive with -client)" << - std::endl; std::cout << "--timeout Time (seconds) to wait before stopping the" << std::endl; std::cout << " program if expectations are not met" << @@ -106,14 +102,37 @@ class CLIParser if (argc < 2) { - std::cerr << "Configuration file path is required" << std::endl; + std::cerr << "Mode is required as the first argument: 'client' or 'server'" << std::endl; print_help(EXIT_FAILURE); } bool client_flag = false; bool server_flag = false; - for (int i = 1; i < argc; ++i) + // First positional argument must be the mode + std::string mode = argv[1]; + if (mode == "-h" || mode == "--help") + { + print_help(EXIT_SUCCESS); + } + else if (mode == "client") + { + client_flag = true; + config.announce_server = false; + } + else if (mode == "server") + { + server_flag = true; + config.announce_server = true; + } + else + { + std::cerr << "Invalid mode '" << mode << "'. First argument must be 'client' or 'server'" << std::endl; + print_help(EXIT_FAILURE); + } + + // Parse optional arguments starting from index 2 + for (int i = 2; i < argc; ++i) { std::string arg = argv[i]; @@ -150,26 +169,6 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "-client") - { - if (server_flag) - { - std::cerr << "Cannot specify both -client and -server flags" << std::endl; - print_help(EXIT_FAILURE); - } - client_flag = true; - config.announce_server = false; - } - else if (arg == "-server") - { - if (client_flag) - { - std::cerr << "Cannot specify both -client and -server flags" << std::endl; - print_help(EXIT_FAILURE); - } - server_flag = true; - config.announce_server = true; - } else if (arg == "--timeout") { if (++i < argc) @@ -251,9 +250,10 @@ class CLIParser } } + // Sanity check (should be set from the positional mode) if (!client_flag && !server_flag) { - std::cerr << "Either -client or -server flag must be specified" << std::endl; + std::cerr << "Either 'client' or 'server' must be specified as the first argument" << std::endl; print_help(EXIT_FAILURE); } diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 9383739b..0f7a5550 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,10 +10,16 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service -client --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --request-initial-wait 3 +./install/ddsenabler/bin/ddsenabler_example_service client \ + --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ + --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --request-initial-wait 3 ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service -server --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml --expected-requests 3 +./install/ddsenabler/bin/ddsenabler_example_service server \ + --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ + --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --expected-requests 3 ``` From 12a71b529b9d0c5328d1c000460cef91438795f0 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 12:18:21 +0200 Subject: [PATCH 61/87] Examples improvement Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 37 ++++++++++++++-- ddsenabler/examples/action/CMakeLists.txt | 16 ++++++- ddsenabler/examples/action/Readme.md | 9 ++-- ddsenabler/examples/action/config.yml | 26 ----------- ddsenabler/examples/action/config_action.yml | 11 +++++ .../examples/{persistence => action}/goals/1 | 0 .../examples/{persistence => action}/goals/2 | 0 .../examples/{persistence => action}/goals/3 | 0 ddsenabler/examples/action/main.cpp | 13 ++++-- ddsenabler/examples/service/CLIParser.hpp | 43 +++++++++++++++++-- ddsenabler/examples/service/CMakeLists.txt | 16 ++++++- ddsenabler/examples/service/Readme.md | 9 ++-- ddsenabler/examples/service/config.yml | 26 ----------- .../examples/service/config_service.yml | 11 +++++ ddsenabler/examples/service/main.cpp | 13 ++++-- .../{persistence => service}/requests/1 | 0 .../{persistence => service}/requests/2 | 0 .../{persistence => service}/requests/3 | 0 18 files changed, 152 insertions(+), 78 deletions(-) delete mode 100644 ddsenabler/examples/action/config.yml create mode 100644 ddsenabler/examples/action/config_action.yml rename ddsenabler/examples/{persistence => action}/goals/1 (100%) rename ddsenabler/examples/{persistence => action}/goals/2 (100%) rename ddsenabler/examples/{persistence => action}/goals/3 (100%) delete mode 100644 ddsenabler/examples/service/config.yml create mode 100644 ddsenabler/examples/service/config_service.yml rename ddsenabler/examples/{persistence => service}/requests/1 (100%) rename ddsenabler/examples/{persistence => service}/requests/2 (100%) rename ddsenabler/examples/{persistence => service}/requests/3 (100%) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 26efaa13..3160874b 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -34,6 +34,7 @@ class CLIParser bool announce_server = true; uint32_t timeout = 30; std::string persistence_path = ""; + std::string action_path = ""; uint32_t expected_requests = 0; uint32_t request_initial_wait = 0; bool cancel_requests = false; @@ -55,8 +56,6 @@ class CLIParser std::endl; std::cout << "--config Path to the configuration file" << std::endl; - std::cout << " (Default: '')" << - std::endl; std::cout << "--action-name Name of the action to be registered" << std::endl; std::cout << " (Default: 'Fibonacci/_action/')" << @@ -69,8 +68,6 @@ class CLIParser std::endl; std::cout << "--persistence-path Path to the persistence directory" << std::endl; - std::cout << " (Default: '')" << - std::endl; std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; std::cout << "--expected-requests Number of requests expected to be received" << @@ -87,6 +84,8 @@ class CLIParser std::endl; std::cout << " (Default: false)" << std::endl; + std::cout << "--action-path Directory containing goal JSON files" << + std::endl; std::exit(return_code); } @@ -262,6 +261,24 @@ class CLIParser print_help(EXIT_FAILURE); } } + else if (arg == "--action-path") + { + if (++i < argc) + { + config.action_path = argv[i]; + if (!std::filesystem::exists(config.action_path) || + !std::filesystem::is_directory(config.action_path)) + { + std::cerr << "Invalid --action-path directory: " << config.action_path << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --action-path argument" << std::endl; + print_help(EXIT_FAILURE); + } + } else { std::cerr << "Failed to parse unknown argument: " << arg << std::endl; @@ -282,6 +299,18 @@ class CLIParser print_help(EXIT_FAILURE); } + if (client_flag && config.action_path.empty()) + { + std::cerr << "--action-path is required in client mode" << std::endl; + print_help(EXIT_FAILURE); + } + + if (server_flag && config.expected_requests == 0) + { + std::cerr << "--expected-requests is required in server mode and must be greater than 0" << std::endl; + print_help(EXIT_FAILURE); + } + return config; } diff --git a/ddsenabler/examples/action/CMakeLists.txt b/ddsenabler/examples/action/CMakeLists.txt index 6e50ded0..f2dc930c 100644 --- a/ddsenabler/examples/action/CMakeLists.txt +++ b/ddsenabler/examples/action/CMakeLists.txt @@ -34,7 +34,7 @@ foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json COPYONLY) install(FILES ${JSON_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) + DESTINATION bin) endforeach() # Copy the yaml files over to the build directory @@ -46,5 +46,17 @@ foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml COPYONLY) install(FILES ${YAML_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) + DESTINATION bin) endforeach() + +# Install persistence directory +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../persistence + DESTINATION bin +) + +# Install goals directory +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/goals + DESTINATION bin +) diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 1f002f0d..77ed07f2 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -11,8 +11,9 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash ./install/ddsenabler/bin/ddsenabler_example_action client \ - --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ - --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --persistence-path ./install/ddsenabler/bin/persistence/ \ + --action-path ./install/ddsenabler/bin/goals/ \ + --config ./install/ddsenabler/bin/config_service.yml \ --request-initial-wait 3 \ --cancel-requests false ``` @@ -20,7 +21,7 @@ Users are encouraged to implement their own functional server logic as needed in ### SERVER ```bash ./install/ddsenabler/bin/ddsenabler_example_action server \ - --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ - --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --persistence-path ./install/ddsenabler/bin/persistence/ \ + --config ./install/ddsenabler/bin/config_service.yml \ --expected-requests 3 ``` diff --git a/ddsenabler/examples/action/config.yml b/ddsenabler/examples/action/config.yml deleted file mode 100644 index 5cc4050d..00000000 --- a/ddsenabler/examples/action/config.yml +++ /dev/null @@ -1,26 +0,0 @@ -dds: - domain: 0 - - allowlist: - - name: "topic_name" - - name: "HelloWorldTopic" - type: "HelloWorld" - - blocklist: - - name: "topic_to_block" - type: "type_to_block" - - topics: - - name: "temperature/*" - type: "temperature/types/*" - qos: - max-rx-rate: 15 - downsampling: 2 - - ignore-participant-flags: filter_same_process - transport: shm - whitelist-interfaces: - - "127.0.0.1" - -ddsenabler: - initial-publish-wait: 500 diff --git a/ddsenabler/examples/action/config_action.yml b/ddsenabler/examples/action/config_action.yml new file mode 100644 index 00000000..17cbb176 --- /dev/null +++ b/ddsenabler/examples/action/config_action.yml @@ -0,0 +1,11 @@ +dds: + domain: 0 + +ddsenabler: + initial-publish-wait: 500 + +specs: + threads: 12 + logging: + stdout: false + verbosity: error diff --git a/ddsenabler/examples/persistence/goals/1 b/ddsenabler/examples/action/goals/1 similarity index 100% rename from ddsenabler/examples/persistence/goals/1 rename to ddsenabler/examples/action/goals/1 diff --git a/ddsenabler/examples/persistence/goals/2 b/ddsenabler/examples/action/goals/2 similarity index 100% rename from ddsenabler/examples/persistence/goals/2 rename to ddsenabler/examples/action/goals/2 diff --git a/ddsenabler/examples/persistence/goals/3 b/ddsenabler/examples/action/goals/3 similarity index 100% rename from ddsenabler/examples/persistence/goals/3 rename to ddsenabler/examples/action/goals/3 diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 177aa1e7..181a4f71 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -552,9 +552,16 @@ int main( } else { - auto goal_path = - config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / - REQUESTS_SUBDIR).string(); + std::string goal_path; + if (!config.action_path.empty()) + { + goal_path = config.action_path; + } + else + { + goal_path = config.persistence_path.empty() ? std::string() : + (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); + } ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, config.cancel_requests); } diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index d1d86d4f..3f447fa1 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -34,6 +34,7 @@ class CLIParser bool announce_server = true; uint32_t timeout = 30; std::string persistence_path = ""; + std::string request_path = ""; uint32_t expected_requests = 0; uint32_t request_initial_wait = 0; }; @@ -54,8 +55,6 @@ class CLIParser std::endl; std::cout << "--config Path to the configuration file" << std::endl; - std::cout << " (Default: '')" << - std::endl; std::cout << "--service-name Name of the service to be registered" << std::endl; std::cout << " (Default: 'add_two_ints')" << @@ -68,8 +67,6 @@ class CLIParser std::endl; std::cout << "--persistence-path Path to the persistence directory" << std::endl; - std::cout << " (Default: '')" << - std::endl; std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; std::cout << "--expected-requests Number of requests expected to be received" << @@ -82,6 +79,8 @@ class CLIParser std::endl; std::cout << " (Default: 0)" << std::endl; + std::cout << "--request-path Directory containing request JSON files" << + std::endl; std::exit(return_code); } @@ -243,6 +242,24 @@ class CLIParser print_help(EXIT_FAILURE); } } + else if (arg == "--request-path") + { + if (++i < argc) + { + config.request_path = argv[i]; + if (!std::filesystem::exists(config.request_path) || + !std::filesystem::is_directory(config.request_path)) + { + std::cerr << "Invalid --request-path directory: " << config.request_path << std::endl; + print_help(EXIT_FAILURE); + } + } + else + { + std::cerr << "Failed to parse --request-path argument" << std::endl; + print_help(EXIT_FAILURE); + } + } else { std::cerr << "Failed to parse unknown argument: " << arg << std::endl; @@ -263,6 +280,24 @@ class CLIParser print_help(EXIT_FAILURE); } + if (client_flag && config.request_path.empty()) + { + std::cerr << "--request-path is required in client mode" << std::endl; + print_help(EXIT_FAILURE); + } + + if (server_flag && config.expected_requests == 0) + { + std::cerr << "--expected-requests is required in server mode and must be greater than 0" << std::endl; + print_help(EXIT_FAILURE); + } + + if (config.persistence_path.empty()) + { + std::cerr << "Warning: persistence path is not set, persistence features will be disabled" << + std::endl; + } + return config; } diff --git a/ddsenabler/examples/service/CMakeLists.txt b/ddsenabler/examples/service/CMakeLists.txt index 563f0379..2d72f981 100644 --- a/ddsenabler/examples/service/CMakeLists.txt +++ b/ddsenabler/examples/service/CMakeLists.txt @@ -34,7 +34,7 @@ foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json COPYONLY) install(FILES ${JSON_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) + DESTINATION bin) endforeach() # Copy the yaml files over to the build directory @@ -46,5 +46,17 @@ foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml COPYONLY) install(FILES ${YAML_FILE_COMPLETE_PATH} - DESTINATION ${DATA_INSTALL_DIR}/ddsenabler/examples/ddsenabler/${BIN_INSTALL_DIR}) + DESTINATION bin) endforeach() + +# Install persistence directory +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../persistence + DESTINATION bin +) + +# Install requests directory +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/requests + DESTINATION bin +) diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index 0f7a5550..a60d6b1d 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -11,15 +11,16 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash ./install/ddsenabler/bin/ddsenabler_example_service client \ - --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ - --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --persistence-path ./install/ddsenabler/bin/persistence/ \ + --request-path ./install/ddsenabler/bin/requests \ + --config ./install/ddsenabler/bin/config_service.yml \ --request-initial-wait 3 ``` ### SERVER ```bash ./install/ddsenabler/bin/ddsenabler_example_service server \ - --persistence-path $PATH_TO_WS/ddsenabler/ddsenabler/examples/persistence/ \ - --config $PATH_TO_WS/ddsenabler/ddsenabler/DDS_ENABLER_CONFIGURATION.yaml \ + --persistence-path ./install/ddsenabler/bin/persistence/ \ + --config ./install/ddsenabler/bin/config_service.yml \ --expected-requests 3 ``` diff --git a/ddsenabler/examples/service/config.yml b/ddsenabler/examples/service/config.yml deleted file mode 100644 index 5cc4050d..00000000 --- a/ddsenabler/examples/service/config.yml +++ /dev/null @@ -1,26 +0,0 @@ -dds: - domain: 0 - - allowlist: - - name: "topic_name" - - name: "HelloWorldTopic" - type: "HelloWorld" - - blocklist: - - name: "topic_to_block" - type: "type_to_block" - - topics: - - name: "temperature/*" - type: "temperature/types/*" - qos: - max-rx-rate: 15 - downsampling: 2 - - ignore-participant-flags: filter_same_process - transport: shm - whitelist-interfaces: - - "127.0.0.1" - -ddsenabler: - initial-publish-wait: 500 diff --git a/ddsenabler/examples/service/config_service.yml b/ddsenabler/examples/service/config_service.yml new file mode 100644 index 00000000..17cbb176 --- /dev/null +++ b/ddsenabler/examples/service/config_service.yml @@ -0,0 +1,11 @@ +dds: + domain: 0 + +ddsenabler: + initial-publish-wait: 500 + +specs: + threads: 12 + logging: + stdout: false + verbosity: error diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index b8b6f816..825f55df 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -468,9 +468,16 @@ int main( } else { - auto request_path = - config.persistence_path.empty() ? std::string() : (std::filesystem::path(config.persistence_path) / - REQUESTS_SUBDIR).string(); + std::string request_path; + if (!config.request_path.empty()) + { + request_path = config.request_path; + } + else + { + std::cerr << "Request path is not set." << std::endl; + return EXIT_FAILURE; + } ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait); } diff --git a/ddsenabler/examples/persistence/requests/1 b/ddsenabler/examples/service/requests/1 similarity index 100% rename from ddsenabler/examples/persistence/requests/1 rename to ddsenabler/examples/service/requests/1 diff --git a/ddsenabler/examples/persistence/requests/2 b/ddsenabler/examples/service/requests/2 similarity index 100% rename from ddsenabler/examples/persistence/requests/2 rename to ddsenabler/examples/service/requests/2 diff --git a/ddsenabler/examples/persistence/requests/3 b/ddsenabler/examples/service/requests/3 similarity index 100% rename from ddsenabler/examples/persistence/requests/3 rename to ddsenabler/examples/service/requests/3 From 073cd2b501142f206966a08b47a616d6503d7ba1 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 12:22:42 +0200 Subject: [PATCH 62/87] Fix example tests Signed-off-by: Eugenio Collado --- .../compose/test_cases/actions/action_client/compose.yml | 4 ++-- .../test_cases/actions/action_client_cancel/compose.yml | 4 ++-- .../compose/test_cases/actions/action_server/compose.yml | 4 ++-- .../compose/test_cases/actions/persistence/requests/1 | 4 ---- .../compose/test_cases/actions/persistence/requests/2 | 4 ---- .../compose/test_cases/actions/persistence/requests/3 | 4 ---- .../compose/test_cases/services/persistence/goals/1 | 3 --- .../compose/test_cases/services/persistence/goals/2 | 3 --- .../compose/test_cases/services/persistence/goals/3 | 3 --- .../compose/test_cases/services/service_client/compose.yml | 2 +- .../compose/test_cases/services/service_server/compose.yml | 2 +- 11 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/1 delete mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/2 delete mode 100644 ddsenabler_test/compose/test_cases/actions/persistence/requests/3 delete mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/1 delete mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/2 delete mode 100644 ddsenabler_test/compose/test_cases/services/persistence/goals/3 diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml index ea9f7fc2..dff4283f 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + command: ./build/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -31,4 +31,4 @@ services: networks: std_net: default: - driver: none \ No newline at end of file + driver: none diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml index f4902ea5..1891177f 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml @@ -12,7 +12,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 --cancel-requests true + command: ./build/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 --cancel-requests true fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -30,4 +30,4 @@ services: networks: std_net: default: - driver: none \ No newline at end of file + driver: none diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml index be913421..0b155058 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action -server --persistence-path /persistence --config /config/config.yml --expected-requests 3 + command: ./build/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 3 fibonacci_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -52,4 +52,4 @@ services: networks: std_net: default: - driver: none \ No newline at end of file + driver: none diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 deleted file mode 100644 index 0fbddba4..00000000 --- a/ddsenabler_test/compose/test_cases/actions/persistence/requests/1 +++ /dev/null @@ -1,4 +0,0 @@ -{ - "a": 1, - "b": 2 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 deleted file mode 100644 index 9e5938e4..00000000 --- a/ddsenabler_test/compose/test_cases/actions/persistence/requests/2 +++ /dev/null @@ -1,4 +0,0 @@ -{ - "a": 2, - "b": 3 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 b/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 deleted file mode 100644 index fe99b20a..00000000 --- a/ddsenabler_test/compose/test_cases/actions/persistence/requests/3 +++ /dev/null @@ -1,4 +0,0 @@ -{ - "a": 3, - "b": 4 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/1 b/ddsenabler_test/compose/test_cases/services/persistence/goals/1 deleted file mode 100644 index 8402bb25..00000000 --- a/ddsenabler_test/compose/test_cases/services/persistence/goals/1 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "order": 3 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/2 b/ddsenabler_test/compose/test_cases/services/persistence/goals/2 deleted file mode 100644 index 461fa735..00000000 --- a/ddsenabler_test/compose/test_cases/services/persistence/goals/2 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "order": 5 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/persistence/goals/3 b/ddsenabler_test/compose/test_cases/services/persistence/goals/3 deleted file mode 100644 index 853b8317..00000000 --- a/ddsenabler_test/compose/test_cases/services/persistence/goals/3 +++ /dev/null @@ -1,3 +0,0 @@ -{ - "order": 7 -} \ No newline at end of file diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml index 5eb61a70..346a967d 100644 --- a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service -client --persistence-path /persistence --config /config/config.yml --request-initial-wait 2 + command: ./build/ddsenabler/examples/service/ddsenabler_example_service client --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --request-initial-wait 2 add_two_ints_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} container_name: add_two_ints_server diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index 0f2b0ef2..d8126598 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service -server --persistence-path /persistence --config /config/config.yml --expected-requests 3 + command: ./build/ddsenabler/examples/service/ddsenabler_example_service server --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --expected-requests 3 add_two_ints_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} From b6cfce8595e775dc490e9138c2d8f1c9a0b93b5f Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 21 Oct 2025 12:43:57 +0200 Subject: [PATCH 63/87] Fix example tests 2 Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 20 ++++++++++---------- ddsenabler/examples/action/Readme.md | 2 +- ddsenabler/examples/action/main.cpp | 4 ++-- ddsenabler/examples/service/CLIParser.hpp | 20 ++++++++++---------- ddsenabler/examples/service/Readme.md | 2 +- ddsenabler/examples/service/main.cpp | 12 ++++++------ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 3160874b..ffbc2532 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -34,7 +34,7 @@ class CLIParser bool announce_server = true; uint32_t timeout = 30; std::string persistence_path = ""; - std::string action_path = ""; + std::string goals_path = ""; uint32_t expected_requests = 0; uint32_t request_initial_wait = 0; bool cancel_requests = false; @@ -84,7 +84,7 @@ class CLIParser std::endl; std::cout << " (Default: false)" << std::endl; - std::cout << "--action-path Directory containing goal JSON files" << + std::cout << "--goals-path Directory containing goal JSON files" << std::endl; std::exit(return_code); } @@ -261,21 +261,21 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "--action-path") + else if (arg == "--goals-path") { if (++i < argc) { - config.action_path = argv[i]; - if (!std::filesystem::exists(config.action_path) || - !std::filesystem::is_directory(config.action_path)) + config.goals_path = argv[i]; + if (!std::filesystem::exists(config.goals_path) || + !std::filesystem::is_directory(config.goals_path)) { - std::cerr << "Invalid --action-path directory: " << config.action_path << std::endl; + std::cerr << "Invalid --goals-path directory: " << config.goals_path << std::endl; print_help(EXIT_FAILURE); } } else { - std::cerr << "Failed to parse --action-path argument" << std::endl; + std::cerr << "Failed to parse --goals-path argument" << std::endl; print_help(EXIT_FAILURE); } } @@ -299,9 +299,9 @@ class CLIParser print_help(EXIT_FAILURE); } - if (client_flag && config.action_path.empty()) + if (client_flag && config.goals_path.empty()) { - std::cerr << "--action-path is required in client mode" << std::endl; + std::cerr << "--goals-path is required in client mode" << std::endl; print_help(EXIT_FAILURE); } diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 77ed07f2..8b211108 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -12,7 +12,7 @@ Users are encouraged to implement their own functional server logic as needed in ```bash ./install/ddsenabler/bin/ddsenabler_example_action client \ --persistence-path ./install/ddsenabler/bin/persistence/ \ - --action-path ./install/ddsenabler/bin/goals/ \ + --goals-path ./install/ddsenabler/bin/goals/ \ --config ./install/ddsenabler/bin/config_service.yml \ --request-initial-wait 3 \ --cancel-requests false diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 181a4f71..43fad41e 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -553,9 +553,9 @@ int main( else { std::string goal_path; - if (!config.action_path.empty()) + if (!config.goals_path.empty()) { - goal_path = config.action_path; + goal_path = config.goals_path; } else { diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index 3f447fa1..15072302 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -34,7 +34,7 @@ class CLIParser bool announce_server = true; uint32_t timeout = 30; std::string persistence_path = ""; - std::string request_path = ""; + std::string requests_path = ""; uint32_t expected_requests = 0; uint32_t request_initial_wait = 0; }; @@ -79,7 +79,7 @@ class CLIParser std::endl; std::cout << " (Default: 0)" << std::endl; - std::cout << "--request-path Directory containing request JSON files" << + std::cout << "--requests-path Directory containing request JSON files" << std::endl; std::exit(return_code); } @@ -242,21 +242,21 @@ class CLIParser print_help(EXIT_FAILURE); } } - else if (arg == "--request-path") + else if (arg == "--requests-path") { if (++i < argc) { - config.request_path = argv[i]; - if (!std::filesystem::exists(config.request_path) || - !std::filesystem::is_directory(config.request_path)) + config.requests_path = argv[i]; + if (!std::filesystem::exists(config.requests_path) || + !std::filesystem::is_directory(config.requests_path)) { - std::cerr << "Invalid --request-path directory: " << config.request_path << std::endl; + std::cerr << "Invalid --requests-path directory: " << config.requests_path << std::endl; print_help(EXIT_FAILURE); } } else { - std::cerr << "Failed to parse --request-path argument" << std::endl; + std::cerr << "Failed to parse --requests-path argument" << std::endl; print_help(EXIT_FAILURE); } } @@ -280,9 +280,9 @@ class CLIParser print_help(EXIT_FAILURE); } - if (client_flag && config.request_path.empty()) + if (client_flag && config.requests_path.empty()) { - std::cerr << "--request-path is required in client mode" << std::endl; + std::cerr << "--requests-path is required in client mode" << std::endl; print_help(EXIT_FAILURE); } diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index a60d6b1d..cde189ba 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -12,7 +12,7 @@ Users are encouraged to implement their own functional server logic as needed in ```bash ./install/ddsenabler/bin/ddsenabler_example_service client \ --persistence-path ./install/ddsenabler/bin/persistence/ \ - --request-path ./install/ddsenabler/bin/requests \ + --requests-path ./install/ddsenabler/bin/requests \ --config ./install/ddsenabler/bin/config_service.yml \ --request-initial-wait 3 ``` diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 825f55df..54de5b3d 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -296,7 +296,7 @@ bool wait_for_service_reply( bool client_routine( std::shared_ptr enabler, const std::string& service_name, - const std::string& request_path, + const std::string& requests_path, uint32_t timeout, uint32_t request_initial_wait) { @@ -312,7 +312,7 @@ bool client_routine( // Get collection of files to publish, sorted in increasing order by their name (assumed to be numeric) std::vector> sample_files; - utils::get_sorted_files(request_path, sample_files); + utils::get_sorted_files(requests_path, sample_files); uint32_t sent_requests = 0; for (const auto& [path, number] : sample_files) { @@ -468,17 +468,17 @@ int main( } else { - std::string request_path; - if (!config.request_path.empty()) + std::string requests_path; + if (!config.requests_path.empty()) { - request_path = config.request_path; + requests_path = config.requests_path; } else { std::cerr << "Request path is not set." << std::endl; return EXIT_FAILURE; } - ret = client_routine(enabler, config.service_name, request_path, config.timeout, config.request_initial_wait); + ret = client_routine(enabler, config.service_name, requests_path, config.timeout, config.request_initial_wait); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; From b68021db5706ac632e6fc69965bca78e22ce077a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 12:25:31 +0200 Subject: [PATCH 64/87] Apply Examples suggestions Signed-off-by: Eugenio Collado --- ddsenabler/examples/CMakeLists.txt | 6 +++ ddsenabler/examples/action/CLIParser.hpp | 12 ----- ddsenabler/examples/action/CMakeLists.txt | 34 +-------------- ddsenabler/examples/action/Readme.md | 16 +++---- ddsenabler/examples/action/main.cpp | 51 ++++++++++++++-------- ddsenabler/examples/service/CLIParser.hpp | 12 ----- ddsenabler/examples/service/CMakeLists.txt | 34 +-------------- ddsenabler/examples/service/Readme.md | 16 +++---- ddsenabler/examples/service/main.cpp | 47 ++++++++++++-------- 9 files changed, 88 insertions(+), 140 deletions(-) diff --git a/ddsenabler/examples/CMakeLists.txt b/ddsenabler/examples/CMakeLists.txt index a61c5f79..9c3f04aa 100644 --- a/ddsenabler/examples/CMakeLists.txt +++ b/ddsenabler/examples/CMakeLists.txt @@ -12,6 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +# Install persistence directory +install( + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/persistence + DESTINATION bin +) + # Add subdirectories for examples add_subdirectory(utils) add_subdirectory(publish) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index ffbc2532..5311a66f 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -293,24 +293,12 @@ class CLIParser print_help(EXIT_FAILURE); } - if (config.config_file_path.empty()) - { - std::cerr << "Configuration file path is required" << std::endl; - print_help(EXIT_FAILURE); - } - if (client_flag && config.goals_path.empty()) { std::cerr << "--goals-path is required in client mode" << std::endl; print_help(EXIT_FAILURE); } - if (server_flag && config.expected_requests == 0) - { - std::cerr << "--expected-requests is required in server mode and must be greater than 0" << std::endl; - print_help(EXIT_FAILURE); - } - return config; } diff --git a/ddsenabler/examples/action/CMakeLists.txt b/ddsenabler/examples/action/CMakeLists.txt index f2dc930c..1d687b66 100644 --- a/ddsenabler/examples/action/CMakeLists.txt +++ b/ddsenabler/examples/action/CMakeLists.txt @@ -22,41 +22,11 @@ target_link_libraries(ddsenabler_example_action PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_action - RUNTIME DESTINATION bin -) - -# Copy the json files over to the build directory -file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) -foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) - get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${JSON_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json - COPYONLY) - install(FILES ${JSON_FILE_COMPLETE_PATH} - DESTINATION bin) -endforeach() - -# Copy the yaml files over to the build directory -file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) -foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) - get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${YAML_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml - COPYONLY) - install(FILES ${YAML_FILE_COMPLETE_PATH} - DESTINATION bin) -endforeach() - -# Install persistence directory -install( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../persistence - DESTINATION bin + RUNTIME DESTINATION bin/examples/action ) # Install goals directory install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/goals - DESTINATION bin + DESTINATION bin/examples/action ) diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 8b211108..36c77657 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -10,18 +10,18 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_action client \ - --persistence-path ./install/ddsenabler/bin/persistence/ \ - --goals-path ./install/ddsenabler/bin/goals/ \ - --config ./install/ddsenabler/bin/config_service.yml \ +./install/ddsenabler/bin/examples/action/ddsenabler_example_action client \ + --persistence-path ./install/ddsenabler/bin/examples/persistence/ \ + --goals-path ./install/ddsenabler/bin/examples/action/goals/ \ --request-initial-wait 3 \ --cancel-requests false + --config $PATH_TO_CONFIG_FILE ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_action server \ - --persistence-path ./install/ddsenabler/bin/persistence/ \ - --config ./install/ddsenabler/bin/config_service.yml \ - --expected-requests 3 +./install/ddsenabler/bin/examples/action/ddsenabler_example_action server \ + --persistence-path ./install/ddsenabler/bin/examples/persistence/ + --config $PATH_TO_CONFIG_FILE + --expected-requests N ``` diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 43fad41e..81588e98 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -41,11 +41,23 @@ uint32_t received_results_ = 0; std::vector> received_requests_; std::mutex app_mutex_; std::condition_variable app_cv_; +bool stop_app_ = false; const std::string REQUESTS_SUBDIR = "goals"; const std::string TYPES_SUBDIR = "types"; const std::string ACTION_SUBDIR = "actions"; +void signal_handler( + int signum) +{ + std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; + { + std::lock_guard lock(app_mutex_); + stop_app_ = true; + } + app_cv_.notify_all(); +} + // Static log callback void test_log_callback( const char* file_name, @@ -268,10 +280,10 @@ bool wait_for_action_discovery( std::condition_variable& app_cv) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { - return action_discovered_; + return stop_app_ || action_discovered_; })) { std::cerr << "Timeout waiting for service discovery." << std::endl; @@ -288,10 +300,10 @@ bool wait_for_action_request( std::string& goal_json) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { - return !received_requests_.empty(); + return stop_app_ || !received_requests_.empty(); })) { std::cerr << "Timeout waiting for service request." << std::endl; @@ -311,10 +323,10 @@ bool wait_for_action_result( uint32_t sent_requests) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), [&sent_requests]() { - return received_results_ >= sent_requests; + return stop_app_ || received_results_ >= sent_requests; })) { std::cerr << "Timeout waiting for action result." << std::endl; @@ -452,7 +464,7 @@ bool server_routine( std::cout << "Action announced: " << action_name << std::endl; - while (true) + while (!stop_app_) { eprosima::ddsenabler::participants::UUID request_id; std::string goal_json; @@ -477,10 +489,10 @@ bool server_routine( return false; } - // Check if we have received the expected number of requests + // Check if we have received the expected number of requests (or run indefinitely if expected_requests is 0) { std::lock_guard lock(app_mutex_); - if (++received_results_ >= expected_requests) + if (expected_requests != 0 && ++received_results_ >= expected_requests) { break; } @@ -537,7 +549,12 @@ int main( }; std::shared_ptr enabler; - if (!create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler)) + bool enabler_created = false; + if (config.config_file_path.empty()) + enabler_created = create_dds_enabler(yaml::EnablerConfiguration(""), callbacks, enabler); + else + enabler_created = create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler); + if (!enabler_created) { std::cerr << "Failed to create DDSEnabler instance." << std::endl; return EXIT_FAILURE; @@ -552,17 +569,13 @@ int main( } else { - std::string goal_path; - if (!config.goals_path.empty()) + if (config.goals_path.empty()) { - goal_path = config.goals_path; + std::cerr << "Request path is not set." << std::endl; + return EXIT_FAILURE; } - else - { - goal_path = config.persistence_path.empty() ? std::string() : - (std::filesystem::path(config.persistence_path) / REQUESTS_SUBDIR).string(); - } - ret = client_routine(enabler, config.action_name, goal_path, config.timeout, config.request_initial_wait, + + ret = client_routine(enabler, config.action_name, config.goals_path, config.timeout, config.request_initial_wait, config.cancel_requests); } diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index 15072302..c224dd15 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -274,24 +274,12 @@ class CLIParser print_help(EXIT_FAILURE); } - if (config.config_file_path.empty()) - { - std::cerr << "Configuration file path is required" << std::endl; - print_help(EXIT_FAILURE); - } - if (client_flag && config.requests_path.empty()) { std::cerr << "--requests-path is required in client mode" << std::endl; print_help(EXIT_FAILURE); } - if (server_flag && config.expected_requests == 0) - { - std::cerr << "--expected-requests is required in server mode and must be greater than 0" << std::endl; - print_help(EXIT_FAILURE); - } - if (config.persistence_path.empty()) { std::cerr << "Warning: persistence path is not set, persistence features will be disabled" << diff --git a/ddsenabler/examples/service/CMakeLists.txt b/ddsenabler/examples/service/CMakeLists.txt index 2d72f981..08cf1258 100644 --- a/ddsenabler/examples/service/CMakeLists.txt +++ b/ddsenabler/examples/service/CMakeLists.txt @@ -22,41 +22,11 @@ target_link_libraries(ddsenabler_example_service PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_service - RUNTIME DESTINATION bin -) - -# Copy the json files over to the build directory -file(GLOB_RECURSE JSON_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.json) -foreach(JSON_FILE_COMPLETE_PATH ${JSON_FILES}) - get_filename_component(JSON_FILE ${JSON_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${JSON_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${JSON_FILE}.json - COPYONLY) - install(FILES ${JSON_FILE_COMPLETE_PATH} - DESTINATION bin) -endforeach() - -# Copy the yaml files over to the build directory -file(GLOB_RECURSE YAML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.yml) -foreach(YAML_FILE_COMPLETE_PATH ${YAML_FILES}) - get_filename_component(YAML_FILE ${YAML_FILE_COMPLETE_PATH} NAME_WE) - configure_file( - ${YAML_FILE_COMPLETE_PATH} - ${CMAKE_CURRENT_BINARY_DIR}/${YAML_FILE}.yml - COPYONLY) - install(FILES ${YAML_FILE_COMPLETE_PATH} - DESTINATION bin) -endforeach() - -# Install persistence directory -install( - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../persistence - DESTINATION bin + RUNTIME DESTINATION bin/examples/service ) # Install requests directory install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/requests - DESTINATION bin + DESTINATION bin/examples/service ) diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index cde189ba..dc1df2eb 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,17 +10,17 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/ddsenabler_example_service client \ - --persistence-path ./install/ddsenabler/bin/persistence/ \ - --requests-path ./install/ddsenabler/bin/requests \ - --config ./install/ddsenabler/bin/config_service.yml \ +./install/ddsenabler/bin/examples/service/ddsenabler_example_service client \ + --persistence-path ./install/ddsenabler/bin/examples/persistence/ \ + --requests-path ./install/ddsenabler/bin/examples/service/requests \ --request-initial-wait 3 + --config $PATH_TO_CONFIG_FILE ``` ### SERVER ```bash -./install/ddsenabler/bin/ddsenabler_example_service server \ - --persistence-path ./install/ddsenabler/bin/persistence/ \ - --config ./install/ddsenabler/bin/config_service.yml \ - --expected-requests 3 +./install/ddsenabler/bin/examples/service/ddsenabler_example_service server \ + --persistence-path ./install/ddsenabler/bin/examples/persistence/ + --expected-requests N + --config $PATH_TO_CONFIG_FILE ``` diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 54de5b3d..9062461f 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -42,11 +42,23 @@ uint32_t sent_replies_ = 0; std::vector> received_requests_; std::mutex app_mutex_; std::condition_variable app_cv_; +bool stop_app_ = false; const std::string REQUESTS_SUBDIR = "requests"; const std::string TYPES_SUBDIR = "types"; const std::string SERVICES_SUBDIR = "services"; +void signal_handler( + int signum) +{ + std::cout << "Signal " << CLIParser::parse_signal(signum) << " received, stopping..." << std::endl; + { + std::lock_guard lock(app_mutex_); + stop_app_ = true; + } + app_cv_.notify_all(); +} + // Static log callback void test_log_callback( const char* file_name, @@ -237,10 +249,10 @@ bool wait_for_service_discovery( std::condition_variable& app_cv) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { - return service_discovered_; + return stop_app_ || service_discovered_; })) { std::cerr << "Timeout waiting for service discovery." << std::endl; @@ -257,10 +269,10 @@ bool wait_for_service_request( std::string& request) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { - return !received_requests_.empty(); + return stop_app_ || !received_requests_.empty(); })) { std::cerr << "Timeout waiting for service request." << std::endl; @@ -281,10 +293,10 @@ bool wait_for_service_reply( uint32_t sent_requests) { std::unique_lock lock(app_mutex); - if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), [&sent_requests]() { - return received_replies_ >= sent_requests; + return stop_app_ || received_replies_ >= sent_requests; })) { std::cerr << "Timeout waiting for service reply." << std::endl; @@ -380,7 +392,7 @@ bool server_routine( std::cout << "Service announced: " << service_name << std::endl; - while (true) + while (!stop_app_) { uint64_t request_id = 0; std::string request; @@ -400,10 +412,10 @@ bool server_routine( request, request_id); - // Check if we have received the expected number of requests + // Check if we have received the expected number of requests (or run indefinitely if expected_requests is 0) { std::lock_guard lock(app_mutex_); - if (++sent_replies_ >= expected_requests) + if (expected_requests != 0 && ++sent_replies_ >= expected_requests) { // Wait to ensure the last sent reply reaches destination std::this_thread::sleep_for(std::chrono::milliseconds(1000)); @@ -418,6 +430,7 @@ bool server_routine( std::cerr << "Failed to revoke service: " << service_name << std::endl; return false; } + return true; } int main( @@ -454,7 +467,12 @@ int main( }; std::shared_ptr enabler; - if (!create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler)) + bool enabler_created = false; + if (config.config_file_path.empty()) + enabler_created = create_dds_enabler(yaml::EnablerConfiguration(""), callbacks, enabler); + else + enabler_created = create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler); + if (!enabler_created) { std::cerr << "Failed to create DDSEnabler instance." << std::endl; return EXIT_FAILURE; @@ -468,17 +486,12 @@ int main( } else { - std::string requests_path; - if (!config.requests_path.empty()) - { - requests_path = config.requests_path; - } - else + if (config.requests_path.empty()) { std::cerr << "Request path is not set." << std::endl; return EXIT_FAILURE; } - ret = client_routine(enabler, config.service_name, requests_path, config.timeout, config.request_initial_wait); + ret = client_routine(enabler, config.service_name, config.requests_path, config.timeout, config.request_initial_wait); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; From 45546c2017a17bfe3e52139207d9d11dd235d9b9 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 14:42:56 +0200 Subject: [PATCH 65/87] Enabler participant suggestion Signed-off-by: Eugenio Collado --- .../EnablerParticipant.hpp | 4 +- .../rpc/RpcStructs.hpp | 1 + .../src/cpp/EnablerParticipant.cpp | 46 +++++++++---------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 2565faf3..da5ef03d 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -67,7 +67,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool publish_rpc( const std::string& topic_name, const std::string& json, - const uint64_t& request_id); + const uint64_t request_id); DDSENABLER_PARTICIPANTS_DllAPI void set_topic_query_callback( @@ -218,7 +218,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const TopicInfo& topic_info, ddspipe::core::types::DdsTopic& topic); - bool fulfill_service_type_nts_( + bool fill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, RpcProtocol RpcProtocol); diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index d70e30c9..a7cd4f6c 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -94,6 +94,7 @@ struct RpcInfo rpc_protocol = RpcProtocol::ROS2; return; } + // With the current Fast Prefixes being empty strings, this check must be the last one else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 2713af4d..87756df6 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -69,16 +69,18 @@ bool EnablerParticipant::action_discovered_nts_( std::make_shared(rpc_info->action_name, rpc_info->rpc_protocol)); if (ServiceType::NONE != rpc_info->service_type) { - service_discovered_nts_(rpc_info, topic); - auto service_it = services_.find(rpc_info->service_name); - if (services_.end() == service_it) + if (service_discovered_nts_(rpc_info, topic)) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Service " << rpc_info->service_name << " not found in action " << rpc_info->action_name); - return false; - } + auto service_it = services_.find(rpc_info->service_name); + if (services_.end() == service_it) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Service " << rpc_info->service_name << " not found in action " << rpc_info->action_name); + return false; + } - it->second->add_service(service_it->second, rpc_info->action_type); + it->second->add_service(service_it->second, rpc_info->action_type); + } } else { @@ -165,10 +167,6 @@ std::shared_ptr EnablerParticipant::create_reader( } } } - else - { - std::cout << "Topic " << dds_topic.m_topic_name << " discovered from topic query callback. Not adding RPC." << std::endl; - } } else { @@ -287,7 +285,7 @@ bool EnablerParticipant::publish( bool EnablerParticipant::publish_rpc( const std::string& topic_name, const std::string& json, - const uint64_t& request_id) + const uint64_t request_id) { std::unique_lock lck(mtx_); @@ -462,13 +460,13 @@ bool EnablerParticipant::revoke_service_nts_( if (it == services_.end()) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop service " << service_name << " : service not found."); + "Failed to revoke service " << service_name << " : service not found."); return false; } if (!it->second->enabler_as_server || !it->second->endpoint_request.has_value()) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop service " << service_name << " : service not announced as server."); + "Failed to revoke service " << service_name << " : service not announced as server."); return false; } @@ -632,14 +630,14 @@ bool EnablerParticipant::revoke_action( if (it == actions_.end()) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop action " << action_name << " : action not found."); + "Failed to revoke action " << action_name << " : action not found."); return false; } if (!it->second->enabler_as_server) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop action " << action_name << " : action not announced as server."); + "Failed to revoke action " << action_name << " : action not announced as server."); return false; } @@ -657,7 +655,7 @@ bool EnablerParticipant::revoke_action( if (!goal || !result || !cancel) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop action " << action_name << " : action services not fully discovered."); + "Failed to revoke action " << action_name << " : action services not fully discovered."); return false; } if (this->revoke_service_nts_(goal->service_name) && @@ -670,7 +668,7 @@ bool EnablerParticipant::revoke_action( } EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to stop action " << action_name << " : error revoking action services."); + "Failed to revoke action " << action_name << " : error revoking action services."); return false; } @@ -734,7 +732,7 @@ bool EnablerParticipant::fill_topic_struct_nts_( return true; } -bool EnablerParticipant::fulfill_service_type_nts_( +bool EnablerParticipant::fill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, RpcProtocol RpcProtocol) @@ -811,7 +809,7 @@ bool EnablerParticipant::query_service_nts_( return false; } - return fulfill_service_type_nts_(service_info, service, RpcProtocol); + return fill_service_type_nts_(service_info, service, RpcProtocol); } bool EnablerParticipant::query_action_nts_( @@ -858,7 +856,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr goal_service = std::make_shared(goal_service_name, RpcProtocol); - if (!fulfill_service_type_nts_( + if (!fill_service_type_nts_( action_info.goal, goal_service, RpcProtocol)) @@ -878,7 +876,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr cancel_service = std::make_shared(cancel_service_name, RpcProtocol); - if (!fulfill_service_type_nts_( + if (!fill_service_type_nts_( action_info.cancel, cancel_service, RpcProtocol)) @@ -898,7 +896,7 @@ bool EnablerParticipant::query_action_nts_( std::shared_ptr result_service = std::make_shared(result_service_name, RpcProtocol); - if (!fulfill_service_type_nts_( + if (!fill_service_type_nts_( action_info.result, result_service, RpcProtocol)) From e487066c360ea5a22c7d061c960d1532cb28710a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 14:48:50 +0200 Subject: [PATCH 66/87] Reorder implementations Signed-off-by: Eugenio Collado --- .../src/cpp/EnablerParticipant.cpp | 886 +++++++++--------- 1 file changed, 443 insertions(+), 443 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 87756df6..aeea9f73 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -47,54 +47,6 @@ EnablerParticipant::EnablerParticipant( { } -bool EnablerParticipant::service_discovered_nts_( - const std::shared_ptr rpc_info, - const DdsTopic& topic) -{ - auto [it, inserted] = services_.try_emplace(rpc_info->service_name, - std::make_shared(rpc_info->service_name, rpc_info->rpc_protocol)); - if (it->second->add_topic(topic, rpc_info->service_type)) - { - it->second->external_server = true; - return true; - } - return false; -} - -bool EnablerParticipant::action_discovered_nts_( - const std::shared_ptr rpc_info, - const DdsTopic& topic) -{ - auto [it, inserted] = actions_.try_emplace(rpc_info->action_name, - std::make_shared(rpc_info->action_name, rpc_info->rpc_protocol)); - if (ServiceType::NONE != rpc_info->service_type) - { - if (service_discovered_nts_(rpc_info, topic)) - { - auto service_it = services_.find(rpc_info->service_name); - if (services_.end() == service_it) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Service " << rpc_info->service_name << " not found in action " << rpc_info->action_name); - return false; - } - - it->second->add_service(service_it->second, rpc_info->action_type); - } - } - else - { - it->second->add_topic(topic, rpc_info->action_type); - } - - if (it->second->check_fully_discovered()) - { - it->second->external_server = true; - return true; - } - return false; -} - std::shared_ptr EnablerParticipant::create_reader( const ITopic& topic) { @@ -183,41 +135,6 @@ std::shared_ptr EnablerParticipant::create_reader( return reader; } -bool EnablerParticipant::create_topic_writer_nts_( - const DdsTopic& topic, - std::shared_ptr& reader, - std::unique_lock& lck) -{ - ddspipe::core::types::Endpoint request_edp; - return create_topic_writer_nts_(topic, reader, request_edp, lck); -} - -bool EnablerParticipant::create_topic_writer_nts_( - const DdsTopic& topic, - std::shared_ptr& reader, - ddspipe::core::types::Endpoint& request_edp, - std::unique_lock& lck) -{ - request_edp = rtps::CommonParticipant::simulate_endpoint(topic, this->id()); - this->discovery_database_->add_endpoint(request_edp); - - // Wait for reader to be created from discovery thread - // NOTE: Set a timeout to avoid a deadlock in case the reader is never created for some reason (e.g. the topic - // is blocked or the underlying DDS Pipe object is disabled/destroyed before the reader is created). - if (!cv_.wait_for(lck, std::chrono::seconds(5), [&] - { - return nullptr != (reader = lookup_reader_nts_(topic.m_topic_name)); - })) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create internal reader for topic " << topic.m_topic_name << - " , please verify that the topic is allowed."); - return false; - } - - return true; -} - bool EnablerParticipant::publish( const std::string& topic_name, const std::string& json) @@ -379,35 +296,6 @@ bool EnablerParticipant::publish_rpc( return true; } -bool EnablerParticipant::create_service_request_writer_nts_( - std::shared_ptr service, - std::unique_lock& lck) -{ - auto reader = lookup_reader_nts_(service->topic_request.m_topic_name); - - if (nullptr == reader) - { - ddspipe::core::types::Endpoint request_edp; - if (create_topic_writer_nts_( - service->topic_request, - reader, - request_edp, - lck)) - { - service->endpoint_request = request_edp; - return true; - } - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create service request writer for service " << service->service_name << "."); - return false; - } - - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create server as there is already a server running for service " << service->service_name << - "."); - return false; -} - bool EnablerParticipant::announce_service( const std::string& service_name, RpcProtocol RpcProtocol) @@ -453,44 +341,6 @@ bool EnablerParticipant::revoke_service( return revoke_service_nts_(service_name); } -bool EnablerParticipant::revoke_service_nts_( - const std::string& service_name) -{ - auto it = services_.find(service_name); - if (it == services_.end()) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to revoke service " << service_name << " : service not found."); - return false; - } - if (!it->second->enabler_as_server || !it->second->endpoint_request.has_value()) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to revoke service " << service_name << " : service not announced as server."); - return false; - } - - if (it->second->external_server) - { - it->second->enabler_as_server = false; - return true; - } - - std::string request_name = it->second->topic_request.m_topic_name; - - this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); - it->second->endpoint_request.reset(); - it->second->remove_topic(ServiceType::REQUEST); - - auto reader = lookup_reader_nts_(request_name); - if (nullptr != reader) - { - readers_.erase(reader->topic()); - } - - return true; -} - bool EnablerParticipant::send_service_request( const std::string& service_name, const std::string& json, @@ -672,115 +522,303 @@ bool EnablerParticipant::revoke_action( return false; } -bool EnablerParticipant::query_topic_nts_( - const std::string& topic_name, - DdsTopic& topic) +bool EnablerParticipant::send_action_goal( + const std::string& action_name, + const std::string& json, + UUID& action_id, + RpcProtocol RpcProtocol) { - if (!topic_query_callback_) + std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); + std::string goal_request_topic = action_name + ACTION_GOAL_SUFFIX; + uint64_t goal_request_id = 0; + + if (!send_service_request( + goal_request_topic, + goal_json, + goal_request_id, + RpcProtocol)) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to query data from topic " << topic_name << - " : topic is unknown and topic query callback not set."); + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal request to action " << action_name); return false; } - TopicInfo topic_info; - if (!topic_query_callback_(topic_name.c_str(), topic_info)) + + if (!handler_->store_action_request( + action_name, + action_id, + goal_request_id, + ActionType::GOAL, + RpcProtocol)) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to query data from topic " << topic_name << " : topic query callback failed."); + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action goal request to action " << action_name); + handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); return false; } - return fill_topic_struct_nts_(topic_name, topic_info, topic); + return true; } -bool EnablerParticipant::fill_topic_struct_nts_( - const std::string& topic_name, - const TopicInfo& topic_info, - DdsTopic& topic) - +bool EnablerParticipant::cancel_action_goal( + const std::string& action_name, + const UUID& goal_id, + const int64_t timestamp) { - // Deserialize QoS if provided by the user (otherwise use default one) - TopicQoS qos; - if (!topic_info.serialized_qos.empty()) + if (goal_id != UUID() && + !handler_->is_UUID_active(action_name, goal_id)) { - try - { - qos = serialization::deserialize_qos(topic_info.serialized_qos); - } - catch (const std::exception& e) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to deserialize QoS for topic " << topic_name << ": " << e.what()); - return false; - } + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to cancel action goal for action " << action_name + << ": goal id not found."); + return false; } - fastdds::dds::xtypes::TypeIdentifier type_identifier; - if (!handler_->get_type_identifier(topic_info.type_name, type_identifier)) + std::string cancel_json = RpcUtils::create_cancel_request_msg(goal_id, timestamp); + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + uint64_t cancel_request_id = 0; + std::string cancel_request_topic = action_name + ACTION_CANCEL_SUFFIX; + + if (send_service_request( + cancel_request_topic, + cancel_json, + cancel_request_id, + protocol)) { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to create topic " << topic_name << " : type identifier not found."); - return false; + return true; } - topic.m_topic_name = topic_name; - topic.type_name = topic_info.type_name; - topic.topic_qos = qos; - topic.type_identifiers.type_identifier1(type_identifier); - - return true; + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel goal to action " << action_name); + return false; } -bool EnablerParticipant::fill_service_type_nts_( - const ServiceInfo& service_info, - std::shared_ptr service, - RpcProtocol RpcProtocol) +bool EnablerParticipant::send_action_get_result_request( + const std::string& action_name, + const UUID& action_id) { - std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; - switch (RpcProtocol) - { - case RpcProtocol::ROS2: - rq_prefix = ROS_REQUEST_PREFIX; - rq_suffix = ROS_REQUEST_SUFFIX; - rp_prefix = ROS_REPLY_PREFIX; - rp_suffix = ROS_REPLY_SUFFIX; + std::string json = RpcUtils::create_result_request_msg(action_id); + + std::string get_result_request_topic = action_name + ACTION_RESULT_SUFFIX; + uint64_t get_result_request_id = 0; + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, action_id); + + if (!send_service_request( + get_result_request_topic, + json, + get_result_request_id, + protocol)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result request to action " << action_name); + return false; + } + + if (!handler_->store_action_request( + action_name, + action_id, + get_result_request_id, + ActionType::RESULT)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to store action get result request to action " << action_name + << ": cancelling."); + cancel_action_goal(action_name, action_id, 0); + return false; + } + + return true; +} + +void EnablerParticipant::send_action_send_goal_reply( + const std::string& action_name, + const uint64_t goal_id, + bool accepted) +{ + std::string reply_json = RpcUtils::create_goal_reply_msg(accepted); + + if (!send_service_reply( + action_name + ACTION_GOAL_SUFFIX, + reply_json, + goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action goal reply to action " << action_name + << ": goal id not found."); + } + return; +} + +bool EnablerParticipant::send_action_cancel_goal_reply( + const char* action_name, + const std::vector& goal_ids, + const CancelCode& cancel_code, + const uint64_t request_id) +{ + std::vector> cancelling_goals; + for (const auto& goal_id : goal_ids) + { + std::chrono::system_clock::time_point timestamp; + if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) + { + continue; + } + + cancelling_goals.emplace_back(goal_id, timestamp); + } + std::string reply_json = RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); + + if (!send_service_reply( + std::string(action_name) + ACTION_CANCEL_SUFFIX, + reply_json, + request_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action cancel reply to action " << action_name + << ": request id not found."); + return false; + } + return true; +} + +bool EnablerParticipant::send_action_result( + const char* action_name, + const UUID& goal_id, + const StatusCode& status_code, + const char* json) +{ + if (!handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action result to action " << action_name + << ": goal id not found."); + return false; + } + + std::string reply_json = RpcUtils::create_result_reply_msg(status_code, json); + + return handler_->handle_action_result(action_name, goal_id, reply_json); +} + +bool EnablerParticipant::send_action_get_result_reply( + const std::string& action_name, + const UUID& goal_id, + const std::string& reply_json, + const uint64_t request_id) +{ + std::string result_topic = action_name + ACTION_RESULT_SUFFIX; + + if (send_service_reply( + result_topic, + reply_json, + request_id)) + { + handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); + return true; + } + + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action get result to action " << action_name); + + return false; +} + +bool EnablerParticipant::send_action_feedback( + const char* action_name, + const char* json, + const UUID& goal_id) +{ + if (!handler_->is_UUID_active(action_name, goal_id)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send action feedback to action " << action_name + << ": goal id not found."); + return false; + } + + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) + { + case RpcProtocol::ROS2: + prefix = ROS_TOPIC_PREFIX; break; case RpcProtocol::FASTDDS: - rq_prefix = FASTDDS_REQUEST_PREFIX; - rq_suffix = FASTDDS_REQUEST_SUFFIX; - rp_prefix = FASTDDS_REPLY_PREFIX; - rp_suffix = FASTDDS_REPLY_SUFFIX; + prefix = FASTDDS_TOPIC_PREFIX; break; default: - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to announce service " << service->service_name << ": unknown RPC protocol."); + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send feedback to action " << action_name + << ": unsupported RPC protocol."); return false; } - DdsTopic topic_request; - std::string topic_request_name = rq_prefix + service->service_name + rq_suffix; - if (!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) + std::string feedback_json = RpcUtils::create_feedback_msg(json, goal_id); + std::string feedback_topic = prefix + std::string(action_name) + ACTION_FEEDBACK_SUFFIX; + + return publish(feedback_topic, feedback_json); +} + +bool EnablerParticipant::update_action_status( + const std::string& action_name, + const UUID& goal_id, + const StatusCode& status_code) +{ + std::chrono::system_clock::time_point goal_accepted_stamp; + if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) { + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to update action status to action " << action_name + << ": goal id not found."); return false; } - service->add_topic(topic_request, ServiceType::REQUEST); - DdsTopic topic_reply; - std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; - if (!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) + RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + + std::string prefix; + switch (protocol) { - return false; + case RpcProtocol::ROS2: + prefix = ROS_TOPIC_PREFIX; + break; + case RpcProtocol::FASTDDS: + prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + "Failed to send status to action " << action_name + << ": unsupported RPC protocol."); + return false; } - service->add_topic(topic_reply, ServiceType::REPLY); - if (!service->fully_discovered) + std::string status_json = RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); + std::string status_topic = prefix + action_name + ACTION_STATUS_SUFFIX; + return publish(status_topic, status_json); +} + +bool EnablerParticipant::query_topic_nts_( + const std::string& topic_name, + DdsTopic& topic) +{ + if (!topic_query_callback_) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to query data from topic " << topic_name << + " : topic is unknown and topic query callback not set."); + return false; + } + TopicInfo topic_info; + if (!topic_query_callback_(topic_name.c_str(), topic_info)) { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to query data from topic " << topic_name << " : topic query callback failed."); return false; } - service->enabler_as_server = true; - return true; + return fill_topic_struct_nts_(topic_name, topic_info, topic); } bool EnablerParticipant::query_service_nts_( @@ -982,303 +1020,265 @@ bool EnablerParticipant::query_action_nts_( return true; } -std::shared_ptr EnablerParticipant::lookup_reader_nts_( - const std::string& topic_name, - std::string& type_name) const +bool EnablerParticipant::create_topic_writer_nts_( + const DdsTopic& topic, + std::shared_ptr& reader, + std::unique_lock& lck) { - for (const auto& reader : readers_) - { - if (reader.first.m_topic_name == topic_name) - { - type_name = reader.first.type_name; - return reader.second; - } - } - return nullptr; + ddspipe::core::types::Endpoint request_edp; + return create_topic_writer_nts_(topic, reader, request_edp, lck); } -std::shared_ptr EnablerParticipant::lookup_reader_nts_( - const std::string& topic_name) const +bool EnablerParticipant::create_topic_writer_nts_( + const DdsTopic& topic, + std::shared_ptr& reader, + ddspipe::core::types::Endpoint& request_edp, + std::unique_lock& lck) { - std::string _; - return lookup_reader_nts_(topic_name, _); -} + request_edp = rtps::CommonParticipant::simulate_endpoint(topic, this->id()); + this->discovery_database_->add_endpoint(request_edp); -bool EnablerParticipant::send_action_goal( - const std::string& action_name, - const std::string& json, - UUID& action_id, - RpcProtocol RpcProtocol) -{ - std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); - std::string goal_request_topic = action_name + ACTION_GOAL_SUFFIX; - uint64_t goal_request_id = 0; - - if (!send_service_request( - goal_request_topic, - goal_json, - goal_request_id, - RpcProtocol)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal request to action " << action_name); - return false; - } - - if (!handler_->store_action_request( - action_name, - action_id, - goal_request_id, - ActionType::GOAL, - RpcProtocol)) + // Wait for reader to be created from discovery thread + // NOTE: Set a timeout to avoid a deadlock in case the reader is never created for some reason (e.g. the topic + // is blocked or the underlying DDS Pipe object is disabled/destroyed before the reader is created). + if (!cv_.wait_for(lck, std::chrono::seconds(5), [&] + { + return nullptr != (reader = lookup_reader_nts_(topic.m_topic_name)); + })) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to store action goal request to action " << action_name); - handler_->erase_action_UUID(action_id, ActionEraseReason::FORCED); + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create internal reader for topic " << topic.m_topic_name << + " , please verify that the topic is allowed."); return false; } return true; } -bool EnablerParticipant::cancel_action_goal( - const std::string& action_name, - const UUID& goal_id, - const int64_t timestamp) +bool EnablerParticipant::create_service_request_writer_nts_( + std::shared_ptr service, + std::unique_lock& lck) { - if (goal_id != UUID() && - !handler_->is_UUID_active(action_name, goal_id)) - { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to cancel action goal for action " << action_name - << ": goal id not found."); - return false; - } - - std::string cancel_json = RpcUtils::create_cancel_request_msg(goal_id, timestamp); - - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); - - uint64_t cancel_request_id = 0; - std::string cancel_request_topic = action_name + ACTION_CANCEL_SUFFIX; + auto reader = lookup_reader_nts_(service->topic_request.m_topic_name); - if (send_service_request( - cancel_request_topic, - cancel_json, - cancel_request_id, - protocol)) + if (nullptr == reader) { - return true; + ddspipe::core::types::Endpoint request_edp; + if (create_topic_writer_nts_( + service->topic_request, + reader, + request_edp, + lck)) + { + service->endpoint_request = request_edp; + return true; + } + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create service request writer for service " << service->service_name << "."); + return false; } - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action cancel goal to action " << action_name); + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create server as there is already a server running for service " << service->service_name << + "."); return false; } -bool EnablerParticipant::send_action_get_result_request( - const std::string& action_name, - const UUID& action_id) -{ - std::string json = RpcUtils::create_result_request_msg(action_id); - - std::string get_result_request_topic = action_name + ACTION_RESULT_SUFFIX; - uint64_t get_result_request_id = 0; - - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, action_id); +bool EnablerParticipant::fill_topic_struct_nts_( + const std::string& topic_name, + const TopicInfo& topic_info, + DdsTopic& topic) - if (!send_service_request( - get_result_request_topic, - json, - get_result_request_id, - protocol)) +{ + // Deserialize QoS if provided by the user (otherwise use default one) + TopicQoS qos; + if (!topic_info.serialized_qos.empty()) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action get result request to action " << action_name); - return false; + try + { + qos = serialization::deserialize_qos(topic_info.serialized_qos); + } + catch (const std::exception& e) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to deserialize QoS for topic " << topic_name << ": " << e.what()); + return false; + } } - if (!handler_->store_action_request( - action_name, - action_id, - get_result_request_id, - ActionType::RESULT)) + fastdds::dds::xtypes::TypeIdentifier type_identifier; + if (!handler_->get_type_identifier(topic_info.type_name, type_identifier)) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to store action get result request to action " << action_name - << ": cancelling."); - cancel_action_goal(action_name, action_id, 0); + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to create topic " << topic_name << " : type identifier not found."); return false; } + topic.m_topic_name = topic_name; + topic.type_name = topic_info.type_name; + topic.topic_qos = qos; + topic.type_identifiers.type_identifier1(type_identifier); + return true; } -void EnablerParticipant::send_action_send_goal_reply( - const std::string& action_name, - const uint64_t goal_id, - bool accepted) +bool EnablerParticipant::fill_service_type_nts_( + const ServiceInfo& service_info, + std::shared_ptr service, + RpcProtocol RpcProtocol) { - std::string reply_json = RpcUtils::create_goal_reply_msg(accepted); - - if (!send_service_reply( - action_name + ACTION_GOAL_SUFFIX, - reply_json, - goal_id)) + std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; + switch (RpcProtocol) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action goal reply to action " << action_name - << ": goal id not found."); + case RpcProtocol::ROS2: + rq_prefix = ROS_REQUEST_PREFIX; + rq_suffix = ROS_REQUEST_SUFFIX; + rp_prefix = ROS_REPLY_PREFIX; + rp_suffix = ROS_REPLY_SUFFIX; + break; + case RpcProtocol::FASTDDS: + rq_prefix = FASTDDS_REQUEST_PREFIX; + rq_suffix = FASTDDS_REQUEST_SUFFIX; + rp_prefix = FASTDDS_REPLY_PREFIX; + rp_suffix = FASTDDS_REPLY_SUFFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce service " << service->service_name << ": unknown RPC protocol."); + return false; } - return; -} -bool EnablerParticipant::send_action_cancel_goal_reply( - const char* action_name, - const std::vector& goal_ids, - const CancelCode& cancel_code, - const uint64_t request_id) -{ - std::vector> cancelling_goals; - for (const auto& goal_id : goal_ids) + DdsTopic topic_request; + std::string topic_request_name = rq_prefix + service->service_name + rq_suffix; + if (!fill_topic_struct_nts_(topic_request_name, service_info.request, topic_request)) { - std::chrono::system_clock::time_point timestamp; - if (!handler_->is_UUID_active(action_name, goal_id, ×tamp)) - { - continue; - } + return false; + } + service->add_topic(topic_request, ServiceType::REQUEST); - cancelling_goals.emplace_back(goal_id, timestamp); + DdsTopic topic_reply; + std::string topic_reply_name = rp_prefix + service->service_name + rp_suffix; + if (!fill_topic_struct_nts_(topic_reply_name, service_info.reply, topic_reply)) + { + return false; } - std::string reply_json = RpcUtils::create_cancel_reply_msg(cancelling_goals, cancel_code); + service->add_topic(topic_reply, ServiceType::REPLY); - if (!send_service_reply( - std::string(action_name) + ACTION_CANCEL_SUFFIX, - reply_json, - request_id)) + if (!service->fully_discovered) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action cancel reply to action " << action_name - << ": request id not found."); return false; } + + service->enabler_as_server = true; return true; } -bool EnablerParticipant::send_action_result( - const char* action_name, - const UUID& goal_id, - const StatusCode& status_code, - const char* json) +std::shared_ptr EnablerParticipant::lookup_reader_nts_( + const std::string& topic_name, + std::string& type_name) const { - if (!handler_->is_UUID_active(action_name, goal_id)) + for (const auto& reader : readers_) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action result to action " << action_name - << ": goal id not found."); - return false; + if (reader.first.m_topic_name == topic_name) + { + type_name = reader.first.type_name; + return reader.second; + } } - - std::string reply_json = RpcUtils::create_result_reply_msg(status_code, json); - - return handler_->handle_action_result(action_name, goal_id, reply_json); + return nullptr; } -bool EnablerParticipant::send_action_get_result_reply( - const std::string& action_name, - const UUID& goal_id, - const std::string& reply_json, - const uint64_t request_id) +std::shared_ptr EnablerParticipant::lookup_reader_nts_( + const std::string& topic_name) const { - std::string result_topic = action_name + ACTION_RESULT_SUFFIX; + std::string _; + return lookup_reader_nts_(topic_name, _); +} - if (send_service_reply( - result_topic, - reply_json, - request_id)) +bool EnablerParticipant::service_discovered_nts_( + const std::shared_ptr rpc_info, + const DdsTopic& topic) +{ + auto [it, inserted] = services_.try_emplace(rpc_info->service_name, + std::make_shared(rpc_info->service_name, rpc_info->rpc_protocol)); + if (it->second->add_topic(topic, rpc_info->service_type)) { - handler_->erase_action_UUID(goal_id, ActionEraseReason::FORCED); + it->second->external_server = true; return true; } - - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action get result to action " << action_name); - return false; } -bool EnablerParticipant::send_action_feedback( - const char* action_name, - const char* json, - const UUID& goal_id) +bool EnablerParticipant::action_discovered_nts_( + const std::shared_ptr rpc_info, + const DdsTopic& topic) { - if (!handler_->is_UUID_active(action_name, goal_id)) + auto [it, inserted] = actions_.try_emplace(rpc_info->action_name, + std::make_shared(rpc_info->action_name, rpc_info->rpc_protocol)); + if (ServiceType::NONE != rpc_info->service_type) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action feedback to action " << action_name - << ": goal id not found."); - return false; - } - - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + if (service_discovered_nts_(rpc_info, topic)) + { + auto service_it = services_.find(rpc_info->service_name); + if (services_.end() == service_it) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Service " << rpc_info->service_name << " not found in action " << rpc_info->action_name); + return false; + } - std::string prefix; - switch (protocol) + it->second->add_service(service_it->second, rpc_info->action_type); + } + } + else { - case RpcProtocol::ROS2: - prefix = ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - prefix = FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send feedback to action " << action_name - << ": unsupported RPC protocol."); - return false; + it->second->add_topic(topic, rpc_info->action_type); } - std::string feedback_json = RpcUtils::create_feedback_msg(json, goal_id); - std::string feedback_topic = prefix + std::string(action_name) + ACTION_FEEDBACK_SUFFIX; - - return publish(feedback_topic, feedback_json); + if (it->second->check_fully_discovered()) + { + it->second->external_server = true; + return true; + } + return false; } -bool EnablerParticipant::update_action_status( - const std::string& action_name, - const UUID& goal_id, - const StatusCode& status_code) +bool EnablerParticipant::revoke_service_nts_( + const std::string& service_name) { - std::chrono::system_clock::time_point goal_accepted_stamp; - if (!handler_->is_UUID_active(action_name, goal_id, &goal_accepted_stamp)) + auto it = services_.find(service_name); + if (it == services_.end()) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to update action status to action " << action_name - << ": goal id not found."); + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to revoke service " << service_name << " : service not found."); + return false; + } + if (!it->second->enabler_as_server || !it->second->endpoint_request.has_value()) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to revoke service " << service_name << " : service not announced as server."); return false; } - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + if (it->second->external_server) + { + it->second->enabler_as_server = false; + return true; + } - std::string prefix; - switch (protocol) + std::string request_name = it->second->topic_request.m_topic_name; + + this->discovery_database_->erase_endpoint(it->second->endpoint_request.value()); + it->second->endpoint_request.reset(); + it->second->remove_topic(ServiceType::REQUEST); + + auto reader = lookup_reader_nts_(request_name); + if (nullptr != reader) { - case RpcProtocol::ROS2: - prefix = ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - prefix = FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send status to action " << action_name - << ": unsupported RPC protocol."); - return false; + readers_.erase(reader->topic()); } - std::string status_json = RpcUtils::create_status_msg(goal_id, status_code, goal_accepted_stamp); - std::string status_topic = prefix + action_name + ACTION_STATUS_SUFFIX; - return publish(status_topic, status_json); + return true; } } /* namespace participants */ From 0dbca9aaaab5354b65debf4dcb7cadf277848e34 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 15:00:32 +0200 Subject: [PATCH 67/87] Rpc struct Signed-off-by: Eugenio Collado --- .../rpc/RpcStructs.hpp | 486 ++--------------- .../src/cpp/rpc/RpcStructs.cpp | 489 ++++++++++++++++++ .../src/cpp/{ => rpc}/RpcUtils.cpp | 0 3 files changed, 534 insertions(+), 441 deletions(-) create mode 100644 ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp rename ddsenabler_participants/src/cpp/{ => rpc}/RpcUtils.cpp (100%) diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index a7cd4f6c..2ac216cd 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -46,15 +46,7 @@ struct RpcAction const ddspipe::core::types::RpcTopic& result, const ddspipe::core::types::RpcTopic& cancel, const ddspipe::core::types::DdsTopic& feedback, - const ddspipe::core::types::DdsTopic& status) - : action_name(action_name) - , goal(goal) - , result(result) - , cancel(cancel) - , feedback(feedback) - , status(status) - { - } + const ddspipe::core::types::DdsTopic& status); std::string action_name; ddspipe::core::types::RpcTopic goal; @@ -67,170 +59,11 @@ struct RpcAction struct RpcInfo { RpcInfo( - const std::string& dds_topic_name) - : topic_name(dds_topic_name) - , rpc_protocol(RpcProtocol::PROTOCOL_UNKNOWN) - , rpc_type(RpcType::NONE) - , service_type(ServiceType::NONE) - , action_type(ActionType::NONE) - { - detect_rpc_protocol(); - try - { - remove_prefix_suffix(); - } - catch(const std::exception& e) - { - throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); - } - } - - void detect_rpc_protocol() - { - if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) - { - rpc_protocol = RpcProtocol::ROS2; - return; - } - // With the current Fast Prefixes being empty strings, this check must be the last one - else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) - { - rpc_protocol = RpcProtocol::FASTDDS; - return; - } - rpc_protocol = RpcProtocol::PROTOCOL_UNKNOWN; - } - - void remove_prefix_suffix() - { - rpc_protocol = rpc_protocol; - - std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; - switch (rpc_protocol) - { - case RpcProtocol::ROS2: - request_prefix = ROS_REQUEST_PREFIX; - request_suffix = ROS_REQUEST_SUFFIX; - reply_prefix = ROS_REPLY_PREFIX; - reply_suffix = ROS_REPLY_SUFFIX; - topic_prefix = ROS_TOPIC_PREFIX; - break; - case RpcProtocol::FASTDDS: - request_prefix = FASTDDS_REQUEST_PREFIX; - request_suffix = FASTDDS_REQUEST_SUFFIX; - reply_prefix = FASTDDS_REPLY_PREFIX; - reply_suffix = FASTDDS_REPLY_SUFFIX; - topic_prefix = FASTDDS_TOPIC_PREFIX; - break; - default: - EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, - "Invalid RPC protocol"); - throw std::runtime_error("Invalid RPC protocol"); - } - - std::string base = topic_name; - if ((base.rfind(request_prefix, 0) == 0) && - (base.size() >= request_suffix.length()) && - (base.substr(base.size() - request_suffix.length()) == request_suffix)) - { - base = base.substr(request_prefix.length()); - base = base.substr(0, base.size() - (request_suffix.length())); - service_type = ServiceType::REQUEST; - service_name = base; - - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::GOAL; - return; - } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::RESULT; - return; - } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::CANCEL; - return; - } - - rpc_type = RpcType::SERVICE; - return; - } - if ((base.rfind(reply_prefix, 0) == 0) && - (base.size() >= reply_suffix.length()) && - (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) - { - base = base.substr(reply_prefix.length()); - base = base.substr(0, base.size() - (reply_suffix.length())); - service_type = ServiceType::REPLY; - service_name = base; - - if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::GOAL; - return; - } - else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::RESULT; - return; - } - else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && - base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::CANCEL; - return; - } - - rpc_type = RpcType::SERVICE; - return; - } - - // Check for action feedback/status topics - base = base.substr(topic_prefix.length()); - if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && - base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == - (std::string("/") + ACTION_FEEDBACK_SUFFIX)) - { - action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); - rpc_type = RpcType::ACTION; - action_type = ActionType::FEEDBACK; - return; - } - if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && - base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == - (std::string("/") + ACTION_STATUS_SUFFIX)) - { - action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); - rpc_type = RpcType::ACTION; - action_type = ActionType::STATUS; - return; - } - - return; - } + const std::string& dds_topic_name); + + void detect_rpc_protocol(); + + void remove_prefix_suffix(); std::string topic_name; std::string service_name; @@ -249,80 +82,19 @@ struct ActionRequestInfo const std::string& _action_name, ActionType action_type, uint64_t request_id, - RpcProtocol rpc_protocol) - : action_name(_action_name) - , goal_accepted_stamp(std::chrono::system_clock::now()) - , rpc_protocol(rpc_protocol) - { - set_request(request_id, action_type); - } + RpcProtocol rpc_protocol); void set_request( uint64_t request_id, - ActionType action_type) - { - switch (action_type) - { - case ActionType::GOAL: - goal_request_id = request_id; - break; - case ActionType::RESULT: - result_request_id = request_id; - break; - default: - break; - } - return; - } - - uint64_t get_request( - ActionType action_type) const - { - switch (action_type) - { - case ActionType::GOAL: - return goal_request_id; - case ActionType::RESULT: - return result_request_id; - default: - throw std::runtime_error("Invalid action type for request retrieval"); - } - } - - bool set_result( - const std::string&& str) - { - if (str.empty() || !result.empty()) - { - return false; // Cannot set string if already set or empty - } - result = std::move(str); - return true; - } - - bool erase( - ActionEraseReason erase_reason) - { - switch (erase_reason) - { - case ActionEraseReason::FINAL_STATUS: - final_status_received = true; - break; - case ActionEraseReason::RESULT: - result_received = true; - break; - case ActionEraseReason::FORCED: - final_status_received = true; - result_received = true; - break; - } - return final_status_received && result_received; - } - - RpcProtocol get_rpc_protocol() const - { - return rpc_protocol; - } + ActionType action_type); + + uint64_t get_request(ActionType action_type) const; + + bool set_result(const std::string&& str); + + bool erase(ActionEraseReason erase_reason); + + RpcProtocol get_rpc_protocol() const; std::string action_name; RpcProtocol rpc_protocol; @@ -339,11 +111,22 @@ struct ServiceDiscovered ServiceDiscovered( const std::string& service_name, - RpcProtocol rpc_protocol) - : service_name(service_name) - , rpc_protocol(rpc_protocol) - { - } + RpcProtocol rpc_protocol); + + bool add_topic( + const ddspipe::core::types::DdsTopic& topic, + ServiceType service_type); + + bool remove_topic( + ServiceType service_type); + + ddspipe::core::types::RpcTopic get_service(); + + bool get_topic( + ServiceType service_type, + ddspipe::core::types::DdsTopic& topic); + + RpcProtocol get_rpc_protocol() const; std::string service_name; RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; @@ -360,117 +143,25 @@ struct ServiceDiscovered std::optional endpoint_request; bool enabler_as_server{false}; bool external_server{false}; - - bool add_topic( - const ddspipe::core::types::DdsTopic& topic, - ServiceType service_type) - { - if (service_type == ServiceType::REQUEST) - { - if (request_discovered) - { - return false; - } - topic_request = topic; - request_discovered = true; - } - else - { - if (reply_discovered) - { - return false; - } - topic_reply = topic; - reply_discovered = true; - } - - if (request_discovered && reply_discovered) - { - if (service_name.empty()) - { - return false; - } - fully_discovered = true; - rpc_topic = std::make_optional( - service_name, - topic_request, - topic_reply); - return true; - } - - return false; - } - - bool remove_topic( - ServiceType service_type) - { - if (service_type == ServiceType::REQUEST) - { - request_discovered = false; - topic_request = ddspipe::core::types::DdsTopic(); - } - else - { - reply_discovered = false; - topic_reply = ddspipe::core::types::DdsTopic(); - } - - fully_discovered = false; - rpc_topic = std::nullopt; - - return true; - } - - ddspipe::core::types::RpcTopic get_service() - { - if (!fully_discovered || rpc_topic == std::nullopt) - { - throw std::runtime_error("Service " + service_name + " not fully discovered"); - } - return rpc_topic.value(); - } - - bool get_topic( - ServiceType service_type, - ddspipe::core::types::DdsTopic& topic) - { - if (service_type == ServiceType::REQUEST) - { - if (!request_discovered) - { - return false; - } - topic = topic_request; - return true; - } - if (service_type == ServiceType::REPLY) - { - if (!reply_discovered) - { - return false; - } - topic = topic_reply; - return true; - } - return false; - } - - RpcProtocol get_rpc_protocol() const - { - return rpc_protocol; - } - }; struct ActionDiscovered { ActionDiscovered( const std::string& action_name, - RpcProtocol rpc_protocol) - : action_name(action_name) - , rpc_protocol(rpc_protocol) - { - } + RpcProtocol rpc_protocol); + + bool check_fully_discovered(); + + bool add_service( + std::shared_ptr service, + ActionType action_type); + + bool add_topic( + const ddspipe::core::types::DdsTopic& topic, + ActionType action_type); + + RpcAction get_action(); std::string action_name; RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; @@ -484,93 +175,6 @@ struct ActionDiscovered bool fully_discovered{false}; bool enabler_as_server{false}; bool external_server{false}; - - bool check_fully_discovered() - { - auto g = goal.lock(); - auto r = result.lock(); - auto c = cancel.lock(); - - if (g && r && c && - g->fully_discovered && r->fully_discovered && c->fully_discovered && - feedback_discovered && status_discovered) - { - fully_discovered = true; - return true; - } - fully_discovered = false; - return false; - } - - bool add_service( - std::shared_ptr service, - ActionType action_type) - { - switch (action_type) - { - case ActionType::GOAL: - goal = service; - break; - case ActionType::RESULT: - result = service; - break; - case ActionType::CANCEL: - cancel = service; - break; - default: - return false; - } - return true; - } - - bool add_topic( - const ddspipe::core::types::DdsTopic& topic, - ActionType action_type) - { - switch (action_type) - { - case ActionType::FEEDBACK: - feedback = topic; - feedback_discovered = true; - break; - case ActionType::STATUS: - status = topic; - status_discovered = true; - break; - default: - return false; - } - - return true; - } - - RpcAction get_action() - { - auto g = goal.lock(); - auto r = result.lock(); - auto c = cancel.lock(); - - if (!fully_discovered || !g || !r || !c) - { - throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); - } - - try - { - return RpcAction( - action_name, - g->get_service(), - r->get_service(), - c->get_service(), - feedback, - status); - } - catch(const std::exception& e) - { - throw std::runtime_error("Failed to create action " + action_name + ": " + e.what()); - } - } - }; } // namespace participants diff --git a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp new file mode 100644 index 00000000..b148f923 --- /dev/null +++ b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp @@ -0,0 +1,489 @@ +// Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file RpcStructs.cpp + */ + +#include + +namespace eprosima { +namespace ddsenabler { +namespace participants { + +RpcAction::RpcAction( + const std::string& action_name, + const ddspipe::core::types::RpcTopic& goal, + const ddspipe::core::types::RpcTopic& result, + const ddspipe::core::types::RpcTopic& cancel, + const ddspipe::core::types::DdsTopic& feedback, + const ddspipe::core::types::DdsTopic& status) + : action_name(action_name) + , goal(goal) + , result(result) + , cancel(cancel) + , feedback(feedback) + , status(status) +{ +} + +RpcInfo::RpcInfo( + const std::string& dds_topic_name) + : topic_name(dds_topic_name) + , rpc_protocol(RpcProtocol::PROTOCOL_UNKNOWN) + , rpc_type(RpcType::NONE) + , service_type(ServiceType::NONE) + , action_type(ActionType::NONE) +{ + detect_rpc_protocol(); + try + { + remove_prefix_suffix(); + } + catch(const std::exception& e) + { + throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); + } +} + +void RpcInfo::detect_rpc_protocol() +{ + if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) + { + rpc_protocol = RpcProtocol::ROS2; + return; + } + // With the current Fast Prefixes being empty strings, this check must be the last one + else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) + { + rpc_protocol = RpcProtocol::FASTDDS; + return; + } + rpc_protocol = RpcProtocol::PROTOCOL_UNKNOWN; +} + +void RpcInfo::remove_prefix_suffix() +{ + rpc_protocol = rpc_protocol; + + std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; + switch (rpc_protocol) + { + case RpcProtocol::ROS2: + request_prefix = ROS_REQUEST_PREFIX; + request_suffix = ROS_REQUEST_SUFFIX; + reply_prefix = ROS_REPLY_PREFIX; + reply_suffix = ROS_REPLY_SUFFIX; + topic_prefix = ROS_TOPIC_PREFIX; + break; + case RpcProtocol::FASTDDS: + request_prefix = FASTDDS_REQUEST_PREFIX; + request_suffix = FASTDDS_REQUEST_SUFFIX; + reply_prefix = FASTDDS_REPLY_PREFIX; + reply_suffix = FASTDDS_REPLY_SUFFIX; + topic_prefix = FASTDDS_TOPIC_PREFIX; + break; + default: + EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, + "Invalid RPC protocol"); + throw std::runtime_error("Invalid RPC protocol"); + } + + std::string base = topic_name; + if ((base.rfind(request_prefix, 0) == 0) && + (base.size() >= request_suffix.length()) && + (base.substr(base.size() - request_suffix.length()) == request_suffix)) + { + base = base.substr(request_prefix.length()); + base = base.substr(0, base.size() - (request_suffix.length())); + service_type = ServiceType::REQUEST; + service_name = base; + + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::GOAL; + return; + } + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::RESULT; + return; + } + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::CANCEL; + return; + } + + rpc_type = RpcType::SERVICE; + return; + } + if ((base.rfind(reply_prefix, 0) == 0) && + (base.size() >= reply_suffix.length()) && + (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) + { + base = base.substr(reply_prefix.length()); + base = base.substr(0, base.size() - (reply_suffix.length())); + service_type = ServiceType::REPLY; + service_name = base; + + if (base.size() >= (std::strlen(ACTION_GOAL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_GOAL_SUFFIX))) == ACTION_GOAL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_GOAL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::GOAL; + return; + } + else if (base.size() >= (std::strlen(ACTION_RESULT_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_RESULT_SUFFIX))) == ACTION_RESULT_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_RESULT_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::RESULT; + return; + } + else if (base.size() >= (std::strlen(ACTION_CANCEL_SUFFIX)) && + base.substr(base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))) == ACTION_CANCEL_SUFFIX) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_CANCEL_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::CANCEL; + return; + } + + rpc_type = RpcType::SERVICE; + return; + } + + // Check for action feedback/status topics + base = base.substr(topic_prefix.length()); + if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == + (std::string("/") + ACTION_FEEDBACK_SUFFIX)) + { + action_name = base.substr(0, base.size() - std::strlen(ACTION_FEEDBACK_SUFFIX)); + rpc_type = RpcType::ACTION; + action_type = ActionType::FEEDBACK; + return; + } + if (base.size() >= (std::strlen(ACTION_STATUS_SUFFIX) + 1) && + base.substr(base.size() - (std::strlen(ACTION_STATUS_SUFFIX) + 1)) == + (std::string("/") + ACTION_STATUS_SUFFIX)) + { + action_name = base.substr(0, base.size() - (std::strlen(ACTION_STATUS_SUFFIX))); + rpc_type = RpcType::ACTION; + action_type = ActionType::STATUS; + return; + } + + return; +} + +ActionRequestInfo::ActionRequestInfo( + const std::string& _action_name, + ActionType action_type, + uint64_t request_id, + RpcProtocol rpc_protocol) + : action_name(_action_name) + , goal_accepted_stamp(std::chrono::system_clock::now()) + , rpc_protocol(rpc_protocol) +{ + set_request(request_id, action_type); +} + +void ActionRequestInfo::set_request( + uint64_t request_id, + ActionType action_type) +{ + switch (action_type) + { + case ActionType::GOAL: + goal_request_id = request_id; + break; + case ActionType::RESULT: + result_request_id = request_id; + break; + default: + break; + } + return; +} + +uint64_t ActionRequestInfo::get_request( + ActionType action_type) const +{ + switch (action_type) + { + case ActionType::GOAL: + return goal_request_id; + case ActionType::RESULT: + return result_request_id; + default: + throw std::runtime_error("Invalid action type for request retrieval"); + } +} + +bool ActionRequestInfo::set_result( + const std::string&& str) +{ + if (str.empty() || !result.empty()) + { + return false; // Cannot set string if already set or empty + } + result = std::move(str); + return true; +} + +bool ActionRequestInfo::erase( + ActionEraseReason erase_reason) +{ + switch (erase_reason) + { + case ActionEraseReason::FINAL_STATUS: + final_status_received = true; + break; + case ActionEraseReason::RESULT: + result_received = true; + break; + case ActionEraseReason::FORCED: + final_status_received = true; + result_received = true; + break; + } + return final_status_received && result_received; +} + +RpcProtocol ActionRequestInfo::get_rpc_protocol() const +{ + return rpc_protocol; +} + +ServiceDiscovered::ServiceDiscovered( + const std::string& service_name, + RpcProtocol rpc_protocol) + : service_name(service_name) + , rpc_protocol(rpc_protocol) +{ +} + +bool ServiceDiscovered::add_topic( + const ddspipe::core::types::DdsTopic& topic, + ServiceType service_type) +{ + if (service_type == ServiceType::REQUEST) + { + if (request_discovered) + { + return false; + } + topic_request = topic; + request_discovered = true; + } + else + { + if (reply_discovered) + { + return false; + } + topic_reply = topic; + reply_discovered = true; + } + + if (request_discovered && reply_discovered) + { + if (service_name.empty()) + { + return false; + } + fully_discovered = true; + rpc_topic = std::make_optional( + service_name, + topic_request, + topic_reply); + return true; + } + + return false; +} + +bool ServiceDiscovered::remove_topic( + ServiceType service_type) +{ + if (service_type == ServiceType::REQUEST) + { + request_discovered = false; + topic_request = ddspipe::core::types::DdsTopic(); + } + else + { + reply_discovered = false; + topic_reply = ddspipe::core::types::DdsTopic(); + } + + fully_discovered = false; + rpc_topic = std::nullopt; + + return true; +} + +ddspipe::core::types::RpcTopic ServiceDiscovered::get_service() +{ + if (!fully_discovered || rpc_topic == std::nullopt) + { + throw std::runtime_error("Service " + service_name + " not fully discovered"); + } + return rpc_topic.value(); +} + +bool ServiceDiscovered::get_topic( + ServiceType service_type, + ddspipe::core::types::DdsTopic& topic) +{ + if (service_type == ServiceType::REQUEST) + { + if (!request_discovered) + { + return false; + } + topic = topic_request; + return true; + } + if (service_type == ServiceType::REPLY) + { + if (!reply_discovered) + { + return false; + } + topic = topic_reply; + return true; + } + return false; +} + +RpcProtocol ServiceDiscovered::get_rpc_protocol() const +{ + return rpc_protocol; +} + +ActionDiscovered::ActionDiscovered( + const std::string& action_name, + RpcProtocol rpc_protocol) + : action_name(action_name) + , rpc_protocol(rpc_protocol) +{ +} + +bool ActionDiscovered::check_fully_discovered() +{ + auto g = goal.lock(); + auto r = result.lock(); + auto c = cancel.lock(); + + if (g && r && c && + g->fully_discovered && r->fully_discovered && c->fully_discovered && + feedback_discovered && status_discovered) + { + fully_discovered = true; + return true; + } + fully_discovered = false; + return false; +} + +bool ActionDiscovered::add_service( + std::shared_ptr service, + ActionType action_type) +{ + switch (action_type) + { + case ActionType::GOAL: + goal = service; + break; + case ActionType::RESULT: + result = service; + break; + case ActionType::CANCEL: + cancel = service; + break; + default: + return false; + } + return true; +} + +bool ActionDiscovered::add_topic( + const ddspipe::core::types::DdsTopic& topic, + ActionType action_type) +{ + switch (action_type) + { + case ActionType::FEEDBACK: + feedback = topic; + feedback_discovered = true; + break; + case ActionType::STATUS: + status = topic; + status_discovered = true; + break; + default: + return false; + } + + return true; +} + +RpcAction ActionDiscovered::get_action() +{ + auto g = goal.lock(); + auto r = result.lock(); + auto c = cancel.lock(); + + if (!fully_discovered || !g || !r || !c) + { + throw std::runtime_error("Action not fully discovered or ServiceDiscovered expired"); + } + + try + { + return RpcAction( + action_name, + g->get_service(), + r->get_service(), + c->get_service(), + feedback, + status); + } + catch(const std::exception& e) + { + throw std::runtime_error("Failed to create action " + action_name + ": " + e.what()); + } +} + +} // namespace participants +} // namespace ddsenabler +} // namespace eprosima diff --git a/ddsenabler_participants/src/cpp/RpcUtils.cpp b/ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp similarity index 100% rename from ddsenabler_participants/src/cpp/RpcUtils.cpp rename to ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp From 40953458201c8006ce13d35271de193f03a9eaf9 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 15:06:42 +0200 Subject: [PATCH 68/87] Remove unnecessary line Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp index b148f923..2abd0190 100644 --- a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp +++ b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp @@ -79,8 +79,6 @@ void RpcInfo::detect_rpc_protocol() void RpcInfo::remove_prefix_suffix() { - rpc_protocol = rpc_protocol; - std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; switch (rpc_protocol) { From 8fae872b20b30e8ba2bd10dec164d73086a741a7 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 15:25:45 +0200 Subject: [PATCH 69/87] Final suggestions Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 8 ++++++-- ddsenabler/src/cpp/DDSEnabler.cpp | 7 +++++++ .../EnablerParticipant.hpp | 2 +- .../src/cpp/EnablerParticipant.cpp | 18 ++++++++++++++---- ddsenabler_participants/src/cpp/Handler.cpp | 14 +++++++------- .../src/cpp/rpc/RpcUtils.cpp | 3 --- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index bb39d512..4f6d2d66 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -118,14 +118,18 @@ class DDSEnabler * for the corresponding request and reply topics. * * @param service_name The name of the service to be announced. - * @param RpcProtocol The RPC protocol to be used (default is ROS2). + * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the service was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_service( const std::string& service_name, - participants::RpcProtocol RpcProtocol = participants::RpcProtocol::ROS2); + participants::RpcProtocol RpcProtocol); + + DDSENABLER_DllAPI + bool announce_service( + const std::string& service_name); /** * @brief Stops the server for the given service. diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 584363c8..ccae8df7 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -326,6 +326,13 @@ bool DDSEnabler::announce_service( return enabler_participant_->announce_service(service_name, RpcProtocol); } + +bool DDSEnabler::announce_service( + const std::string& service_name) +{ + return announce_service(service_name, participants::RpcProtocol::ROS2); +} + bool DDSEnabler::revoke_service( const std::string& service_name) { diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index da5ef03d..37134db4 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -93,7 +93,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_service( const std::string& service_name, - RpcProtocol RpcProtocol = RpcProtocol::ROS2); + RpcProtocol RpcProtocol); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_service( diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index aeea9f73..85bd98fc 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -982,10 +982,15 @@ bool EnablerParticipant::query_action_nts_( auto feedback_reader = lookup_reader_nts_(feedback_topic_name); if (!feedback_reader) { - create_topic_writer_nts_( + if (!create_topic_writer_nts_( feedback_topic, feedback_reader, - lck); + lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : feedback topic writer creation failed."); + return false; + } } } action.feedback = feedback_topic; @@ -1006,10 +1011,15 @@ bool EnablerParticipant::query_action_nts_( auto status_reader = lookup_reader_nts_(action.status.m_topic_name); if (!status_reader) { - create_topic_writer_nts_( + if (!create_topic_writer_nts_( status_topic, status_reader, - lck); + lck)) + { + EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, + "Failed to announce action " << action.action_name << " : status topic writer creation failed."); + return false; + } } } action.status = status_topic; diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 4498eb73..aeb16cc0 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -706,14 +706,14 @@ bool Handler::store_action_request( { if (it->second.action_name != action_name) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Action name mismatch for action, expected " << it->second.action_name << ", got " << action_name); return false; } if (ActionType::GOAL == action_type) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Cannot store action goal request as action id already exists."); return false; } @@ -725,7 +725,7 @@ bool Handler::store_action_request( // If it does not exist, create a new entry only if the action type is goal request if (ActionType::GOAL != action_type) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Cannot store action request, action does not exist and request type is not GOAL."); return false; } @@ -746,7 +746,7 @@ bool Handler::handle_action_result( { if (it->second.action_name != action_name) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Action name mismatch for action, expected " << it->second.action_name << ", got " << action_name); return false; @@ -765,12 +765,12 @@ bool Handler::handle_action_result( } else { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to store action result for action, result already set."); return false; } } - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Failed to send action result, goal id not found."); return false; } @@ -842,7 +842,7 @@ bool Handler::get_action_request_UUID( } catch(const std::exception& e) { - EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, + EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Error getting action request ID: " << e.what()); } } diff --git a/ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp b/ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp index f70ec2f3..51ebab67 100644 --- a/ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp +++ b/ddsenabler_participants/src/cpp/rpc/RpcUtils.cpp @@ -21,9 +21,6 @@ #include #include -#include -#include - namespace eprosima { namespace ddsenabler { From 183a15053f62d3605d450e59445ae8bc5a671dcd Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 15:30:19 +0200 Subject: [PATCH 70/87] Uncrustify Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 7 +++- ddsenabler/examples/service/main.cpp | 7 +++- ddsenabler/src/cpp/DDSEnabler.cpp | 2 - .../rpc/RpcStructs.hpp | 9 +++-- .../src/cpp/EnablerParticipant.cpp | 37 ++++++++++--------- ddsenabler_participants/src/cpp/Handler.cpp | 4 +- .../src/cpp/rpc/RpcStructs.cpp | 4 +- 7 files changed, 42 insertions(+), 28 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 81588e98..9953df96 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -551,9 +551,13 @@ int main( std::shared_ptr enabler; bool enabler_created = false; if (config.config_file_path.empty()) + { enabler_created = create_dds_enabler(yaml::EnablerConfiguration(""), callbacks, enabler); + } else + { enabler_created = create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler); + } if (!enabler_created) { std::cerr << "Failed to create DDSEnabler instance." << std::endl; @@ -575,7 +579,8 @@ int main( return EXIT_FAILURE; } - ret = client_routine(enabler, config.action_name, config.goals_path, config.timeout, config.request_initial_wait, + ret = client_routine(enabler, config.action_name, config.goals_path, config.timeout, + config.request_initial_wait, config.cancel_requests); } diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 9062461f..33047337 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -469,9 +469,13 @@ int main( std::shared_ptr enabler; bool enabler_created = false; if (config.config_file_path.empty()) + { enabler_created = create_dds_enabler(yaml::EnablerConfiguration(""), callbacks, enabler); + } else + { enabler_created = create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler); + } if (!enabler_created) { std::cerr << "Failed to create DDSEnabler instance." << std::endl; @@ -491,7 +495,8 @@ int main( std::cerr << "Request path is not set." << std::endl; return EXIT_FAILURE; } - ret = client_routine(enabler, config.service_name, config.requests_path, config.timeout, config.request_initial_wait); + ret = client_routine(enabler, config.service_name, config.requests_path, config.timeout, + config.request_initial_wait); } return ret ? EXIT_SUCCESS : EXIT_FAILURE; diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index ccae8df7..56777223 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -305,7 +305,6 @@ bool DDSEnabler::send_service_request( participants::RpcProtocol::ROS2); } - bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, @@ -326,7 +325,6 @@ bool DDSEnabler::announce_service( return enabler_participant_->announce_service(service_name, RpcProtocol); } - bool DDSEnabler::announce_service( const std::string& service_name) { diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index 2ac216cd..c7030777 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -88,11 +88,14 @@ struct ActionRequestInfo uint64_t request_id, ActionType action_type); - uint64_t get_request(ActionType action_type) const; + uint64_t get_request( + ActionType action_type) const; - bool set_result(const std::string&& str); + bool set_result( + const std::string&& str); - bool erase(ActionEraseReason erase_reason); + bool erase( + ActionEraseReason erase_reason); RpcProtocol get_rpc_protocol() const; diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 85bd98fc..c2fb3941 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -64,7 +64,7 @@ std::shared_ptr EnablerParticipant::create_reader( { rpc_info = std::make_shared(dds_topic.m_topic_name); } - catch(const std::exception& e) + catch (const std::exception& e) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); return std::make_shared(); @@ -211,7 +211,7 @@ bool EnablerParticipant::publish_rpc( { rpc_info = std::make_shared(topic_name); } - catch(const std::exception& e) + catch (const std::exception& e) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); return false; @@ -236,7 +236,8 @@ bool EnablerParticipant::publish_rpc( if (!it->second->external_server && rpc_info->service_type == ServiceType::REQUEST) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to publish data in service " << rpc_info->service_name << " : service is only announced on the enabler side."); + "Failed to publish data in service " << rpc_info->service_name << + " : service is only announced on the enabler side."); return false; } @@ -342,10 +343,10 @@ bool EnablerParticipant::revoke_service( } bool EnablerParticipant::send_service_request( - const std::string& service_name, - const std::string& json, - uint64_t& request_id, - RpcProtocol RpcProtocol) + const std::string& service_name, + const std::string& json, + uint64_t& request_id, + RpcProtocol RpcProtocol) { std::string prefix, suffix; switch (RpcProtocol) @@ -569,7 +570,7 @@ bool EnablerParticipant::cancel_action_goal( { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to cancel action goal for action " << action_name - << ": goal id not found."); + << ": goal id not found."); return false; } @@ -720,7 +721,7 @@ bool EnablerParticipant::send_action_get_result_reply( } EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, - "Failed to send action get result to action " << action_name); + "Failed to send action get result to action " << action_name); return false; } @@ -983,12 +984,13 @@ bool EnablerParticipant::query_action_nts_( if (!feedback_reader) { if (!create_topic_writer_nts_( - feedback_topic, - feedback_reader, - lck)) + feedback_topic, + feedback_reader, + lck)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to announce action " << action.action_name << " : feedback topic writer creation failed."); + "Failed to announce action " << action.action_name << + " : feedback topic writer creation failed."); return false; } } @@ -1012,12 +1014,13 @@ bool EnablerParticipant::query_action_nts_( if (!status_reader) { if (!create_topic_writer_nts_( - status_topic, - status_reader, - lck)) + status_topic, + status_reader, + lck)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, - "Failed to announce action " << action.action_name << " : status topic writer creation failed."); + "Failed to announce action " << action.action_name << + " : status topic writer creation failed."); return false; } } diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index aeb16cc0..3077361a 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -161,7 +161,7 @@ void Handler::add_data( { rpc_info = std::make_shared(topic.m_topic_name); } - catch(const std::exception& e) + catch (const std::exception& e) { throw utils::InconsistencyException(STR_ENTRY << e.what()); } @@ -840,7 +840,7 @@ bool Handler::get_action_request_UUID( return true; } } - catch(const std::exception& e) + catch (const std::exception& e) { EPROSIMA_LOG_ERROR(DDSENABLER_HANDLER, "Error getting action request ID: " << e.what()); diff --git a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp index 2abd0190..3dd395b2 100644 --- a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp +++ b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp @@ -51,7 +51,7 @@ RpcInfo::RpcInfo( { remove_prefix_suffix(); } - catch(const std::exception& e) + catch (const std::exception& e) { throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); } @@ -476,7 +476,7 @@ RpcAction ActionDiscovered::get_action() feedback, status); } - catch(const std::exception& e) + catch (const std::exception& e) { throw std::runtime_error("Failed to create action " + action_name + ": " + e.what()); } From 78629c10674212163bf702e83b9af274b987316b Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 23 Oct 2025 15:37:23 +0200 Subject: [PATCH 71/87] Deuncrustify types Signed-off-by: Eugenio Collado --- .../types/DDSEnablerTestTypes.hpp | 24 +- .../ddsEnablerTypedTests/types/aliases.hpp | 150 +- .../types/annotations.hpp | 32 +- .../types/annotationsTypeObjectSupport.hpp | 52 +- .../ddsEnablerTypedTests/types/appendable.hpp | 130 +- .../ddsEnablerTypedTests/types/arrays.hpp | 1095 ++-- .../ddsEnablerTypedTests/types/bitsets.hpp | 70 +- .../ddsEnablerTypedTests/types/constants.hpp | 405 +- .../types/constantsPubSubTypes.hpp | 220 +- .../types/declarations.hpp | 431 +- .../types/declarationsPubSubTypes.hpp | 226 +- .../types/enumerations.hpp | 25 +- .../types/enumerationsPubSubTypes.hpp | 3 +- .../ddsEnablerTypedTests/types/external.hpp | 638 +- .../test/ddsEnablerTypedTests/types/final.hpp | 130 +- .../types/finalPubSubTypes.hpp | 9 +- .../types/helpers/basic_inner_types.hpp | 250 +- .../types/inheritance.hpp | 223 +- .../test/ddsEnablerTypedTests/types/key.hpp | 281 +- .../test/ddsEnablerTypedTests/types/maps.hpp | 2873 ++++----- .../types/mapsPubSubTypes.hpp | 12 +- .../ddsEnablerTypedTests/types/member_id.hpp | 372 +- .../ddsEnablerTypedTests/types/mutable.hpp | 130 +- .../ddsEnablerTypedTests/types/optional.hpp | 913 +-- .../ddsEnablerTypedTests/types/primitives.hpp | 126 +- .../ddsEnablerTypedTests/types/sequences.hpp | 182 +- .../ddsEnablerTypedTests/types/strings.hpp | 36 +- .../ddsEnablerTypedTests/types/structures.hpp | 410 +- .../types/structuresPubSubTypes.hpp | 218 +- .../ddsEnablerTypedTests/types/unions.hpp | 5299 +++++++++-------- .../DynamicTypesCollection.hpp | 26 +- .../DynamicTypesCollectionPubSubTypes.hpp | 225 +- .../test/types/DDSEnablerTestTypes.hpp | 24 +- 33 files changed, 8218 insertions(+), 7022 deletions(-) diff --git a/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp b/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp index 5d7eeef5..840fc12b 100644 --- a/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp +++ b/ddsenabler/test/ddsEnablerTests/types/DDSEnablerTestTypes.hpp @@ -81,7 +81,7 @@ class DDSEnablerTestType1 eProsima_user_DllExport DDSEnablerTestType1( const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -103,7 +103,7 @@ class DDSEnablerTestType1 const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -168,6 +168,8 @@ class DDSEnablerTestType1 return m_value; } + + private: int16_t m_value{0}; @@ -202,7 +204,7 @@ class DDSEnablerTestType2 eProsima_user_DllExport DDSEnablerTestType2( const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -224,7 +226,7 @@ class DDSEnablerTestType2 const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -299,6 +301,8 @@ class DDSEnablerTestType2 return m_value; } + + private: std::string m_value; @@ -333,7 +337,7 @@ class DDSEnablerTestType3 eProsima_user_DllExport DDSEnablerTestType3( const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -355,7 +359,7 @@ class DDSEnablerTestType3 const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -430,6 +434,8 @@ class DDSEnablerTestType3 return m_value; } + + private: std::array m_value{0}; @@ -464,7 +470,7 @@ class DDSEnablerTestType4 eProsima_user_DllExport DDSEnablerTestType4( const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -486,7 +492,7 @@ class DDSEnablerTestType4 const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -561,6 +567,8 @@ class DDSEnablerTestType4 return m_value; } + + private: DDSEnablerTestType1 m_value; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp index 80edd2ac..0494aa8d 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/aliases.hpp @@ -135,7 +135,7 @@ class AliasInt16 eProsima_user_DllExport AliasInt16( const AliasInt16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -157,7 +157,7 @@ class AliasInt16 const AliasInt16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -222,6 +222,8 @@ class AliasInt16 return m_value; } + + private: alias_int16 m_value{0}; @@ -256,7 +258,7 @@ class AliasUint16 eProsima_user_DllExport AliasUint16( const AliasUint16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -278,7 +280,7 @@ class AliasUint16 const AliasUint16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -343,6 +345,8 @@ class AliasUint16 return m_value; } + + private: alias_uint16 m_value{0}; @@ -377,7 +381,7 @@ class AliasInt32 eProsima_user_DllExport AliasInt32( const AliasInt32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -399,7 +403,7 @@ class AliasInt32 const AliasInt32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -464,6 +468,8 @@ class AliasInt32 return m_value; } + + private: alias_int32 m_value{0}; @@ -498,7 +504,7 @@ class AliasUInt32 eProsima_user_DllExport AliasUInt32( const AliasUInt32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -520,7 +526,7 @@ class AliasUInt32 const AliasUInt32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -585,6 +591,8 @@ class AliasUInt32 return m_value; } + + private: alias_uint32 m_value{0}; @@ -619,7 +627,7 @@ class AliasInt64 eProsima_user_DllExport AliasInt64( const AliasInt64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -641,7 +649,7 @@ class AliasInt64 const AliasInt64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -706,6 +714,8 @@ class AliasInt64 return m_value; } + + private: alias_int64 m_value{0}; @@ -740,7 +750,7 @@ class AliasUInt64 eProsima_user_DllExport AliasUInt64( const AliasUInt64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -762,7 +772,7 @@ class AliasUInt64 const AliasUInt64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -827,6 +837,8 @@ class AliasUInt64 return m_value; } + + private: alias_uint64 m_value{0}; @@ -861,7 +873,7 @@ class AliasFloat32 eProsima_user_DllExport AliasFloat32( const AliasFloat32& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -883,7 +895,7 @@ class AliasFloat32 const AliasFloat32& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -948,6 +960,8 @@ class AliasFloat32 return m_value; } + + private: alias_float32 m_value{0.0}; @@ -982,7 +996,7 @@ class AliasFloat64 eProsima_user_DllExport AliasFloat64( const AliasFloat64& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1004,7 +1018,7 @@ class AliasFloat64 const AliasFloat64& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1069,6 +1083,8 @@ class AliasFloat64 return m_value; } + + private: alias_float64 m_value{0.0}; @@ -1103,7 +1119,7 @@ class AliasFloat128 eProsima_user_DllExport AliasFloat128( const AliasFloat128& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1125,7 +1141,7 @@ class AliasFloat128 const AliasFloat128& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1190,6 +1206,8 @@ class AliasFloat128 return m_value; } + + private: alias_float128 m_value{0.0}; @@ -1224,7 +1242,7 @@ class AliasBool eProsima_user_DllExport AliasBool( const AliasBool& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1246,7 +1264,7 @@ class AliasBool const AliasBool& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1311,6 +1329,8 @@ class AliasBool return m_value; } + + private: alias_bool m_value{false}; @@ -1345,7 +1365,7 @@ class AliasOctet eProsima_user_DllExport AliasOctet( const AliasOctet& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1367,7 +1387,7 @@ class AliasOctet const AliasOctet& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1432,6 +1452,8 @@ class AliasOctet return m_value; } + + private: alias_octet m_value{0}; @@ -1466,7 +1488,7 @@ class AliasChar8 eProsima_user_DllExport AliasChar8( const AliasChar8& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1488,7 +1510,7 @@ class AliasChar8 const AliasChar8& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1553,6 +1575,8 @@ class AliasChar8 return m_value; } + + private: alias_char8 m_value{0}; @@ -1587,7 +1611,7 @@ class AliasChar16 eProsima_user_DllExport AliasChar16( const AliasChar16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1609,7 +1633,7 @@ class AliasChar16 const AliasChar16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1674,6 +1698,8 @@ class AliasChar16 return m_value; } + + private: alias_char16 m_value{0}; @@ -1708,7 +1734,7 @@ class AliasString8 eProsima_user_DllExport AliasString8( const AliasString8& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1730,7 +1756,7 @@ class AliasString8 const AliasString8& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1805,6 +1831,8 @@ class AliasString8 return m_value; } + + private: alias_string8 m_value; @@ -1839,7 +1867,7 @@ class AliasString16 eProsima_user_DllExport AliasString16( const AliasString16& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1861,7 +1889,7 @@ class AliasString16 const AliasString16& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1936,6 +1964,8 @@ class AliasString16 return m_value; } + + private: alias_string16 m_value; @@ -1970,7 +2000,7 @@ class AliasEnum eProsima_user_DllExport AliasEnum( const AliasEnum& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1992,7 +2022,7 @@ class AliasEnum const AliasEnum& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2057,6 +2087,8 @@ class AliasEnum return m_value; } + + private: alias_enum m_value{InnerEnumHelper::ENUM_VALUE_1}; @@ -2091,7 +2123,7 @@ class AliasBitmask eProsima_user_DllExport AliasBitmask( const AliasBitmask& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2113,7 +2145,7 @@ class AliasBitmask const AliasBitmask& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2188,6 +2220,8 @@ class AliasBitmask return m_value; } + + private: alias_bitmask m_value{0}; @@ -2222,7 +2256,7 @@ class AliasAlias eProsima_user_DllExport AliasAlias( const AliasAlias& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2244,7 +2278,7 @@ class AliasAlias const AliasAlias& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2309,6 +2343,8 @@ class AliasAlias return m_value; } + + private: alias_alias m_value{0}; @@ -2343,7 +2379,7 @@ class AliasArray eProsima_user_DllExport AliasArray( const AliasArray& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2365,7 +2401,7 @@ class AliasArray const AliasArray& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2440,6 +2476,8 @@ class AliasArray return m_value; } + + private: alias_array m_value{0}; @@ -2474,7 +2512,7 @@ class AliasMultiArray eProsima_user_DllExport AliasMultiArray( const AliasMultiArray& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2496,7 +2534,7 @@ class AliasMultiArray const AliasMultiArray& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2571,6 +2609,8 @@ class AliasMultiArray return m_value; } + + private: alias_multiarray m_value{ {{0}} }; @@ -2605,7 +2645,7 @@ class AliasSequence eProsima_user_DllExport AliasSequence( const AliasSequence& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2627,7 +2667,7 @@ class AliasSequence const AliasSequence& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2702,6 +2742,8 @@ class AliasSequence return m_value; } + + private: alias_sequence m_value; @@ -2736,7 +2778,7 @@ class AliasMap eProsima_user_DllExport AliasMap( const AliasMap& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2758,7 +2800,7 @@ class AliasMap const AliasMap& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2833,6 +2875,8 @@ class AliasMap return m_value; } + + private: alias_map m_value; @@ -2867,7 +2911,7 @@ class AliasUnion eProsima_user_DllExport AliasUnion( const AliasUnion& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2889,7 +2933,7 @@ class AliasUnion const AliasUnion& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2964,6 +3008,8 @@ class AliasUnion return m_value; } + + private: alias_union m_value; @@ -2998,7 +3044,7 @@ class AliasStruct eProsima_user_DllExport AliasStruct( const AliasStruct& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3020,7 +3066,7 @@ class AliasStruct const AliasStruct& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3095,6 +3141,8 @@ class AliasStruct return m_value; } + + private: alias_structure m_value; @@ -3129,7 +3177,7 @@ class AliasBitset eProsima_user_DllExport AliasBitset( const AliasBitset& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3151,7 +3199,7 @@ class AliasBitset const AliasBitset& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3226,6 +3274,8 @@ class AliasBitset return m_value; } + + private: alias_bitset m_value; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp index 69f143da..bd172e1d 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/annotations.hpp @@ -53,20 +53,20 @@ #endif // _WIN32 namespace AnnotationTest { -/*! - * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file. - * @ingroup annotations - */ -enum class InnerEnumHelper : int32_t -{ - ONE, - TWO -}; + /*! + * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file. + * @ingroup annotations + */ + enum class InnerEnumHelper : int32_t + { + ONE, + TWO + }; -typedef eprosima::fastcdr::fixed_string Inner_alias_bounded_string_helper; + typedef eprosima::fastcdr::fixed_string Inner_alias_bounded_string_helper; -const int16_t inner_const_helper = 10; + const int16_t inner_const_helper = 10; } // namespace AnnotationTest @@ -160,6 +160,8 @@ class AnnotatedStruct return !(*this == x); } + + private: @@ -253,6 +255,8 @@ class EmptyAnnotatedStruct return !(*this == x); } + + private: @@ -287,7 +291,7 @@ class BasicAnnotationsStruct eProsima_user_DllExport BasicAnnotationsStruct( const BasicAnnotationsStruct& x) { - m_basic_annotations_member = x.m_basic_annotations_member; + m_basic_annotations_member = x.m_basic_annotations_member; } @@ -309,7 +313,7 @@ class BasicAnnotationsStruct const BasicAnnotationsStruct& x) { - m_basic_annotations_member = x.m_basic_annotations_member; + m_basic_annotations_member = x.m_basic_annotations_member; return *this; } @@ -374,6 +378,8 @@ class BasicAnnotationsStruct return m_basic_annotations_member; } + + private: int16_t m_basic_annotations_member{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp index 7318169a..9d914aac 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/annotationsTypeObjectSupport.hpp @@ -40,32 +40,32 @@ namespace AnnotationTest { -/** - * @brief Register InnerEnumHelper related TypeIdentifier. - * Fully-descriptive TypeIdentifiers are directly registered. - * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is - * indirectly registered as well. - * - * @param[out] TypeIdentifier of the registered type. - * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. - * Invalid TypeIdentifier is returned in case of error. - */ -eProsima_user_DllExport void register_InnerEnumHelper_type_identifier( - eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); - - -/** - * @brief Register Inner_alias_bounded_string_helper related TypeIdentifier. - * Fully-descriptive TypeIdentifiers are directly registered. - * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is - * indirectly registered as well. - * - * @param[out] TypeIdentifier of the registered type. - * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. - * Invalid TypeIdentifier is returned in case of error. - */ -eProsima_user_DllExport void register_Inner_alias_bounded_string_helper_type_identifier( - eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); + /** + * @brief Register InnerEnumHelper related TypeIdentifier. + * Fully-descriptive TypeIdentifiers are directly registered. + * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is + * indirectly registered as well. + * + * @param[out] TypeIdentifier of the registered type. + * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. + * Invalid TypeIdentifier is returned in case of error. + */ + eProsima_user_DllExport void register_InnerEnumHelper_type_identifier( + eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); + + + /** + * @brief Register Inner_alias_bounded_string_helper related TypeIdentifier. + * Fully-descriptive TypeIdentifiers are directly registered. + * Hash TypeIdentifiers require to fill the TypeObject information and hash it, consequently, the TypeObject is + * indirectly registered as well. + * + * @param[out] TypeIdentifier of the registered type. + * The returned TypeIdentifier corresponds to the complete TypeIdentifier in case of hashed TypeIdentifiers. + * Invalid TypeIdentifier is returned in case of error. + */ + eProsima_user_DllExport void register_Inner_alias_bounded_string_helper_type_identifier( + eprosima::fastdds::dds::xtypes::TypeIdentifierPair& type_ids); diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp index 33829e77..ae7149d1 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/appendable.hpp @@ -81,7 +81,7 @@ class AppendableShortStruct eProsima_user_DllExport AppendableShortStruct( const AppendableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class AppendableShortStruct const AppendableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,6 +168,8 @@ class AppendableShortStruct return m_var_short; } + + private: int16_t m_var_short{0}; @@ -202,7 +204,7 @@ class AppendableUShortStruct eProsima_user_DllExport AppendableUShortStruct( const AppendableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -224,7 +226,7 @@ class AppendableUShortStruct const AppendableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -289,6 +291,8 @@ class AppendableUShortStruct return m_var_ushort; } + + private: uint16_t m_var_ushort{0}; @@ -323,7 +327,7 @@ class AppendableLongStruct eProsima_user_DllExport AppendableLongStruct( const AppendableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -345,7 +349,7 @@ class AppendableLongStruct const AppendableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -410,6 +414,8 @@ class AppendableLongStruct return m_var_long; } + + private: int32_t m_var_long{0}; @@ -444,7 +450,7 @@ class AppendableULongStruct eProsima_user_DllExport AppendableULongStruct( const AppendableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -466,7 +472,7 @@ class AppendableULongStruct const AppendableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -531,6 +537,8 @@ class AppendableULongStruct return m_var_ulong; } + + private: uint32_t m_var_ulong{0}; @@ -565,7 +573,7 @@ class AppendableLongLongStruct eProsima_user_DllExport AppendableLongLongStruct( const AppendableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -587,7 +595,7 @@ class AppendableLongLongStruct const AppendableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -652,6 +660,8 @@ class AppendableLongLongStruct return m_var_longlong; } + + private: int64_t m_var_longlong{0}; @@ -686,7 +696,7 @@ class AppendableULongLongStruct eProsima_user_DllExport AppendableULongLongStruct( const AppendableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -708,7 +718,7 @@ class AppendableULongLongStruct const AppendableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -773,6 +783,8 @@ class AppendableULongLongStruct return m_var_ulonglong; } + + private: uint64_t m_var_ulonglong{0}; @@ -807,7 +819,7 @@ class AppendableFloatStruct eProsima_user_DllExport AppendableFloatStruct( const AppendableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -829,7 +841,7 @@ class AppendableFloatStruct const AppendableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -894,6 +906,8 @@ class AppendableFloatStruct return m_var_float; } + + private: float m_var_float{0.0}; @@ -928,7 +942,7 @@ class AppendableDoubleStruct eProsima_user_DllExport AppendableDoubleStruct( const AppendableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -950,7 +964,7 @@ class AppendableDoubleStruct const AppendableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1015,6 +1029,8 @@ class AppendableDoubleStruct return m_var_double; } + + private: double m_var_double{0.0}; @@ -1049,7 +1065,7 @@ class AppendableLongDoubleStruct eProsima_user_DllExport AppendableLongDoubleStruct( const AppendableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1071,7 +1087,7 @@ class AppendableLongDoubleStruct const AppendableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1136,6 +1152,8 @@ class AppendableLongDoubleStruct return m_var_longdouble; } + + private: long double m_var_longdouble{0.0}; @@ -1170,7 +1188,7 @@ class AppendableBooleanStruct eProsima_user_DllExport AppendableBooleanStruct( const AppendableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1192,7 +1210,7 @@ class AppendableBooleanStruct const AppendableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1257,6 +1275,8 @@ class AppendableBooleanStruct return m_var_boolean; } + + private: bool m_var_boolean{false}; @@ -1291,7 +1311,7 @@ class AppendableOctetStruct eProsima_user_DllExport AppendableOctetStruct( const AppendableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1313,7 +1333,7 @@ class AppendableOctetStruct const AppendableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1378,6 +1398,8 @@ class AppendableOctetStruct return m_var_octet; } + + private: uint8_t m_var_octet{0}; @@ -1412,7 +1434,7 @@ class AppendableCharStruct eProsima_user_DllExport AppendableCharStruct( const AppendableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1434,7 +1456,7 @@ class AppendableCharStruct const AppendableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1499,6 +1521,8 @@ class AppendableCharStruct return m_var_char8; } + + private: char m_var_char8{0}; @@ -1533,7 +1557,7 @@ class AppendableWCharStruct eProsima_user_DllExport AppendableWCharStruct( const AppendableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1555,7 +1579,7 @@ class AppendableWCharStruct const AppendableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1620,6 +1644,8 @@ class AppendableWCharStruct return m_var_char16; } + + private: wchar_t m_var_char16{0}; @@ -1654,7 +1680,7 @@ class AppendableUnionStruct eProsima_user_DllExport AppendableUnionStruct( const AppendableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1676,7 +1702,7 @@ class AppendableUnionStruct const AppendableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1751,6 +1777,8 @@ class AppendableUnionStruct return m_var_union; } + + private: InnerUnionHelper m_var_union; @@ -1845,6 +1873,8 @@ class AppendableEmptyStruct return !(*this == x); } + + private: @@ -1880,7 +1910,7 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct const AppendableEmptyInheritanceStruct& x) : AppendableEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1905,7 +1935,7 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct { AppendableEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1931,9 +1961,9 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct const AppendableEmptyInheritanceStruct& x) const { if (AppendableEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -1985,6 +2015,8 @@ class AppendableEmptyInheritanceStruct : public AppendableEmptyStruct return m_var_str; } + + private: std::string m_var_str; @@ -2021,7 +2053,7 @@ class AppendableInheritanceStruct : public AppendableShortStruct const AppendableInheritanceStruct& x) : AppendableShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2046,7 +2078,7 @@ class AppendableInheritanceStruct : public AppendableShortStruct { AppendableShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2072,9 +2104,9 @@ class AppendableInheritanceStruct : public AppendableShortStruct const AppendableInheritanceStruct& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2126,6 +2158,8 @@ class AppendableInheritanceStruct : public AppendableShortStruct return m_var_str; } + + private: std::string m_var_str; @@ -2213,9 +2247,9 @@ class AppendableInheritanceEmptyStruct : public AppendableShortStruct const AppendableInheritanceEmptyStruct& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2230,6 +2264,8 @@ class AppendableInheritanceEmptyStruct : public AppendableShortStruct return !(*this == x); } + + private: @@ -2265,7 +2301,7 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct const AppendableExtensibilityInheritance& x) : AppendableShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2290,7 +2326,7 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct { AppendableShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2316,9 +2352,9 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct const AppendableExtensibilityInheritance& x) const { if (AppendableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2360,6 +2396,8 @@ class AppendableExtensibilityInheritance : public AppendableShortStruct return m_var_long; } + + private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp index 8dffa29b..283108b3 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/arrays.hpp @@ -85,7 +85,7 @@ class ArrayShort eProsima_user_DllExport ArrayShort( const ArrayShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -107,7 +107,7 @@ class ArrayShort const ArrayShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -182,6 +182,8 @@ class ArrayShort return m_var_array_short; } + + private: std::array m_var_array_short{0}; @@ -216,7 +218,7 @@ class ArrayUShort eProsima_user_DllExport ArrayUShort( const ArrayUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -238,7 +240,7 @@ class ArrayUShort const ArrayUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -313,6 +315,8 @@ class ArrayUShort return m_var_array_ushort; } + + private: std::array m_var_array_ushort{0}; @@ -347,7 +351,7 @@ class ArrayLong eProsima_user_DllExport ArrayLong( const ArrayLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -369,7 +373,7 @@ class ArrayLong const ArrayLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -444,6 +448,8 @@ class ArrayLong return m_var_array_long; } + + private: std::array m_var_array_long{0}; @@ -478,7 +484,7 @@ class ArrayULong eProsima_user_DllExport ArrayULong( const ArrayULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -500,7 +506,7 @@ class ArrayULong const ArrayULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -575,6 +581,8 @@ class ArrayULong return m_var_array_ulong; } + + private: std::array m_var_array_ulong{0}; @@ -609,7 +617,7 @@ class ArrayLongLong eProsima_user_DllExport ArrayLongLong( const ArrayLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -631,7 +639,7 @@ class ArrayLongLong const ArrayLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -706,6 +714,8 @@ class ArrayLongLong return m_var_array_longlong; } + + private: std::array m_var_array_longlong{0}; @@ -740,7 +750,7 @@ class ArrayULongLong eProsima_user_DllExport ArrayULongLong( const ArrayULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -762,7 +772,7 @@ class ArrayULongLong const ArrayULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -837,6 +847,8 @@ class ArrayULongLong return m_var_array_ulonglong; } + + private: std::array m_var_array_ulonglong{0}; @@ -871,7 +883,7 @@ class ArrayFloat eProsima_user_DllExport ArrayFloat( const ArrayFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -893,7 +905,7 @@ class ArrayFloat const ArrayFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -968,6 +980,8 @@ class ArrayFloat return m_var_array_float; } + + private: std::array m_var_array_float{0.0}; @@ -1002,7 +1016,7 @@ class ArrayDouble eProsima_user_DllExport ArrayDouble( const ArrayDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -1024,7 +1038,7 @@ class ArrayDouble const ArrayDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -1099,6 +1113,8 @@ class ArrayDouble return m_var_array_double; } + + private: std::array m_var_array_double{0.0}; @@ -1133,7 +1149,7 @@ class ArrayLongDouble eProsima_user_DllExport ArrayLongDouble( const ArrayLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -1155,7 +1171,7 @@ class ArrayLongDouble const ArrayLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -1230,6 +1246,8 @@ class ArrayLongDouble return m_var_array_longdouble; } + + private: std::array m_var_array_longdouble{0.0}; @@ -1264,7 +1282,7 @@ class ArrayBoolean eProsima_user_DllExport ArrayBoolean( const ArrayBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -1286,7 +1304,7 @@ class ArrayBoolean const ArrayBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -1361,6 +1379,8 @@ class ArrayBoolean return m_var_array_boolean; } + + private: std::array m_var_array_boolean{false}; @@ -1395,7 +1415,7 @@ class ArrayOctet eProsima_user_DllExport ArrayOctet( const ArrayOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -1417,7 +1437,7 @@ class ArrayOctet const ArrayOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -1492,6 +1512,8 @@ class ArrayOctet return m_var_array_octet; } + + private: std::array m_var_array_octet{0}; @@ -1526,7 +1548,7 @@ class ArrayUInt8 eProsima_user_DllExport ArrayUInt8( const ArrayUInt8& x) { - m_var_array_uint8 = x.m_var_array_uint8; + m_var_array_uint8 = x.m_var_array_uint8; } @@ -1548,7 +1570,7 @@ class ArrayUInt8 const ArrayUInt8& x) { - m_var_array_uint8 = x.m_var_array_uint8; + m_var_array_uint8 = x.m_var_array_uint8; return *this; } @@ -1623,6 +1645,8 @@ class ArrayUInt8 return m_var_array_uint8; } + + private: std::array m_var_array_uint8{0}; @@ -1657,7 +1681,7 @@ class ArrayChar eProsima_user_DllExport ArrayChar( const ArrayChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -1679,7 +1703,7 @@ class ArrayChar const ArrayChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -1754,6 +1778,8 @@ class ArrayChar return m_var_array_char; } + + private: std::array m_var_array_char{0}; @@ -1788,7 +1814,7 @@ class ArrayWChar eProsima_user_DllExport ArrayWChar( const ArrayWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -1810,7 +1836,7 @@ class ArrayWChar const ArrayWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -1885,6 +1911,8 @@ class ArrayWChar return m_var_array_wchar; } + + private: std::array m_var_array_wchar{0}; @@ -1919,7 +1947,7 @@ class ArrayString eProsima_user_DllExport ArrayString( const ArrayString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -1941,7 +1969,7 @@ class ArrayString const ArrayString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -2016,6 +2044,8 @@ class ArrayString return m_var_array_string; } + + private: std::array m_var_array_string; @@ -2050,7 +2080,7 @@ class ArrayWString eProsima_user_DllExport ArrayWString( const ArrayWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -2072,7 +2102,7 @@ class ArrayWString const ArrayWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -2147,6 +2177,8 @@ class ArrayWString return m_var_array_wstring; } + + private: std::array m_var_array_wstring; @@ -2181,7 +2213,7 @@ class ArrayBoundedString eProsima_user_DllExport ArrayBoundedString( const ArrayBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -2203,7 +2235,7 @@ class ArrayBoundedString const ArrayBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -2278,6 +2310,8 @@ class ArrayBoundedString return m_var_array_bounded_string; } + + private: std::array m_var_array_bounded_string; @@ -2312,7 +2346,7 @@ class ArrayBoundedWString eProsima_user_DllExport ArrayBoundedWString( const ArrayBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -2334,7 +2368,7 @@ class ArrayBoundedWString const ArrayBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -2409,6 +2443,8 @@ class ArrayBoundedWString return m_var_array_bounded_wstring; } + + private: std::array m_var_array_bounded_wstring; @@ -2443,7 +2479,7 @@ class ArrayEnum eProsima_user_DllExport ArrayEnum( const ArrayEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -2465,7 +2501,7 @@ class ArrayEnum const ArrayEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -2540,6 +2576,8 @@ class ArrayEnum return m_var_array_enum; } + + private: std::array m_var_array_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -2574,7 +2612,7 @@ class ArrayBitMask eProsima_user_DllExport ArrayBitMask( const ArrayBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -2596,7 +2634,7 @@ class ArrayBitMask const ArrayBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -2671,6 +2709,8 @@ class ArrayBitMask return m_var_array_bitmask; } + + private: std::array m_var_array_bitmask{0}; @@ -2705,7 +2745,7 @@ class ArrayAlias eProsima_user_DllExport ArrayAlias( const ArrayAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -2727,7 +2767,7 @@ class ArrayAlias const ArrayAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -2802,6 +2842,8 @@ class ArrayAlias return m_var_array_alias; } + + private: std::array m_var_array_alias{0}; @@ -2836,7 +2878,7 @@ class ArrayShortArray eProsima_user_DllExport ArrayShortArray( const ArrayShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; } @@ -2858,7 +2900,7 @@ class ArrayShortArray const ArrayShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; return *this; } @@ -2933,6 +2975,8 @@ class ArrayShortArray return m_var_array_short_array; } + + private: std::array, 10> m_var_array_short_array{ {{0}} }; @@ -2967,7 +3011,7 @@ class ArraySequence eProsima_user_DllExport ArraySequence( const ArraySequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -2989,7 +3033,7 @@ class ArraySequence const ArraySequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -3064,6 +3108,8 @@ class ArraySequence return m_var_array_sequence; } + + private: std::array, 10> m_var_array_sequence; @@ -3098,7 +3144,7 @@ class ArrayMap eProsima_user_DllExport ArrayMap( const ArrayMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -3120,7 +3166,7 @@ class ArrayMap const ArrayMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -3195,6 +3241,8 @@ class ArrayMap return m_var_array_map; } + + private: std::array, 10> m_var_array_map; @@ -3229,7 +3277,7 @@ class ArrayUnion eProsima_user_DllExport ArrayUnion( const ArrayUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -3251,7 +3299,7 @@ class ArrayUnion const ArrayUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -3326,6 +3374,8 @@ class ArrayUnion return m_var_array_union; } + + private: std::array m_var_array_union; @@ -3360,7 +3410,7 @@ class ArrayStructure eProsima_user_DllExport ArrayStructure( const ArrayStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -3382,7 +3432,7 @@ class ArrayStructure const ArrayStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -3457,6 +3507,8 @@ class ArrayStructure return m_var_array_structure; } + + private: std::array m_var_array_structure; @@ -3491,7 +3543,7 @@ class ArrayBitset eProsima_user_DllExport ArrayBitset( const ArrayBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -3513,7 +3565,7 @@ class ArrayBitset const ArrayBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -3588,6 +3640,8 @@ class ArrayBitset return m_var_array_bitset; } + + private: std::array m_var_array_bitset; @@ -3622,7 +3676,7 @@ class ArrayMultiDimensionShort eProsima_user_DllExport ArrayMultiDimensionShort( const ArrayMultiDimensionShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -3644,7 +3698,7 @@ class ArrayMultiDimensionShort const ArrayMultiDimensionShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -3719,6 +3773,8 @@ class ArrayMultiDimensionShort return m_var_array_short; } + + private: std::array, 10>, 10> m_var_array_short{ {{ {{0}} }} }; @@ -3753,7 +3809,7 @@ class ArrayMultiDimensionUShort eProsima_user_DllExport ArrayMultiDimensionUShort( const ArrayMultiDimensionUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -3775,7 +3831,7 @@ class ArrayMultiDimensionUShort const ArrayMultiDimensionUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -3850,6 +3906,8 @@ class ArrayMultiDimensionUShort return m_var_array_ushort; } + + private: std::array, 10>, 10> m_var_array_ushort{ {{ {{0}} }} }; @@ -3884,7 +3942,7 @@ class ArrayMultiDimensionLong eProsima_user_DllExport ArrayMultiDimensionLong( const ArrayMultiDimensionLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -3906,7 +3964,7 @@ class ArrayMultiDimensionLong const ArrayMultiDimensionLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -3981,6 +4039,8 @@ class ArrayMultiDimensionLong return m_var_array_long; } + + private: std::array, 10>, 10> m_var_array_long{ {{ {{0}} }} }; @@ -4015,7 +4075,7 @@ class ArrayMultiDimensionULong eProsima_user_DllExport ArrayMultiDimensionULong( const ArrayMultiDimensionULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -4037,7 +4097,7 @@ class ArrayMultiDimensionULong const ArrayMultiDimensionULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -4112,6 +4172,8 @@ class ArrayMultiDimensionULong return m_var_array_ulong; } + + private: std::array, 10>, 10> m_var_array_ulong{ {{ {{0}} }} }; @@ -4146,7 +4208,7 @@ class ArrayMultiDimensionLongLong eProsima_user_DllExport ArrayMultiDimensionLongLong( const ArrayMultiDimensionLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -4168,7 +4230,7 @@ class ArrayMultiDimensionLongLong const ArrayMultiDimensionLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -4243,6 +4305,8 @@ class ArrayMultiDimensionLongLong return m_var_array_longlong; } + + private: std::array, 10>, 10> m_var_array_longlong{ {{ {{0}} }} }; @@ -4277,7 +4341,7 @@ class ArrayMultiDimensionULongLong eProsima_user_DllExport ArrayMultiDimensionULongLong( const ArrayMultiDimensionULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -4299,7 +4363,7 @@ class ArrayMultiDimensionULongLong const ArrayMultiDimensionULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -4374,6 +4438,8 @@ class ArrayMultiDimensionULongLong return m_var_array_ulonglong; } + + private: std::array, 10>, 10> m_var_array_ulonglong{ {{ {{0}} }} }; @@ -4408,7 +4474,7 @@ class ArrayMultiDimensionFloat eProsima_user_DllExport ArrayMultiDimensionFloat( const ArrayMultiDimensionFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -4430,7 +4496,7 @@ class ArrayMultiDimensionFloat const ArrayMultiDimensionFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -4505,6 +4571,8 @@ class ArrayMultiDimensionFloat return m_var_array_float; } + + private: std::array, 10>, 10> m_var_array_float{ {{ {{0.0}} }} }; @@ -4539,7 +4607,7 @@ class ArrayMultiDimensionDouble eProsima_user_DllExport ArrayMultiDimensionDouble( const ArrayMultiDimensionDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -4561,7 +4629,7 @@ class ArrayMultiDimensionDouble const ArrayMultiDimensionDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -4636,6 +4704,8 @@ class ArrayMultiDimensionDouble return m_var_array_double; } + + private: std::array, 10>, 10> m_var_array_double{ {{ {{0.0}} }} }; @@ -4670,7 +4740,7 @@ class ArrayMultiDimensionLongDouble eProsima_user_DllExport ArrayMultiDimensionLongDouble( const ArrayMultiDimensionLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -4692,7 +4762,7 @@ class ArrayMultiDimensionLongDouble const ArrayMultiDimensionLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -4753,8 +4823,7 @@ class ArrayMultiDimensionLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_longdouble() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_longdouble() const { return m_var_array_longdouble; } @@ -4768,6 +4837,8 @@ class ArrayMultiDimensionLongDouble return m_var_array_longdouble; } + + private: std::array, 10>, 10> m_var_array_longdouble{ {{ {{0.0}} }} }; @@ -4802,7 +4873,7 @@ class ArrayMultiDimensionBoolean eProsima_user_DllExport ArrayMultiDimensionBoolean( const ArrayMultiDimensionBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -4824,7 +4895,7 @@ class ArrayMultiDimensionBoolean const ArrayMultiDimensionBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -4899,6 +4970,8 @@ class ArrayMultiDimensionBoolean return m_var_array_boolean; } + + private: std::array, 10>, 10> m_var_array_boolean{ {{ {{false}} }} }; @@ -4933,7 +5006,7 @@ class ArrayMultiDimensionOctet eProsima_user_DllExport ArrayMultiDimensionOctet( const ArrayMultiDimensionOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -4955,7 +5028,7 @@ class ArrayMultiDimensionOctet const ArrayMultiDimensionOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -5030,6 +5103,8 @@ class ArrayMultiDimensionOctet return m_var_array_octet; } + + private: std::array, 10>, 10> m_var_array_octet{ {{ {{0}} }} }; @@ -5064,7 +5139,7 @@ class ArrayMultiDimensionChar eProsima_user_DllExport ArrayMultiDimensionChar( const ArrayMultiDimensionChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -5086,7 +5161,7 @@ class ArrayMultiDimensionChar const ArrayMultiDimensionChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -5161,6 +5236,8 @@ class ArrayMultiDimensionChar return m_var_array_char; } + + private: std::array, 10>, 10> m_var_array_char{ {{ {{0}} }} }; @@ -5195,7 +5272,7 @@ class ArrayMultiDimensionWChar eProsima_user_DllExport ArrayMultiDimensionWChar( const ArrayMultiDimensionWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -5217,7 +5294,7 @@ class ArrayMultiDimensionWChar const ArrayMultiDimensionWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -5292,6 +5369,8 @@ class ArrayMultiDimensionWChar return m_var_array_wchar; } + + private: std::array, 10>, 10> m_var_array_wchar{ {{ {{0}} }} }; @@ -5326,7 +5405,7 @@ class ArrayMultiDimensionString eProsima_user_DllExport ArrayMultiDimensionString( const ArrayMultiDimensionString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -5348,7 +5427,7 @@ class ArrayMultiDimensionString const ArrayMultiDimensionString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -5423,6 +5502,8 @@ class ArrayMultiDimensionString return m_var_array_string; } + + private: std::array, 10>, 10> m_var_array_string; @@ -5457,7 +5538,7 @@ class ArrayMultiDimensionWString eProsima_user_DllExport ArrayMultiDimensionWString( const ArrayMultiDimensionWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -5479,7 +5560,7 @@ class ArrayMultiDimensionWString const ArrayMultiDimensionWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -5540,8 +5621,7 @@ class ArrayMultiDimensionWString * @brief This function returns a constant reference to member var_array_wstring * @return Constant reference to member var_array_wstring */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_wstring() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_wstring() const { return m_var_array_wstring; } @@ -5555,6 +5635,8 @@ class ArrayMultiDimensionWString return m_var_array_wstring; } + + private: std::array, 10>, 10> m_var_array_wstring; @@ -5589,7 +5671,7 @@ class ArrayMultiDimensionBoundedString eProsima_user_DllExport ArrayMultiDimensionBoundedString( const ArrayMultiDimensionBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -5611,7 +5693,7 @@ class ArrayMultiDimensionBoundedString const ArrayMultiDimensionBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -5653,8 +5735,7 @@ class ArrayMultiDimensionBoundedString * @param _var_array_bounded_string New value to be copied in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - const std::array, 10>, - 10>& _var_array_bounded_string) + const std::array, 10>, 10>& _var_array_bounded_string) { m_var_array_bounded_string = _var_array_bounded_string; } @@ -5664,8 +5745,7 @@ class ArrayMultiDimensionBoundedString * @param _var_array_bounded_string New value to be moved in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - std::array, 10>, - 10>&& _var_array_bounded_string) + std::array, 10>, 10>&& _var_array_bounded_string) { m_var_array_bounded_string = std::move(_var_array_bounded_string); } @@ -5674,8 +5754,7 @@ class ArrayMultiDimensionBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_bounded_string() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -5684,12 +5763,13 @@ class ArrayMultiDimensionBoundedString * @brief This function returns a reference to member var_array_bounded_string * @return Reference to member var_array_bounded_string */ - eProsima_user_DllExport std::array, 10>, - 10>& var_array_bounded_string() + eProsima_user_DllExport std::array, 10>, 10>& var_array_bounded_string() { return m_var_array_bounded_string; } + + private: std::array, 10>, 10> m_var_array_bounded_string; @@ -5724,7 +5804,7 @@ class ArrayMultiDimensionBoundedWString eProsima_user_DllExport ArrayMultiDimensionBoundedWString( const ArrayMultiDimensionBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -5746,7 +5826,7 @@ class ArrayMultiDimensionBoundedWString const ArrayMultiDimensionBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -5788,8 +5868,7 @@ class ArrayMultiDimensionBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array, 10>, - 10>& _var_array_bounded_wstring) + const std::array, 10>, 10>& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -5799,8 +5878,7 @@ class ArrayMultiDimensionBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array, 10>, - 10>&& _var_array_bounded_wstring) + std::array, 10>, 10>&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -5809,8 +5887,7 @@ class ArrayMultiDimensionBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -5819,12 +5896,13 @@ class ArrayMultiDimensionBoundedWString * @brief This function returns a reference to member var_array_bounded_wstring * @return Reference to member var_array_bounded_wstring */ - eProsima_user_DllExport std::array, 10>, - 10>& var_array_bounded_wstring() + eProsima_user_DllExport std::array, 10>, 10>& var_array_bounded_wstring() { return m_var_array_bounded_wstring; } + + private: std::array, 10>, 10> m_var_array_bounded_wstring; @@ -5859,7 +5937,7 @@ class ArrayMultiDimensionEnum eProsima_user_DllExport ArrayMultiDimensionEnum( const ArrayMultiDimensionEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -5881,7 +5959,7 @@ class ArrayMultiDimensionEnum const ArrayMultiDimensionEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -5942,8 +6020,7 @@ class ArrayMultiDimensionEnum * @brief This function returns a constant reference to member var_array_enum * @return Constant reference to member var_array_enum */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_enum() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_enum() const { return m_var_array_enum; } @@ -5957,10 +6034,11 @@ class ArrayMultiDimensionEnum return m_var_array_enum; } + + private: - std::array, 10>, - 10> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; + std::array, 10>, 10> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; }; /*! @@ -5992,7 +6070,7 @@ class ArrayMultiDimensionBitMask eProsima_user_DllExport ArrayMultiDimensionBitMask( const ArrayMultiDimensionBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -6014,7 +6092,7 @@ class ArrayMultiDimensionBitMask const ArrayMultiDimensionBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -6075,8 +6153,7 @@ class ArrayMultiDimensionBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_bitmask() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_bitmask() const { return m_var_array_bitmask; } @@ -6090,6 +6167,8 @@ class ArrayMultiDimensionBitMask return m_var_array_bitmask; } + + private: std::array, 10>, 10> m_var_array_bitmask{ {{ {{0}} }} }; @@ -6124,7 +6203,7 @@ class ArrayMultiDimensionAlias eProsima_user_DllExport ArrayMultiDimensionAlias( const ArrayMultiDimensionAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -6146,7 +6225,7 @@ class ArrayMultiDimensionAlias const ArrayMultiDimensionAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -6207,8 +6286,7 @@ class ArrayMultiDimensionAlias * @brief This function returns a constant reference to member var_array_alias * @return Constant reference to member var_array_alias */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_alias() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_alias() const { return m_var_array_alias; } @@ -6222,6 +6300,8 @@ class ArrayMultiDimensionAlias return m_var_array_alias; } + + private: std::array, 10>, 10> m_var_array_alias{ {{ {{0}} }} }; @@ -6256,7 +6336,7 @@ class ArrayMultiDimensionSequence eProsima_user_DllExport ArrayMultiDimensionSequence( const ArrayMultiDimensionSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -6278,7 +6358,7 @@ class ArrayMultiDimensionSequence const ArrayMultiDimensionSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -6339,8 +6419,7 @@ class ArrayMultiDimensionSequence * @brief This function returns a constant reference to member var_array_sequence * @return Constant reference to member var_array_sequence */ - eProsima_user_DllExport const std::array, 10>, 10>, - 10>& var_array_sequence() const + eProsima_user_DllExport const std::array, 10>, 10>, 10>& var_array_sequence() const { return m_var_array_sequence; } @@ -6354,6 +6433,8 @@ class ArrayMultiDimensionSequence return m_var_array_sequence; } + + private: std::array, 10>, 10>, 10> m_var_array_sequence; @@ -6388,7 +6469,7 @@ class ArrayMultiDimensionMap eProsima_user_DllExport ArrayMultiDimensionMap( const ArrayMultiDimensionMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -6410,7 +6491,7 @@ class ArrayMultiDimensionMap const ArrayMultiDimensionMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -6471,8 +6552,7 @@ class ArrayMultiDimensionMap * @brief This function returns a constant reference to member var_array_map * @return Constant reference to member var_array_map */ - eProsima_user_DllExport const std::array, 10>, 10>, - 10>& var_array_map() const + eProsima_user_DllExport const std::array, 10>, 10>, 10>& var_array_map() const { return m_var_array_map; } @@ -6486,6 +6566,8 @@ class ArrayMultiDimensionMap return m_var_array_map; } + + private: std::array, 10>, 10>, 10> m_var_array_map; @@ -6520,7 +6602,7 @@ class ArrayMultiDimensionUnion eProsima_user_DllExport ArrayMultiDimensionUnion( const ArrayMultiDimensionUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -6542,7 +6624,7 @@ class ArrayMultiDimensionUnion const ArrayMultiDimensionUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -6603,8 +6685,7 @@ class ArrayMultiDimensionUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_union() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_union() const { return m_var_array_union; } @@ -6618,6 +6699,8 @@ class ArrayMultiDimensionUnion return m_var_array_union; } + + private: std::array, 10>, 10> m_var_array_union; @@ -6652,7 +6735,7 @@ class ArrayMultiDimensionStructure eProsima_user_DllExport ArrayMultiDimensionStructure( const ArrayMultiDimensionStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -6674,7 +6757,7 @@ class ArrayMultiDimensionStructure const ArrayMultiDimensionStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -6735,8 +6818,7 @@ class ArrayMultiDimensionStructure * @brief This function returns a constant reference to member var_array_structure * @return Constant reference to member var_array_structure */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_structure() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_structure() const { return m_var_array_structure; } @@ -6750,6 +6832,8 @@ class ArrayMultiDimensionStructure return m_var_array_structure; } + + private: std::array, 10>, 10> m_var_array_structure; @@ -6784,7 +6868,7 @@ class ArrayMultiDimensionBitset eProsima_user_DllExport ArrayMultiDimensionBitset( const ArrayMultiDimensionBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -6806,7 +6890,7 @@ class ArrayMultiDimensionBitset const ArrayMultiDimensionBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -6867,8 +6951,7 @@ class ArrayMultiDimensionBitset * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array, 10>, - 10>& var_array_bitset() const + eProsima_user_DllExport const std::array, 10>, 10>& var_array_bitset() const { return m_var_array_bitset; } @@ -6882,6 +6965,8 @@ class ArrayMultiDimensionBitset return m_var_array_bitset; } + + private: std::array, 10>, 10> m_var_array_bitset; @@ -6918,7 +7003,7 @@ class ArraySingleDimensionLiteralsShort eProsima_user_DllExport ArraySingleDimensionLiteralsShort( const ArraySingleDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -6940,7 +7025,7 @@ class ArraySingleDimensionLiteralsShort const ArraySingleDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -7015,6 +7100,8 @@ class ArraySingleDimensionLiteralsShort return m_var_array_short; } + + private: std::array m_var_array_short{0}; @@ -7049,7 +7136,7 @@ class ArraySingleDimensionLiteralsUnsignedShort eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedShort( const ArraySingleDimensionLiteralsUnsignedShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -7071,7 +7158,7 @@ class ArraySingleDimensionLiteralsUnsignedShort const ArraySingleDimensionLiteralsUnsignedShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -7113,7 +7200,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @param _var_array_ushort New value to be copied in member var_array_ushort */ eProsima_user_DllExport void var_array_ushort( - const std::array& _var_array_ushort) + const std::array& _var_array_ushort) { m_var_array_ushort = _var_array_ushort; } @@ -7123,7 +7210,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @param _var_array_ushort New value to be moved in member var_array_ushort */ eProsima_user_DllExport void var_array_ushort( - std::array&& _var_array_ushort) + std::array&& _var_array_ushort) { m_var_array_ushort = std::move(_var_array_ushort); } @@ -7132,7 +7219,7 @@ class ArraySingleDimensionLiteralsUnsignedShort * @brief This function returns a constant reference to member var_array_ushort * @return Constant reference to member var_array_ushort */ - eProsima_user_DllExport const std::array& var_array_ushort() const + eProsima_user_DllExport const std::array& var_array_ushort() const { return m_var_array_ushort; } @@ -7141,14 +7228,16 @@ class ArraySingleDimensionLiteralsUnsignedShort * @brief This function returns a reference to member var_array_ushort * @return Reference to member var_array_ushort */ - eProsima_user_DllExport std::array& var_array_ushort() + eProsima_user_DllExport std::array& var_array_ushort() { return m_var_array_ushort; } + + private: - std::array m_var_array_ushort{0}; + std::array m_var_array_ushort{0}; }; /*! @@ -7180,7 +7269,7 @@ class ArraySingleDimensionLiteralsLong eProsima_user_DllExport ArraySingleDimensionLiteralsLong( const ArraySingleDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -7202,7 +7291,7 @@ class ArraySingleDimensionLiteralsLong const ArraySingleDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -7244,7 +7333,7 @@ class ArraySingleDimensionLiteralsLong * @param _var_array_long New value to be copied in member var_array_long */ eProsima_user_DllExport void var_array_long( - const std::array& _var_array_long) + const std::array& _var_array_long) { m_var_array_long = _var_array_long; } @@ -7254,7 +7343,7 @@ class ArraySingleDimensionLiteralsLong * @param _var_array_long New value to be moved in member var_array_long */ eProsima_user_DllExport void var_array_long( - std::array&& _var_array_long) + std::array&& _var_array_long) { m_var_array_long = std::move(_var_array_long); } @@ -7263,7 +7352,7 @@ class ArraySingleDimensionLiteralsLong * @brief This function returns a constant reference to member var_array_long * @return Constant reference to member var_array_long */ - eProsima_user_DllExport const std::array& var_array_long() const + eProsima_user_DllExport const std::array& var_array_long() const { return m_var_array_long; } @@ -7272,14 +7361,16 @@ class ArraySingleDimensionLiteralsLong * @brief This function returns a reference to member var_array_long * @return Reference to member var_array_long */ - eProsima_user_DllExport std::array& var_array_long() + eProsima_user_DllExport std::array& var_array_long() { return m_var_array_long; } + + private: - std::array m_var_array_long{0}; + std::array m_var_array_long{0}; }; /*! @@ -7311,7 +7402,7 @@ class ArraySingleDimensionLiteralsUnsignedLong eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedLong( const ArraySingleDimensionLiteralsUnsignedLong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -7333,7 +7424,7 @@ class ArraySingleDimensionLiteralsUnsignedLong const ArraySingleDimensionLiteralsUnsignedLong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -7408,6 +7499,8 @@ class ArraySingleDimensionLiteralsUnsignedLong return m_var_array_ulong; } + + private: std::array m_var_array_ulong{0}; @@ -7442,7 +7535,7 @@ class ArraySingleDimensionLiteralsLongLong eProsima_user_DllExport ArraySingleDimensionLiteralsLongLong( const ArraySingleDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -7464,7 +7557,7 @@ class ArraySingleDimensionLiteralsLongLong const ArraySingleDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -7506,7 +7599,7 @@ class ArraySingleDimensionLiteralsLongLong * @param _var_array_longlong New value to be copied in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - const std::array& _var_array_longlong) + const std::array& _var_array_longlong) { m_var_array_longlong = _var_array_longlong; } @@ -7516,7 +7609,7 @@ class ArraySingleDimensionLiteralsLongLong * @param _var_array_longlong New value to be moved in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - std::array&& _var_array_longlong) + std::array&& _var_array_longlong) { m_var_array_longlong = std::move(_var_array_longlong); } @@ -7525,7 +7618,7 @@ class ArraySingleDimensionLiteralsLongLong * @brief This function returns a constant reference to member var_array_longlong * @return Constant reference to member var_array_longlong */ - eProsima_user_DllExport const std::array& var_array_longlong() const + eProsima_user_DllExport const std::array& var_array_longlong() const { return m_var_array_longlong; } @@ -7534,14 +7627,16 @@ class ArraySingleDimensionLiteralsLongLong * @brief This function returns a reference to member var_array_longlong * @return Reference to member var_array_longlong */ - eProsima_user_DllExport std::array& var_array_longlong() + eProsima_user_DllExport std::array& var_array_longlong() { return m_var_array_longlong; } + + private: - std::array m_var_array_longlong{0}; + std::array m_var_array_longlong{0}; }; /*! @@ -7573,7 +7668,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong eProsima_user_DllExport ArraySingleDimensionLiteralsUnsignedLongLong( const ArraySingleDimensionLiteralsUnsignedLongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -7595,7 +7690,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong const ArraySingleDimensionLiteralsUnsignedLongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -7637,7 +7732,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong * @param _var_array_ulonglong New value to be copied in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - const std::array& _var_array_ulonglong) + const std::array& _var_array_ulonglong) { m_var_array_ulonglong = _var_array_ulonglong; } @@ -7647,7 +7742,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLong * @param _var_array_ulonglong New value to be moved in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - std::array&& _var_array_ulonglong) + std::array&& _var_array_ulonglong) { m_var_array_ulonglong = std::move(_var_array_ulonglong); } @@ -7670,9 +7765,11 @@ class ArraySingleDimensionLiteralsUnsignedLongLong return m_var_array_ulonglong; } + + private: - std::array m_var_array_ulonglong{0}; + std::array m_var_array_ulonglong{0}; }; /*! @@ -7704,7 +7801,7 @@ class ArraySingleDimensionLiteralsFloat eProsima_user_DllExport ArraySingleDimensionLiteralsFloat( const ArraySingleDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -7726,7 +7823,7 @@ class ArraySingleDimensionLiteralsFloat const ArraySingleDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -7801,6 +7898,8 @@ class ArraySingleDimensionLiteralsFloat return m_var_array_float; } + + private: std::array m_var_array_float{0.0}; @@ -7835,7 +7934,7 @@ class ArraySingleDimensionLiteralsDouble eProsima_user_DllExport ArraySingleDimensionLiteralsDouble( const ArraySingleDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -7857,7 +7956,7 @@ class ArraySingleDimensionLiteralsDouble const ArraySingleDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -7899,7 +7998,7 @@ class ArraySingleDimensionLiteralsDouble * @param _var_array_double New value to be copied in member var_array_double */ eProsima_user_DllExport void var_array_double( - const std::array& _var_array_double) + const std::array& _var_array_double) { m_var_array_double = _var_array_double; } @@ -7909,7 +8008,7 @@ class ArraySingleDimensionLiteralsDouble * @param _var_array_double New value to be moved in member var_array_double */ eProsima_user_DllExport void var_array_double( - std::array&& _var_array_double) + std::array&& _var_array_double) { m_var_array_double = std::move(_var_array_double); } @@ -7918,7 +8017,7 @@ class ArraySingleDimensionLiteralsDouble * @brief This function returns a constant reference to member var_array_double * @return Constant reference to member var_array_double */ - eProsima_user_DllExport const std::array& var_array_double() const + eProsima_user_DllExport const std::array& var_array_double() const { return m_var_array_double; } @@ -7927,14 +8026,16 @@ class ArraySingleDimensionLiteralsDouble * @brief This function returns a reference to member var_array_double * @return Reference to member var_array_double */ - eProsima_user_DllExport std::array& var_array_double() + eProsima_user_DllExport std::array& var_array_double() { return m_var_array_double; } + + private: - std::array m_var_array_double{0.0}; + std::array m_var_array_double{0.0}; }; /*! @@ -7966,7 +8067,7 @@ class ArraySingleDimensionLiteralsLongDouble eProsima_user_DllExport ArraySingleDimensionLiteralsLongDouble( const ArraySingleDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -7988,7 +8089,7 @@ class ArraySingleDimensionLiteralsLongDouble const ArraySingleDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -8030,7 +8131,7 @@ class ArraySingleDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be copied in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - const std::array& _var_array_longdouble) + const std::array& _var_array_longdouble) { m_var_array_longdouble = _var_array_longdouble; } @@ -8040,7 +8141,7 @@ class ArraySingleDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be moved in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - std::array&& _var_array_longdouble) + std::array&& _var_array_longdouble) { m_var_array_longdouble = std::move(_var_array_longdouble); } @@ -8049,7 +8150,7 @@ class ArraySingleDimensionLiteralsLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array& var_array_longdouble() const + eProsima_user_DllExport const std::array& var_array_longdouble() const { return m_var_array_longdouble; } @@ -8058,14 +8159,16 @@ class ArraySingleDimensionLiteralsLongDouble * @brief This function returns a reference to member var_array_longdouble * @return Reference to member var_array_longdouble */ - eProsima_user_DllExport std::array& var_array_longdouble() + eProsima_user_DllExport std::array& var_array_longdouble() { return m_var_array_longdouble; } + + private: - std::array m_var_array_longdouble{0.0}; + std::array m_var_array_longdouble{0.0}; }; /*! @@ -8097,7 +8200,7 @@ class ArraySingleDimensionLiteralsBoolean eProsima_user_DllExport ArraySingleDimensionLiteralsBoolean( const ArraySingleDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -8119,7 +8222,7 @@ class ArraySingleDimensionLiteralsBoolean const ArraySingleDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -8194,6 +8297,8 @@ class ArraySingleDimensionLiteralsBoolean return m_var_array_boolean; } + + private: std::array m_var_array_boolean{false}; @@ -8228,7 +8333,7 @@ class ArraySingleDimensionLiteralsOctet eProsima_user_DllExport ArraySingleDimensionLiteralsOctet( const ArraySingleDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -8250,7 +8355,7 @@ class ArraySingleDimensionLiteralsOctet const ArraySingleDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -8325,6 +8430,8 @@ class ArraySingleDimensionLiteralsOctet return m_var_array_octet; } + + private: std::array m_var_array_octet{0}; @@ -8359,7 +8466,7 @@ class ArraySingleDimensionLiteralsChar eProsima_user_DllExport ArraySingleDimensionLiteralsChar( const ArraySingleDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -8381,7 +8488,7 @@ class ArraySingleDimensionLiteralsChar const ArraySingleDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -8456,6 +8563,8 @@ class ArraySingleDimensionLiteralsChar return m_var_array_char; } + + private: std::array m_var_array_char{0}; @@ -8490,7 +8599,7 @@ class ArraySingleDimensionLiteralsWChar eProsima_user_DllExport ArraySingleDimensionLiteralsWChar( const ArraySingleDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -8512,7 +8621,7 @@ class ArraySingleDimensionLiteralsWChar const ArraySingleDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -8554,7 +8663,7 @@ class ArraySingleDimensionLiteralsWChar * @param _var_array_wchar New value to be copied in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - const std::array& _var_array_wchar) + const std::array& _var_array_wchar) { m_var_array_wchar = _var_array_wchar; } @@ -8564,7 +8673,7 @@ class ArraySingleDimensionLiteralsWChar * @param _var_array_wchar New value to be moved in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - std::array&& _var_array_wchar) + std::array&& _var_array_wchar) { m_var_array_wchar = std::move(_var_array_wchar); } @@ -8573,7 +8682,7 @@ class ArraySingleDimensionLiteralsWChar * @brief This function returns a constant reference to member var_array_wchar * @return Constant reference to member var_array_wchar */ - eProsima_user_DllExport const std::array& var_array_wchar() const + eProsima_user_DllExport const std::array& var_array_wchar() const { return m_var_array_wchar; } @@ -8582,14 +8691,16 @@ class ArraySingleDimensionLiteralsWChar * @brief This function returns a reference to member var_array_wchar * @return Reference to member var_array_wchar */ - eProsima_user_DllExport std::array& var_array_wchar() + eProsima_user_DllExport std::array& var_array_wchar() { return m_var_array_wchar; } + + private: - std::array m_var_array_wchar{0}; + std::array m_var_array_wchar{0}; }; /*! @@ -8621,7 +8732,7 @@ class ArraySingleDimensionLiteralsString eProsima_user_DllExport ArraySingleDimensionLiteralsString( const ArraySingleDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -8643,7 +8754,7 @@ class ArraySingleDimensionLiteralsString const ArraySingleDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -8718,6 +8829,8 @@ class ArraySingleDimensionLiteralsString return m_var_array_string; } + + private: std::array m_var_array_string; @@ -8752,7 +8865,7 @@ class ArraySingleDimensionLiteralsWString eProsima_user_DllExport ArraySingleDimensionLiteralsWString( const ArraySingleDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -8774,7 +8887,7 @@ class ArraySingleDimensionLiteralsWString const ArraySingleDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -8816,7 +8929,7 @@ class ArraySingleDimensionLiteralsWString * @param _var_array_wstring New value to be copied in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - const std::array& _var_array_wstring) + const std::array& _var_array_wstring) { m_var_array_wstring = _var_array_wstring; } @@ -8826,7 +8939,7 @@ class ArraySingleDimensionLiteralsWString * @param _var_array_wstring New value to be moved in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - std::array&& _var_array_wstring) + std::array&& _var_array_wstring) { m_var_array_wstring = std::move(_var_array_wstring); } @@ -8849,9 +8962,11 @@ class ArraySingleDimensionLiteralsWString return m_var_array_wstring; } + + private: - std::array m_var_array_wstring; + std::array m_var_array_wstring; }; /*! @@ -8883,7 +8998,7 @@ class ArraySingleDimensionLiteralsBoundedString eProsima_user_DllExport ArraySingleDimensionLiteralsBoundedString( const ArraySingleDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -8905,7 +9020,7 @@ class ArraySingleDimensionLiteralsBoundedString const ArraySingleDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -8966,8 +9081,7 @@ class ArraySingleDimensionLiteralsBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array& var_array_bounded_string() const + eProsima_user_DllExport const std::array& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -8981,6 +9095,8 @@ class ArraySingleDimensionLiteralsBoundedString return m_var_array_bounded_string; } + + private: std::array m_var_array_bounded_string; @@ -9015,7 +9131,7 @@ class ArraySingleDimensionLiteralsBoundedWString eProsima_user_DllExport ArraySingleDimensionLiteralsBoundedWString( const ArraySingleDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -9037,7 +9153,7 @@ class ArraySingleDimensionLiteralsBoundedWString const ArraySingleDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -9079,7 +9195,7 @@ class ArraySingleDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array& _var_array_bounded_wstring) + const std::array& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -9089,7 +9205,7 @@ class ArraySingleDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array&& _var_array_bounded_wstring) + std::array&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -9098,8 +9214,7 @@ class ArraySingleDimensionLiteralsBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -9113,9 +9228,11 @@ class ArraySingleDimensionLiteralsBoundedWString return m_var_array_bounded_wstring; } + + private: - std::array m_var_array_bounded_wstring; + std::array m_var_array_bounded_wstring; }; /*! @@ -9147,7 +9264,7 @@ class ArraySingleDimensionLiteralsEnum eProsima_user_DllExport ArraySingleDimensionLiteralsEnum( const ArraySingleDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -9169,7 +9286,7 @@ class ArraySingleDimensionLiteralsEnum const ArraySingleDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -9244,6 +9361,8 @@ class ArraySingleDimensionLiteralsEnum return m_var_array_enum; } + + private: std::array m_var_array_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -9278,7 +9397,7 @@ class ArraySingleDimensionLiteralsBitMask eProsima_user_DllExport ArraySingleDimensionLiteralsBitMask( const ArraySingleDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -9300,7 +9419,7 @@ class ArraySingleDimensionLiteralsBitMask const ArraySingleDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -9342,7 +9461,7 @@ class ArraySingleDimensionLiteralsBitMask * @param _var_array_bitmask New value to be copied in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - const std::array& _var_array_bitmask) + const std::array& _var_array_bitmask) { m_var_array_bitmask = _var_array_bitmask; } @@ -9352,7 +9471,7 @@ class ArraySingleDimensionLiteralsBitMask * @param _var_array_bitmask New value to be moved in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - std::array&& _var_array_bitmask) + std::array&& _var_array_bitmask) { m_var_array_bitmask = std::move(_var_array_bitmask); } @@ -9361,7 +9480,7 @@ class ArraySingleDimensionLiteralsBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array& var_array_bitmask() const + eProsima_user_DllExport const std::array& var_array_bitmask() const { return m_var_array_bitmask; } @@ -9370,14 +9489,16 @@ class ArraySingleDimensionLiteralsBitMask * @brief This function returns a reference to member var_array_bitmask * @return Reference to member var_array_bitmask */ - eProsima_user_DllExport std::array& var_array_bitmask() + eProsima_user_DllExport std::array& var_array_bitmask() { return m_var_array_bitmask; } + + private: - std::array m_var_array_bitmask{0}; + std::array m_var_array_bitmask{0}; }; /*! @@ -9409,7 +9530,7 @@ class ArraySingleDimensionLiteralsAlias eProsima_user_DllExport ArraySingleDimensionLiteralsAlias( const ArraySingleDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -9431,7 +9552,7 @@ class ArraySingleDimensionLiteralsAlias const ArraySingleDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -9506,6 +9627,8 @@ class ArraySingleDimensionLiteralsAlias return m_var_array_alias; } + + private: std::array m_var_array_alias{0}; @@ -9540,7 +9663,7 @@ class ArraySingleDimensionLiteralsShortArray eProsima_user_DllExport ArraySingleDimensionLiteralsShortArray( const ArraySingleDimensionLiteralsShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; } @@ -9562,7 +9685,7 @@ class ArraySingleDimensionLiteralsShortArray const ArraySingleDimensionLiteralsShortArray& x) { - m_var_array_short_array = x.m_var_array_short_array; + m_var_array_short_array = x.m_var_array_short_array; return *this; } @@ -9604,7 +9727,7 @@ class ArraySingleDimensionLiteralsShortArray * @param _var_array_short_array New value to be copied in member var_array_short_array */ eProsima_user_DllExport void var_array_short_array( - const std::array, size_1* size_2>& _var_array_short_array) + const std::array, size_1*size_2>& _var_array_short_array) { m_var_array_short_array = _var_array_short_array; } @@ -9614,7 +9737,7 @@ class ArraySingleDimensionLiteralsShortArray * @param _var_array_short_array New value to be moved in member var_array_short_array */ eProsima_user_DllExport void var_array_short_array( - std::array, size_1* size_2>&& _var_array_short_array) + std::array, size_1*size_2>&& _var_array_short_array) { m_var_array_short_array = std::move(_var_array_short_array); } @@ -9623,8 +9746,7 @@ class ArraySingleDimensionLiteralsShortArray * @brief This function returns a constant reference to member var_array_short_array * @return Constant reference to member var_array_short_array */ - eProsima_user_DllExport const std::array, - size_1*size_2>& var_array_short_array() const + eProsima_user_DllExport const std::array, size_1*size_2>& var_array_short_array() const { return m_var_array_short_array; } @@ -9633,14 +9755,16 @@ class ArraySingleDimensionLiteralsShortArray * @brief This function returns a reference to member var_array_short_array * @return Reference to member var_array_short_array */ - eProsima_user_DllExport std::array, size_1*size_2>& var_array_short_array() + eProsima_user_DllExport std::array, size_1*size_2>& var_array_short_array() { return m_var_array_short_array; } + + private: - std::array, size_1* size_2> m_var_array_short_array{ {{0}} }; + std::array, size_1*size_2> m_var_array_short_array{ {{0}} }; }; /*! @@ -9672,7 +9796,7 @@ class ArraySingleDimensionLiteralsSequence eProsima_user_DllExport ArraySingleDimensionLiteralsSequence( const ArraySingleDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -9694,7 +9818,7 @@ class ArraySingleDimensionLiteralsSequence const ArraySingleDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -9769,6 +9893,8 @@ class ArraySingleDimensionLiteralsSequence return m_var_array_sequence; } + + private: std::array, size_1> m_var_array_sequence; @@ -9803,7 +9929,7 @@ class ArraySingleDimensionLiteralsMap eProsima_user_DllExport ArraySingleDimensionLiteralsMap( const ArraySingleDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -9825,7 +9951,7 @@ class ArraySingleDimensionLiteralsMap const ArraySingleDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -9900,6 +10026,8 @@ class ArraySingleDimensionLiteralsMap return m_var_array_map; } + + private: std::array, size_2> m_var_array_map; @@ -9934,7 +10062,7 @@ class ArraySingleDimensionLiteralsUnion eProsima_user_DllExport ArraySingleDimensionLiteralsUnion( const ArraySingleDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -9956,7 +10084,7 @@ class ArraySingleDimensionLiteralsUnion const ArraySingleDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -9998,7 +10126,7 @@ class ArraySingleDimensionLiteralsUnion * @param _var_array_union New value to be copied in member var_array_union */ eProsima_user_DllExport void var_array_union( - const std::array& _var_array_union) + const std::array& _var_array_union) { m_var_array_union = _var_array_union; } @@ -10008,7 +10136,7 @@ class ArraySingleDimensionLiteralsUnion * @param _var_array_union New value to be moved in member var_array_union */ eProsima_user_DllExport void var_array_union( - std::array&& _var_array_union) + std::array&& _var_array_union) { m_var_array_union = std::move(_var_array_union); } @@ -10017,7 +10145,7 @@ class ArraySingleDimensionLiteralsUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array& var_array_union() const + eProsima_user_DllExport const std::array& var_array_union() const { return m_var_array_union; } @@ -10026,14 +10154,16 @@ class ArraySingleDimensionLiteralsUnion * @brief This function returns a reference to member var_array_union * @return Reference to member var_array_union */ - eProsima_user_DllExport std::array& var_array_union() + eProsima_user_DllExport std::array& var_array_union() { return m_var_array_union; } + + private: - std::array m_var_array_union; + std::array m_var_array_union; }; /*! @@ -10065,7 +10195,7 @@ class ArraySingleDimensionLiteralsStructure eProsima_user_DllExport ArraySingleDimensionLiteralsStructure( const ArraySingleDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -10087,7 +10217,7 @@ class ArraySingleDimensionLiteralsStructure const ArraySingleDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -10162,6 +10292,8 @@ class ArraySingleDimensionLiteralsStructure return m_var_array_structure; } + + private: std::array m_var_array_structure; @@ -10196,7 +10328,7 @@ class ArraySingleDimensionLiteralsBitset eProsima_user_DllExport ArraySingleDimensionLiteralsBitset( const ArraySingleDimensionLiteralsBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -10218,7 +10350,7 @@ class ArraySingleDimensionLiteralsBitset const ArraySingleDimensionLiteralsBitset& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -10260,7 +10392,7 @@ class ArraySingleDimensionLiteralsBitset * @param _var_array_bitset New value to be copied in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - const std::array& _var_array_bitset) + const std::array& _var_array_bitset) { m_var_array_bitset = _var_array_bitset; } @@ -10270,7 +10402,7 @@ class ArraySingleDimensionLiteralsBitset * @param _var_array_bitset New value to be moved in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - std::array&& _var_array_bitset) + std::array&& _var_array_bitset) { m_var_array_bitset = std::move(_var_array_bitset); } @@ -10279,7 +10411,7 @@ class ArraySingleDimensionLiteralsBitset * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array& var_array_bitset() const + eProsima_user_DllExport const std::array& var_array_bitset() const { return m_var_array_bitset; } @@ -10288,14 +10420,16 @@ class ArraySingleDimensionLiteralsBitset * @brief This function returns a reference to member var_array_bitset * @return Reference to member var_array_bitset */ - eProsima_user_DllExport std::array& var_array_bitset() + eProsima_user_DllExport std::array& var_array_bitset() { return m_var_array_bitset; } + + private: - std::array m_var_array_bitset; + std::array m_var_array_bitset; }; /*! @@ -10327,7 +10461,7 @@ class ArrayMultiDimensionLiteralsShort eProsima_user_DllExport ArrayMultiDimensionLiteralsShort( const ArrayMultiDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -10349,7 +10483,7 @@ class ArrayMultiDimensionLiteralsShort const ArrayMultiDimensionLiteralsShort& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -10391,7 +10525,7 @@ class ArrayMultiDimensionLiteralsShort * @param _var_array_short New value to be copied in member var_array_short */ eProsima_user_DllExport void var_array_short( - const std::array, 5 + 5>, size_1>& _var_array_short) + const std::array, 5+5>, size_1>& _var_array_short) { m_var_array_short = _var_array_short; } @@ -10401,7 +10535,7 @@ class ArrayMultiDimensionLiteralsShort * @param _var_array_short New value to be moved in member var_array_short */ eProsima_user_DllExport void var_array_short( - std::array, 5 + 5>, size_1>&& _var_array_short) + std::array, 5+5>, size_1>&& _var_array_short) { m_var_array_short = std::move(_var_array_short); } @@ -10410,8 +10544,7 @@ class ArrayMultiDimensionLiteralsShort * @brief This function returns a constant reference to member var_array_short * @return Constant reference to member var_array_short */ - eProsima_user_DllExport const std::array, 5 + 5>, - size_1>& var_array_short() const + eProsima_user_DllExport const std::array, 5+5>, size_1>& var_array_short() const { return m_var_array_short; } @@ -10420,14 +10553,16 @@ class ArrayMultiDimensionLiteralsShort * @brief This function returns a reference to member var_array_short * @return Reference to member var_array_short */ - eProsima_user_DllExport std::array, 5 + 5>, size_1>& var_array_short() + eProsima_user_DllExport std::array, 5+5>, size_1>& var_array_short() { return m_var_array_short; } + + private: - std::array, 5 + 5>, size_1> m_var_array_short{ {{ {{0}} }} }; + std::array, 5+5>, size_1> m_var_array_short{ {{ {{0}} }} }; }; /*! @@ -10459,7 +10594,7 @@ class ArrayMultiDimensionLiteralsUShort eProsima_user_DllExport ArrayMultiDimensionLiteralsUShort( const ArrayMultiDimensionLiteralsUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; } @@ -10481,7 +10616,7 @@ class ArrayMultiDimensionLiteralsUShort const ArrayMultiDimensionLiteralsUShort& x) { - m_var_array_ushort = x.m_var_array_ushort; + m_var_array_ushort = x.m_var_array_ushort; return *this; } @@ -10542,8 +10677,7 @@ class ArrayMultiDimensionLiteralsUShort * @brief This function returns a constant reference to member var_array_ushort * @return Constant reference to member var_array_ushort */ - eProsima_user_DllExport const std::array, size_1*2>, - size_1>& var_array_ushort() const + eProsima_user_DllExport const std::array, size_1*2>, size_1>& var_array_ushort() const { return m_var_array_ushort; } @@ -10557,6 +10691,8 @@ class ArrayMultiDimensionLiteralsUShort return m_var_array_ushort; } + + private: std::array, size_1*2>, size_1> m_var_array_ushort{ {{ {{0}} }} }; @@ -10591,7 +10727,7 @@ class ArrayMultiDimensionLiteralsLong eProsima_user_DllExport ArrayMultiDimensionLiteralsLong( const ArrayMultiDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; } @@ -10613,7 +10749,7 @@ class ArrayMultiDimensionLiteralsLong const ArrayMultiDimensionLiteralsLong& x) { - m_var_array_long = x.m_var_array_long; + m_var_array_long = x.m_var_array_long; return *this; } @@ -10655,7 +10791,7 @@ class ArrayMultiDimensionLiteralsLong * @param _var_array_long New value to be copied in member var_array_long */ eProsima_user_DllExport void var_array_long( - const std::array, size_1>, 5 * 2>& _var_array_long) + const std::array, size_1>, 5*2>& _var_array_long) { m_var_array_long = _var_array_long; } @@ -10665,7 +10801,7 @@ class ArrayMultiDimensionLiteralsLong * @param _var_array_long New value to be moved in member var_array_long */ eProsima_user_DllExport void var_array_long( - std::array, size_1>, 5 * 2>&& _var_array_long) + std::array, size_1>, 5*2>&& _var_array_long) { m_var_array_long = std::move(_var_array_long); } @@ -10674,7 +10810,7 @@ class ArrayMultiDimensionLiteralsLong * @brief This function returns a constant reference to member var_array_long * @return Constant reference to member var_array_long */ - eProsima_user_DllExport const std::array, size_1>, 5 * 2>& var_array_long() const + eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_long() const { return m_var_array_long; } @@ -10683,14 +10819,16 @@ class ArrayMultiDimensionLiteralsLong * @brief This function returns a reference to member var_array_long * @return Reference to member var_array_long */ - eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_long() + eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_long() { return m_var_array_long; } + + private: - std::array, size_1>, 5 * 2> m_var_array_long{ {{ {{0}} }} }; + std::array, size_1>, 5*2> m_var_array_long{ {{ {{0}} }} }; }; /*! @@ -10722,7 +10860,7 @@ class ArrayMultiDimensionLiteralsULong eProsima_user_DllExport ArrayMultiDimensionLiteralsULong( const ArrayMultiDimensionLiteralsULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; } @@ -10744,7 +10882,7 @@ class ArrayMultiDimensionLiteralsULong const ArrayMultiDimensionLiteralsULong& x) { - m_var_array_ulong = x.m_var_array_ulong; + m_var_array_ulong = x.m_var_array_ulong; return *this; } @@ -10786,7 +10924,7 @@ class ArrayMultiDimensionLiteralsULong * @param _var_array_ulong New value to be copied in member var_array_ulong */ eProsima_user_DllExport void var_array_ulong( - const std::array, size_1* size_2>, 5 + 5>& _var_array_ulong) + const std::array, size_1*size_2>, 5+5>& _var_array_ulong) { m_var_array_ulong = _var_array_ulong; } @@ -10796,7 +10934,7 @@ class ArrayMultiDimensionLiteralsULong * @param _var_array_ulong New value to be moved in member var_array_ulong */ eProsima_user_DllExport void var_array_ulong( - std::array, size_1* size_2>, 5 + 5>&& _var_array_ulong) + std::array, size_1*size_2>, 5+5>&& _var_array_ulong) { m_var_array_ulong = std::move(_var_array_ulong); } @@ -10805,8 +10943,7 @@ class ArrayMultiDimensionLiteralsULong * @brief This function returns a constant reference to member var_array_ulong * @return Constant reference to member var_array_ulong */ - eProsima_user_DllExport const std::array, size_1*size_2>, - 5 + 5>& var_array_ulong() const + eProsima_user_DllExport const std::array, size_1*size_2>, 5+5>& var_array_ulong() const { return m_var_array_ulong; } @@ -10815,15 +10952,16 @@ class ArrayMultiDimensionLiteralsULong * @brief This function returns a reference to member var_array_ulong * @return Reference to member var_array_ulong */ - eProsima_user_DllExport std::array, size_1*size_2>, - 5 + 5>& var_array_ulong() + eProsima_user_DllExport std::array, size_1*size_2>, 5+5>& var_array_ulong() { return m_var_array_ulong; } + + private: - std::array, size_1* size_2>, 5 + 5> m_var_array_ulong{ {{ {{0}} }} }; + std::array, size_1*size_2>, 5+5> m_var_array_ulong{ {{ {{0}} }} }; }; /*! @@ -10855,7 +10993,7 @@ class ArrayMultiDimensionLiteralsLongLong eProsima_user_DllExport ArrayMultiDimensionLiteralsLongLong( const ArrayMultiDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; } @@ -10877,7 +11015,7 @@ class ArrayMultiDimensionLiteralsLongLong const ArrayMultiDimensionLiteralsLongLong& x) { - m_var_array_longlong = x.m_var_array_longlong; + m_var_array_longlong = x.m_var_array_longlong; return *this; } @@ -10919,7 +11057,7 @@ class ArrayMultiDimensionLiteralsLongLong * @param _var_array_longlong New value to be copied in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - const std::array, 5 * 2>, size_1>& _var_array_longlong) + const std::array, 5*2>, size_1>& _var_array_longlong) { m_var_array_longlong = _var_array_longlong; } @@ -10929,7 +11067,7 @@ class ArrayMultiDimensionLiteralsLongLong * @param _var_array_longlong New value to be moved in member var_array_longlong */ eProsima_user_DllExport void var_array_longlong( - std::array, 5 * 2>, size_1>&& _var_array_longlong) + std::array, 5*2>, size_1>&& _var_array_longlong) { m_var_array_longlong = std::move(_var_array_longlong); } @@ -10938,8 +11076,7 @@ class ArrayMultiDimensionLiteralsLongLong * @brief This function returns a constant reference to member var_array_longlong * @return Constant reference to member var_array_longlong */ - eProsima_user_DllExport const std::array, 5 * 2>, - size_1>& var_array_longlong() const + eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_longlong() const { return m_var_array_longlong; } @@ -10948,14 +11085,16 @@ class ArrayMultiDimensionLiteralsLongLong * @brief This function returns a reference to member var_array_longlong * @return Reference to member var_array_longlong */ - eProsima_user_DllExport std::array, 5 * 2>, size_1>& var_array_longlong() + eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_longlong() { return m_var_array_longlong; } + + private: - std::array, 5 * 2>, size_1> m_var_array_longlong{ {{ {{0}} }} }; + std::array, 5*2>, size_1> m_var_array_longlong{ {{ {{0}} }} }; }; /*! @@ -10987,7 +11126,7 @@ class ArrayMultiDimensionLiteralsULongLong eProsima_user_DllExport ArrayMultiDimensionLiteralsULongLong( const ArrayMultiDimensionLiteralsULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; } @@ -11009,7 +11148,7 @@ class ArrayMultiDimensionLiteralsULongLong const ArrayMultiDimensionLiteralsULongLong& x) { - m_var_array_ulonglong = x.m_var_array_ulonglong; + m_var_array_ulonglong = x.m_var_array_ulonglong; return *this; } @@ -11051,7 +11190,7 @@ class ArrayMultiDimensionLiteralsULongLong * @param _var_array_ulonglong New value to be copied in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - const std::array, size_1* size_2>, size_1 + 5>& _var_array_ulonglong) + const std::array, size_1*size_2>, size_1+5>& _var_array_ulonglong) { m_var_array_ulonglong = _var_array_ulonglong; } @@ -11061,7 +11200,7 @@ class ArrayMultiDimensionLiteralsULongLong * @param _var_array_ulonglong New value to be moved in member var_array_ulonglong */ eProsima_user_DllExport void var_array_ulonglong( - std::array, size_1* size_2>, size_1 + 5>&& _var_array_ulonglong) + std::array, size_1*size_2>, size_1+5>&& _var_array_ulonglong) { m_var_array_ulonglong = std::move(_var_array_ulonglong); } @@ -11070,8 +11209,7 @@ class ArrayMultiDimensionLiteralsULongLong * @brief This function returns a constant reference to member var_array_ulonglong * @return Constant reference to member var_array_ulonglong */ - eProsima_user_DllExport const std::array, size_1*size_2>, - size_1 + 5>& var_array_ulonglong() const + eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_ulonglong() const { return m_var_array_ulonglong; } @@ -11080,16 +11218,16 @@ class ArrayMultiDimensionLiteralsULongLong * @brief This function returns a reference to member var_array_ulonglong * @return Reference to member var_array_ulonglong */ - eProsima_user_DllExport std::array, size_1*size_2>, - size_1 + 5>& var_array_ulonglong() + eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_ulonglong() { return m_var_array_ulonglong; } + + private: - std::array, size_1* size_2>, - size_1 + 5> m_var_array_ulonglong{ {{ {{0}} }} }; + std::array, size_1*size_2>, size_1+5> m_var_array_ulonglong{ {{ {{0}} }} }; }; /*! @@ -11121,7 +11259,7 @@ class ArrayMultiDimensionLiteralsFloat eProsima_user_DllExport ArrayMultiDimensionLiteralsFloat( const ArrayMultiDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; } @@ -11143,7 +11281,7 @@ class ArrayMultiDimensionLiteralsFloat const ArrayMultiDimensionLiteralsFloat& x) { - m_var_array_float = x.m_var_array_float; + m_var_array_float = x.m_var_array_float; return *this; } @@ -11185,7 +11323,7 @@ class ArrayMultiDimensionLiteralsFloat * @param _var_array_float New value to be copied in member var_array_float */ eProsima_user_DllExport void var_array_float( - const std::array, size_1>, 5 * 2>& _var_array_float) + const std::array, size_1>, 5*2>& _var_array_float) { m_var_array_float = _var_array_float; } @@ -11195,7 +11333,7 @@ class ArrayMultiDimensionLiteralsFloat * @param _var_array_float New value to be moved in member var_array_float */ eProsima_user_DllExport void var_array_float( - std::array, size_1>, 5 * 2>&& _var_array_float) + std::array, size_1>, 5*2>&& _var_array_float) { m_var_array_float = std::move(_var_array_float); } @@ -11204,8 +11342,7 @@ class ArrayMultiDimensionLiteralsFloat * @brief This function returns a constant reference to member var_array_float * @return Constant reference to member var_array_float */ - eProsima_user_DllExport const std::array, size_1>, - 5 * 2>& var_array_float() const + eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_float() const { return m_var_array_float; } @@ -11214,14 +11351,16 @@ class ArrayMultiDimensionLiteralsFloat * @brief This function returns a reference to member var_array_float * @return Reference to member var_array_float */ - eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_float() + eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_float() { return m_var_array_float; } + + private: - std::array, size_1>, 5 * 2> m_var_array_float{ {{ {{0.0}} }} }; + std::array, size_1>, 5*2> m_var_array_float{ {{ {{0.0}} }} }; }; /*! @@ -11253,7 +11392,7 @@ class ArrayMultiDimensionLiteralsDouble eProsima_user_DllExport ArrayMultiDimensionLiteralsDouble( const ArrayMultiDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; } @@ -11275,7 +11414,7 @@ class ArrayMultiDimensionLiteralsDouble const ArrayMultiDimensionLiteralsDouble& x) { - m_var_array_double = x.m_var_array_double; + m_var_array_double = x.m_var_array_double; return *this; } @@ -11317,7 +11456,7 @@ class ArrayMultiDimensionLiteralsDouble * @param _var_array_double New value to be copied in member var_array_double */ eProsima_user_DllExport void var_array_double( - const std::array, size_1 + 5>, size_1>& _var_array_double) + const std::array, size_1+5>, size_1>& _var_array_double) { m_var_array_double = _var_array_double; } @@ -11327,7 +11466,7 @@ class ArrayMultiDimensionLiteralsDouble * @param _var_array_double New value to be moved in member var_array_double */ eProsima_user_DllExport void var_array_double( - std::array, size_1 + 5>, size_1>&& _var_array_double) + std::array, size_1+5>, size_1>&& _var_array_double) { m_var_array_double = std::move(_var_array_double); } @@ -11336,8 +11475,7 @@ class ArrayMultiDimensionLiteralsDouble * @brief This function returns a constant reference to member var_array_double * @return Constant reference to member var_array_double */ - eProsima_user_DllExport const std::array, size_1 + 5>, - size_1>& var_array_double() const + eProsima_user_DllExport const std::array, size_1+5>, size_1>& var_array_double() const { return m_var_array_double; } @@ -11346,14 +11484,16 @@ class ArrayMultiDimensionLiteralsDouble * @brief This function returns a reference to member var_array_double * @return Reference to member var_array_double */ - eProsima_user_DllExport std::array, size_1 + 5>, size_1>& var_array_double() + eProsima_user_DllExport std::array, size_1+5>, size_1>& var_array_double() { return m_var_array_double; } + + private: - std::array, size_1 + 5>, size_1> m_var_array_double{ {{ {{0.0}} }} }; + std::array, size_1+5>, size_1> m_var_array_double{ {{ {{0.0}} }} }; }; /*! @@ -11385,7 +11525,7 @@ class ArrayMultiDimensionLiteralsLongDouble eProsima_user_DllExport ArrayMultiDimensionLiteralsLongDouble( const ArrayMultiDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; } @@ -11407,7 +11547,7 @@ class ArrayMultiDimensionLiteralsLongDouble const ArrayMultiDimensionLiteralsLongDouble& x) { - m_var_array_longdouble = x.m_var_array_longdouble; + m_var_array_longdouble = x.m_var_array_longdouble; return *this; } @@ -11449,7 +11589,7 @@ class ArrayMultiDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be copied in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - const std::array, size_1>, size_1>& _var_array_longdouble) + const std::array, size_1>, size_1>& _var_array_longdouble) { m_var_array_longdouble = _var_array_longdouble; } @@ -11459,7 +11599,7 @@ class ArrayMultiDimensionLiteralsLongDouble * @param _var_array_longdouble New value to be moved in member var_array_longdouble */ eProsima_user_DllExport void var_array_longdouble( - std::array, size_1>, size_1>&& _var_array_longdouble) + std::array, size_1>, size_1>&& _var_array_longdouble) { m_var_array_longdouble = std::move(_var_array_longdouble); } @@ -11468,8 +11608,7 @@ class ArrayMultiDimensionLiteralsLongDouble * @brief This function returns a constant reference to member var_array_longdouble * @return Constant reference to member var_array_longdouble */ - eProsima_user_DllExport const std::array, size_1>, - size_1>& var_array_longdouble() const + eProsima_user_DllExport const std::array, size_1>, size_1>& var_array_longdouble() const { return m_var_array_longdouble; } @@ -11478,15 +11617,16 @@ class ArrayMultiDimensionLiteralsLongDouble * @brief This function returns a reference to member var_array_longdouble * @return Reference to member var_array_longdouble */ - eProsima_user_DllExport std::array, size_1>, - size_1>& var_array_longdouble() + eProsima_user_DllExport std::array, size_1>, size_1>& var_array_longdouble() { return m_var_array_longdouble; } + + private: - std::array, size_1>, size_1> m_var_array_longdouble{ {{ {{0.0}} }} }; + std::array, size_1>, size_1> m_var_array_longdouble{ {{ {{0.0}} }} }; }; /*! @@ -11518,7 +11658,7 @@ class ArrayMultiDimensionLiteralsBoolean eProsima_user_DllExport ArrayMultiDimensionLiteralsBoolean( const ArrayMultiDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; } @@ -11540,7 +11680,7 @@ class ArrayMultiDimensionLiteralsBoolean const ArrayMultiDimensionLiteralsBoolean& x) { - m_var_array_boolean = x.m_var_array_boolean; + m_var_array_boolean = x.m_var_array_boolean; return *this; } @@ -11582,7 +11722,7 @@ class ArrayMultiDimensionLiteralsBoolean * @param _var_array_boolean New value to be copied in member var_array_boolean */ eProsima_user_DllExport void var_array_boolean( - const std::array, size_1>, size_1* size_2>& _var_array_boolean) + const std::array, size_1>, size_1*size_2>& _var_array_boolean) { m_var_array_boolean = _var_array_boolean; } @@ -11592,7 +11732,7 @@ class ArrayMultiDimensionLiteralsBoolean * @param _var_array_boolean New value to be moved in member var_array_boolean */ eProsima_user_DllExport void var_array_boolean( - std::array, size_1>, size_1* size_2>&& _var_array_boolean) + std::array, size_1>, size_1*size_2>&& _var_array_boolean) { m_var_array_boolean = std::move(_var_array_boolean); } @@ -11601,8 +11741,7 @@ class ArrayMultiDimensionLiteralsBoolean * @brief This function returns a constant reference to member var_array_boolean * @return Constant reference to member var_array_boolean */ - eProsima_user_DllExport const std::array, size_1>, - size_1*size_2>& var_array_boolean() const + eProsima_user_DllExport const std::array, size_1>, size_1*size_2>& var_array_boolean() const { return m_var_array_boolean; } @@ -11616,9 +11755,11 @@ class ArrayMultiDimensionLiteralsBoolean return m_var_array_boolean; } + + private: - std::array, size_1>, size_1* size_2> m_var_array_boolean{ {{ {{false}} }} }; + std::array, size_1>, size_1*size_2> m_var_array_boolean{ {{ {{false}} }} }; }; /*! @@ -11650,7 +11791,7 @@ class ArrayMultiDimensionLiteralsOctet eProsima_user_DllExport ArrayMultiDimensionLiteralsOctet( const ArrayMultiDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; } @@ -11672,7 +11813,7 @@ class ArrayMultiDimensionLiteralsOctet const ArrayMultiDimensionLiteralsOctet& x) { - m_var_array_octet = x.m_var_array_octet; + m_var_array_octet = x.m_var_array_octet; return *this; } @@ -11733,8 +11874,7 @@ class ArrayMultiDimensionLiteralsOctet * @brief This function returns a constant reference to member var_array_octet * @return Constant reference to member var_array_octet */ - eProsima_user_DllExport const std::array, size_1*2>, - size_1>& var_array_octet() const + eProsima_user_DllExport const std::array, size_1*2>, size_1>& var_array_octet() const { return m_var_array_octet; } @@ -11748,6 +11888,8 @@ class ArrayMultiDimensionLiteralsOctet return m_var_array_octet; } + + private: std::array, size_1*2>, size_1> m_var_array_octet{ {{ {{0}} }} }; @@ -11782,7 +11924,7 @@ class ArrayMultiDimensionLiteralsChar eProsima_user_DllExport ArrayMultiDimensionLiteralsChar( const ArrayMultiDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; } @@ -11804,7 +11946,7 @@ class ArrayMultiDimensionLiteralsChar const ArrayMultiDimensionLiteralsChar& x) { - m_var_array_char = x.m_var_array_char; + m_var_array_char = x.m_var_array_char; return *this; } @@ -11846,7 +11988,7 @@ class ArrayMultiDimensionLiteralsChar * @param _var_array_char New value to be copied in member var_array_char */ eProsima_user_DllExport void var_array_char( - const std::array, size_1>, 5 + 5>& _var_array_char) + const std::array, size_1>, 5+5>& _var_array_char) { m_var_array_char = _var_array_char; } @@ -11856,7 +11998,7 @@ class ArrayMultiDimensionLiteralsChar * @param _var_array_char New value to be moved in member var_array_char */ eProsima_user_DllExport void var_array_char( - std::array, size_1>, 5 + 5>&& _var_array_char) + std::array, size_1>, 5+5>&& _var_array_char) { m_var_array_char = std::move(_var_array_char); } @@ -11865,7 +12007,7 @@ class ArrayMultiDimensionLiteralsChar * @brief This function returns a constant reference to member var_array_char * @return Constant reference to member var_array_char */ - eProsima_user_DllExport const std::array, size_1>, 5 + 5>& var_array_char() const + eProsima_user_DllExport const std::array, size_1>, 5+5>& var_array_char() const { return m_var_array_char; } @@ -11874,14 +12016,16 @@ class ArrayMultiDimensionLiteralsChar * @brief This function returns a reference to member var_array_char * @return Reference to member var_array_char */ - eProsima_user_DllExport std::array, size_1>, 5 + 5>& var_array_char() + eProsima_user_DllExport std::array, size_1>, 5+5>& var_array_char() { return m_var_array_char; } + + private: - std::array, size_1>, 5 + 5> m_var_array_char{ {{ {{0}} }} }; + std::array, size_1>, 5+5> m_var_array_char{ {{ {{0}} }} }; }; /*! @@ -11913,7 +12057,7 @@ class ArrayMultiDimensionLiteralsWChar eProsima_user_DllExport ArrayMultiDimensionLiteralsWChar( const ArrayMultiDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; } @@ -11935,7 +12079,7 @@ class ArrayMultiDimensionLiteralsWChar const ArrayMultiDimensionLiteralsWChar& x) { - m_var_array_wchar = x.m_var_array_wchar; + m_var_array_wchar = x.m_var_array_wchar; return *this; } @@ -11977,7 +12121,7 @@ class ArrayMultiDimensionLiteralsWChar * @param _var_array_wchar New value to be copied in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - const std::array, size_1 + 5>, size_1* size_2>& _var_array_wchar) + const std::array, size_1+5>, size_1*size_2>& _var_array_wchar) { m_var_array_wchar = _var_array_wchar; } @@ -11987,7 +12131,7 @@ class ArrayMultiDimensionLiteralsWChar * @param _var_array_wchar New value to be moved in member var_array_wchar */ eProsima_user_DllExport void var_array_wchar( - std::array, size_1 + 5>, size_1* size_2>&& _var_array_wchar) + std::array, size_1+5>, size_1*size_2>&& _var_array_wchar) { m_var_array_wchar = std::move(_var_array_wchar); } @@ -11996,8 +12140,7 @@ class ArrayMultiDimensionLiteralsWChar * @brief This function returns a constant reference to member var_array_wchar * @return Constant reference to member var_array_wchar */ - eProsima_user_DllExport const std::array, size_1 + 5>, - size_1*size_2>& var_array_wchar() const + eProsima_user_DllExport const std::array, size_1+5>, size_1*size_2>& var_array_wchar() const { return m_var_array_wchar; } @@ -12006,15 +12149,16 @@ class ArrayMultiDimensionLiteralsWChar * @brief This function returns a reference to member var_array_wchar * @return Reference to member var_array_wchar */ - eProsima_user_DllExport std::array, size_1 + 5>, - size_1*size_2>& var_array_wchar() + eProsima_user_DllExport std::array, size_1+5>, size_1*size_2>& var_array_wchar() { return m_var_array_wchar; } + + private: - std::array, size_1 + 5>, size_1* size_2> m_var_array_wchar{ {{ {{0}} }} }; + std::array, size_1+5>, size_1*size_2> m_var_array_wchar{ {{ {{0}} }} }; }; /*! @@ -12046,7 +12190,7 @@ class ArrayMultiDimensionLiteralsString eProsima_user_DllExport ArrayMultiDimensionLiteralsString( const ArrayMultiDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; } @@ -12068,7 +12212,7 @@ class ArrayMultiDimensionLiteralsString const ArrayMultiDimensionLiteralsString& x) { - m_var_array_string = x.m_var_array_string; + m_var_array_string = x.m_var_array_string; return *this; } @@ -12110,7 +12254,7 @@ class ArrayMultiDimensionLiteralsString * @param _var_array_string New value to be copied in member var_array_string */ eProsima_user_DllExport void var_array_string( - const std::array, 5 * 2>, size_1>& _var_array_string) + const std::array, 5*2>, size_1>& _var_array_string) { m_var_array_string = _var_array_string; } @@ -12120,7 +12264,7 @@ class ArrayMultiDimensionLiteralsString * @param _var_array_string New value to be moved in member var_array_string */ eProsima_user_DllExport void var_array_string( - std::array, 5 * 2>, size_1>&& _var_array_string) + std::array, 5*2>, size_1>&& _var_array_string) { m_var_array_string = std::move(_var_array_string); } @@ -12129,8 +12273,7 @@ class ArrayMultiDimensionLiteralsString * @brief This function returns a constant reference to member var_array_string * @return Constant reference to member var_array_string */ - eProsima_user_DllExport const std::array, 5 * 2>, - size_1>& var_array_string() const + eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_string() const { return m_var_array_string; } @@ -12139,14 +12282,16 @@ class ArrayMultiDimensionLiteralsString * @brief This function returns a reference to member var_array_string * @return Reference to member var_array_string */ - eProsima_user_DllExport std::array, 5 * 2>, size_1>& var_array_string() + eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_string() { return m_var_array_string; } + + private: - std::array, 5 * 2>, size_1> m_var_array_string; + std::array, 5*2>, size_1> m_var_array_string; }; /*! @@ -12178,7 +12323,7 @@ class ArrayMultiDimensionLiteralsWString eProsima_user_DllExport ArrayMultiDimensionLiteralsWString( const ArrayMultiDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; } @@ -12200,7 +12345,7 @@ class ArrayMultiDimensionLiteralsWString const ArrayMultiDimensionLiteralsWString& x) { - m_var_array_wstring = x.m_var_array_wstring; + m_var_array_wstring = x.m_var_array_wstring; return *this; } @@ -12242,8 +12387,7 @@ class ArrayMultiDimensionLiteralsWString * @param _var_array_wstring New value to be copied in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - const std::array, size_1* size_2>, - size_1 + 5>& _var_array_wstring) + const std::array, size_1*size_2>, size_1+5>& _var_array_wstring) { m_var_array_wstring = _var_array_wstring; } @@ -12253,7 +12397,7 @@ class ArrayMultiDimensionLiteralsWString * @param _var_array_wstring New value to be moved in member var_array_wstring */ eProsima_user_DllExport void var_array_wstring( - std::array, size_1* size_2>, size_1 + 5>&& _var_array_wstring) + std::array, size_1*size_2>, size_1+5>&& _var_array_wstring) { m_var_array_wstring = std::move(_var_array_wstring); } @@ -12262,8 +12406,7 @@ class ArrayMultiDimensionLiteralsWString * @brief This function returns a constant reference to member var_array_wstring * @return Constant reference to member var_array_wstring */ - eProsima_user_DllExport const std::array, size_1*size_2>, - size_1 + 5>& var_array_wstring() const + eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_wstring() const { return m_var_array_wstring; } @@ -12272,15 +12415,16 @@ class ArrayMultiDimensionLiteralsWString * @brief This function returns a reference to member var_array_wstring * @return Reference to member var_array_wstring */ - eProsima_user_DllExport std::array, size_1*size_2>, - size_1 + 5>& var_array_wstring() + eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_wstring() { return m_var_array_wstring; } + + private: - std::array, size_1* size_2>, size_1 + 5> m_var_array_wstring; + std::array, size_1*size_2>, size_1+5> m_var_array_wstring; }; /*! @@ -12312,7 +12456,7 @@ class ArrayMultiDimensionLiteralsBoundedString eProsima_user_DllExport ArrayMultiDimensionLiteralsBoundedString( const ArrayMultiDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; } @@ -12334,7 +12478,7 @@ class ArrayMultiDimensionLiteralsBoundedString const ArrayMultiDimensionLiteralsBoundedString& x) { - m_var_array_bounded_string = x.m_var_array_bounded_string; + m_var_array_bounded_string = x.m_var_array_bounded_string; return *this; } @@ -12376,8 +12520,7 @@ class ArrayMultiDimensionLiteralsBoundedString * @param _var_array_bounded_string New value to be copied in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - const std::array, 5 * 2>, - size_1>& _var_array_bounded_string) + const std::array, 5*2>, size_1>& _var_array_bounded_string) { m_var_array_bounded_string = _var_array_bounded_string; } @@ -12387,8 +12530,7 @@ class ArrayMultiDimensionLiteralsBoundedString * @param _var_array_bounded_string New value to be moved in member var_array_bounded_string */ eProsima_user_DllExport void var_array_bounded_string( - std::array, 5 * 2>, - size_1>&& _var_array_bounded_string) + std::array, 5*2>, size_1>&& _var_array_bounded_string) { m_var_array_bounded_string = std::move(_var_array_bounded_string); } @@ -12397,8 +12539,7 @@ class ArrayMultiDimensionLiteralsBoundedString * @brief This function returns a constant reference to member var_array_bounded_string * @return Constant reference to member var_array_bounded_string */ - eProsima_user_DllExport const std::array, 5 * 2>, - size_1>& var_array_bounded_string() const + eProsima_user_DllExport const std::array, 5*2>, size_1>& var_array_bounded_string() const { return m_var_array_bounded_string; } @@ -12407,15 +12548,16 @@ class ArrayMultiDimensionLiteralsBoundedString * @brief This function returns a reference to member var_array_bounded_string * @return Reference to member var_array_bounded_string */ - eProsima_user_DllExport std::array, 5 * 2>, - size_1>& var_array_bounded_string() + eProsima_user_DllExport std::array, 5*2>, size_1>& var_array_bounded_string() { return m_var_array_bounded_string; } + + private: - std::array, 5 * 2>, size_1> m_var_array_bounded_string; + std::array, 5*2>, size_1> m_var_array_bounded_string; }; /*! @@ -12447,7 +12589,7 @@ class ArrayMultiDimensionLiteralsBoundedWString eProsima_user_DllExport ArrayMultiDimensionLiteralsBoundedWString( const ArrayMultiDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; } @@ -12469,7 +12611,7 @@ class ArrayMultiDimensionLiteralsBoundedWString const ArrayMultiDimensionLiteralsBoundedWString& x) { - m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; + m_var_array_bounded_wstring = x.m_var_array_bounded_wstring; return *this; } @@ -12511,8 +12653,7 @@ class ArrayMultiDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be copied in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - const std::array, size_1* size_2>, - size_1 + 5>& _var_array_bounded_wstring) + const std::array, size_1*size_2>, size_1+5>& _var_array_bounded_wstring) { m_var_array_bounded_wstring = _var_array_bounded_wstring; } @@ -12522,8 +12663,7 @@ class ArrayMultiDimensionLiteralsBoundedWString * @param _var_array_bounded_wstring New value to be moved in member var_array_bounded_wstring */ eProsima_user_DllExport void var_array_bounded_wstring( - std::array, size_1* size_2>, - size_1 + 5>&& _var_array_bounded_wstring) + std::array, size_1*size_2>, size_1+5>&& _var_array_bounded_wstring) { m_var_array_bounded_wstring = std::move(_var_array_bounded_wstring); } @@ -12532,8 +12672,7 @@ class ArrayMultiDimensionLiteralsBoundedWString * @brief This function returns a constant reference to member var_array_bounded_wstring * @return Constant reference to member var_array_bounded_wstring */ - eProsima_user_DllExport const std::array, - size_1*size_2>, size_1 + 5>& var_array_bounded_wstring() const + eProsima_user_DllExport const std::array, size_1*size_2>, size_1+5>& var_array_bounded_wstring() const { return m_var_array_bounded_wstring; } @@ -12542,16 +12681,16 @@ class ArrayMultiDimensionLiteralsBoundedWString * @brief This function returns a reference to member var_array_bounded_wstring * @return Reference to member var_array_bounded_wstring */ - eProsima_user_DllExport std::array, size_1*size_2>, - size_1 + 5>& var_array_bounded_wstring() + eProsima_user_DllExport std::array, size_1*size_2>, size_1+5>& var_array_bounded_wstring() { return m_var_array_bounded_wstring; } + + private: - std::array, size_1* size_2>, - size_1 + 5> m_var_array_bounded_wstring; + std::array, size_1*size_2>, size_1+5> m_var_array_bounded_wstring; }; /*! @@ -12583,7 +12722,7 @@ class ArrayMultiDimensionLiteralsEnum eProsima_user_DllExport ArrayMultiDimensionLiteralsEnum( const ArrayMultiDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; } @@ -12605,7 +12744,7 @@ class ArrayMultiDimensionLiteralsEnum const ArrayMultiDimensionLiteralsEnum& x) { - m_var_array_enum = x.m_var_array_enum; + m_var_array_enum = x.m_var_array_enum; return *this; } @@ -12647,7 +12786,7 @@ class ArrayMultiDimensionLiteralsEnum * @param _var_array_enum New value to be copied in member var_array_enum */ eProsima_user_DllExport void var_array_enum( - const std::array, size_1>, 5 * 2>& _var_array_enum) + const std::array, size_1>, 5*2>& _var_array_enum) { m_var_array_enum = _var_array_enum; } @@ -12657,7 +12796,7 @@ class ArrayMultiDimensionLiteralsEnum * @param _var_array_enum New value to be moved in member var_array_enum */ eProsima_user_DllExport void var_array_enum( - std::array, size_1>, 5 * 2>&& _var_array_enum) + std::array, size_1>, 5*2>&& _var_array_enum) { m_var_array_enum = std::move(_var_array_enum); } @@ -12666,8 +12805,7 @@ class ArrayMultiDimensionLiteralsEnum * @brief This function returns a constant reference to member var_array_enum * @return Constant reference to member var_array_enum */ - eProsima_user_DllExport const std::array, size_1>, - 5 * 2>& var_array_enum() const + eProsima_user_DllExport const std::array, size_1>, 5*2>& var_array_enum() const { return m_var_array_enum; } @@ -12676,15 +12814,16 @@ class ArrayMultiDimensionLiteralsEnum * @brief This function returns a reference to member var_array_enum * @return Reference to member var_array_enum */ - eProsima_user_DllExport std::array, size_1>, 5 * 2>& var_array_enum() + eProsima_user_DllExport std::array, size_1>, 5*2>& var_array_enum() { return m_var_array_enum; } + + private: - std::array, size_1>, - 5 * 2> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; + std::array, size_1>, 5*2> m_var_array_enum{ {{ {{InnerEnumHelper::ENUM_VALUE_1}} }} }; }; /*! @@ -12716,7 +12855,7 @@ class ArrayMultiDimensionLiteralsBitMask eProsima_user_DllExport ArrayMultiDimensionLiteralsBitMask( const ArrayMultiDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; } @@ -12738,7 +12877,7 @@ class ArrayMultiDimensionLiteralsBitMask const ArrayMultiDimensionLiteralsBitMask& x) { - m_var_array_bitmask = x.m_var_array_bitmask; + m_var_array_bitmask = x.m_var_array_bitmask; return *this; } @@ -12780,8 +12919,7 @@ class ArrayMultiDimensionLiteralsBitMask * @param _var_array_bitmask New value to be copied in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - const std::array, size_1 + 5>, - size_1>& _var_array_bitmask) + const std::array, size_1+5>, size_1>& _var_array_bitmask) { m_var_array_bitmask = _var_array_bitmask; } @@ -12791,7 +12929,7 @@ class ArrayMultiDimensionLiteralsBitMask * @param _var_array_bitmask New value to be moved in member var_array_bitmask */ eProsima_user_DllExport void var_array_bitmask( - std::array, size_1 + 5>, size_1>&& _var_array_bitmask) + std::array, size_1+5>, size_1>&& _var_array_bitmask) { m_var_array_bitmask = std::move(_var_array_bitmask); } @@ -12800,8 +12938,7 @@ class ArrayMultiDimensionLiteralsBitMask * @brief This function returns a constant reference to member var_array_bitmask * @return Constant reference to member var_array_bitmask */ - eProsima_user_DllExport const std::array, size_1 + 5>, - size_1>& var_array_bitmask() const + eProsima_user_DllExport const std::array, size_1+5>, size_1>& var_array_bitmask() const { return m_var_array_bitmask; } @@ -12810,16 +12947,16 @@ class ArrayMultiDimensionLiteralsBitMask * @brief This function returns a reference to member var_array_bitmask * @return Reference to member var_array_bitmask */ - eProsima_user_DllExport std::array, size_1 + 5>, - size_1>& var_array_bitmask() + eProsima_user_DllExport std::array, size_1+5>, size_1>& var_array_bitmask() { return m_var_array_bitmask; } + + private: - std::array, size_1 + 5>, - size_1> m_var_array_bitmask{ {{ {{0}} }} }; + std::array, size_1+5>, size_1> m_var_array_bitmask{ {{ {{0}} }} }; }; /*! @@ -12851,7 +12988,7 @@ class ArrayMultiDimensionLiteralsAlias eProsima_user_DllExport ArrayMultiDimensionLiteralsAlias( const ArrayMultiDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; } @@ -12873,7 +13010,7 @@ class ArrayMultiDimensionLiteralsAlias const ArrayMultiDimensionLiteralsAlias& x) { - m_var_array_alias = x.m_var_array_alias; + m_var_array_alias = x.m_var_array_alias; return *this; } @@ -12915,8 +13052,7 @@ class ArrayMultiDimensionLiteralsAlias * @param _var_array_alias New value to be copied in member var_array_alias */ eProsima_user_DllExport void var_array_alias( - const std::array, 5 * 2>, - size_1*2>& _var_array_alias) + const std::array, 5*2>, size_1*2>& _var_array_alias) { m_var_array_alias = _var_array_alias; } @@ -12926,7 +13062,7 @@ class ArrayMultiDimensionLiteralsAlias * @param _var_array_alias New value to be moved in member var_array_alias */ eProsima_user_DllExport void var_array_alias( - std::array, 5 * 2>, size_1*2>&& _var_array_alias) + std::array, 5*2>, size_1*2>&& _var_array_alias) { m_var_array_alias = std::move(_var_array_alias); } @@ -12935,8 +13071,7 @@ class ArrayMultiDimensionLiteralsAlias * @brief This function returns a constant reference to member var_array_alias * @return Constant reference to member var_array_alias */ - eProsima_user_DllExport const std::array, 5 * 2>, - size_1*2>& var_array_alias() const + eProsima_user_DllExport const std::array, 5*2>, size_1*2>& var_array_alias() const { return m_var_array_alias; } @@ -12945,16 +13080,16 @@ class ArrayMultiDimensionLiteralsAlias * @brief This function returns a reference to member var_array_alias * @return Reference to member var_array_alias */ - eProsima_user_DllExport std::array, 5 * 2>, - size_1*2>& var_array_alias() + eProsima_user_DllExport std::array, 5*2>, size_1*2>& var_array_alias() { return m_var_array_alias; } + + private: - std::array, 5 * 2>, - size_1*2> m_var_array_alias{ {{ {{0}} }} }; + std::array, 5*2>, size_1*2> m_var_array_alias{ {{ {{0}} }} }; }; /*! @@ -12986,7 +13121,7 @@ class ArrayMultiDimensionLiteralsSequence eProsima_user_DllExport ArrayMultiDimensionLiteralsSequence( const ArrayMultiDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; } @@ -13008,7 +13143,7 @@ class ArrayMultiDimensionLiteralsSequence const ArrayMultiDimensionLiteralsSequence& x) { - m_var_array_sequence = x.m_var_array_sequence; + m_var_array_sequence = x.m_var_array_sequence; return *this; } @@ -13050,8 +13185,7 @@ class ArrayMultiDimensionLiteralsSequence * @param _var_array_sequence New value to be copied in member var_array_sequence */ eProsima_user_DllExport void var_array_sequence( - const std::array, 5 * 2>, size_1>, - size_1 + 5>& _var_array_sequence) + const std::array, 5*2>, size_1>, size_1+5>& _var_array_sequence) { m_var_array_sequence = _var_array_sequence; } @@ -13061,7 +13195,7 @@ class ArrayMultiDimensionLiteralsSequence * @param _var_array_sequence New value to be moved in member var_array_sequence */ eProsima_user_DllExport void var_array_sequence( - std::array, 5 * 2>, size_1>, size_1 + 5>&& _var_array_sequence) + std::array, 5*2>, size_1>, size_1+5>&& _var_array_sequence) { m_var_array_sequence = std::move(_var_array_sequence); } @@ -13070,8 +13204,7 @@ class ArrayMultiDimensionLiteralsSequence * @brief This function returns a constant reference to member var_array_sequence * @return Constant reference to member var_array_sequence */ - eProsima_user_DllExport const std::array, 5 * 2>, size_1>, - size_1 + 5>& var_array_sequence() const + eProsima_user_DllExport const std::array, 5*2>, size_1>, size_1+5>& var_array_sequence() const { return m_var_array_sequence; } @@ -13080,15 +13213,16 @@ class ArrayMultiDimensionLiteralsSequence * @brief This function returns a reference to member var_array_sequence * @return Reference to member var_array_sequence */ - eProsima_user_DllExport std::array, 5 * 2>, size_1>, - size_1 + 5>& var_array_sequence() + eProsima_user_DllExport std::array, 5*2>, size_1>, size_1+5>& var_array_sequence() { return m_var_array_sequence; } + + private: - std::array, 5 * 2>, size_1>, size_1 + 5> m_var_array_sequence; + std::array, 5*2>, size_1>, size_1+5> m_var_array_sequence; }; /*! @@ -13120,7 +13254,7 @@ class ArrayMultiDimensionLiteralsMap eProsima_user_DllExport ArrayMultiDimensionLiteralsMap( const ArrayMultiDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; } @@ -13142,7 +13276,7 @@ class ArrayMultiDimensionLiteralsMap const ArrayMultiDimensionLiteralsMap& x) { - m_var_array_map = x.m_var_array_map; + m_var_array_map = x.m_var_array_map; return *this; } @@ -13184,8 +13318,7 @@ class ArrayMultiDimensionLiteralsMap * @param _var_array_map New value to be copied in member var_array_map */ eProsima_user_DllExport void var_array_map( - const std::array, size_1>, size_1*2>, - size_1>& _var_array_map) + const std::array, size_1>, size_1*2>, size_1>& _var_array_map) { m_var_array_map = _var_array_map; } @@ -13204,8 +13337,7 @@ class ArrayMultiDimensionLiteralsMap * @brief This function returns a constant reference to member var_array_map * @return Constant reference to member var_array_map */ - eProsima_user_DllExport const std::array, size_1>, size_1*2>, - size_1>& var_array_map() const + eProsima_user_DllExport const std::array, size_1>, size_1*2>, size_1>& var_array_map() const { return m_var_array_map; } @@ -13214,12 +13346,13 @@ class ArrayMultiDimensionLiteralsMap * @brief This function returns a reference to member var_array_map * @return Reference to member var_array_map */ - eProsima_user_DllExport std::array, size_1>, size_1*2>, - size_1>& var_array_map() + eProsima_user_DllExport std::array, size_1>, size_1*2>, size_1>& var_array_map() { return m_var_array_map; } + + private: std::array, size_1>, size_1*2>, size_1> m_var_array_map; @@ -13254,7 +13387,7 @@ class ArrayMultiDimensionLiteralsUnion eProsima_user_DllExport ArrayMultiDimensionLiteralsUnion( const ArrayMultiDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; } @@ -13276,7 +13409,7 @@ class ArrayMultiDimensionLiteralsUnion const ArrayMultiDimensionLiteralsUnion& x) { - m_var_array_union = x.m_var_array_union; + m_var_array_union = x.m_var_array_union; return *this; } @@ -13318,8 +13451,7 @@ class ArrayMultiDimensionLiteralsUnion * @param _var_array_union New value to be copied in member var_array_union */ eProsima_user_DllExport void var_array_union( - const std::array, size_1 + 5>, - size_1* size_2>& _var_array_union) + const std::array, size_1+5>, size_1*size_2>& _var_array_union) { m_var_array_union = _var_array_union; } @@ -13329,8 +13461,7 @@ class ArrayMultiDimensionLiteralsUnion * @param _var_array_union New value to be moved in member var_array_union */ eProsima_user_DllExport void var_array_union( - std::array, size_1 + 5>, - size_1* size_2>&& _var_array_union) + std::array, size_1+5>, size_1*size_2>&& _var_array_union) { m_var_array_union = std::move(_var_array_union); } @@ -13339,8 +13470,7 @@ class ArrayMultiDimensionLiteralsUnion * @brief This function returns a constant reference to member var_array_union * @return Constant reference to member var_array_union */ - eProsima_user_DllExport const std::array, size_1 + 5>, - size_1*size_2>& var_array_union() const + eProsima_user_DllExport const std::array, size_1+5>, size_1*size_2>& var_array_union() const { return m_var_array_union; } @@ -13349,15 +13479,16 @@ class ArrayMultiDimensionLiteralsUnion * @brief This function returns a reference to member var_array_union * @return Reference to member var_array_union */ - eProsima_user_DllExport std::array, size_1 + 5>, - size_1*size_2>& var_array_union() + eProsima_user_DllExport std::array, size_1+5>, size_1*size_2>& var_array_union() { return m_var_array_union; } + + private: - std::array, size_1 + 5>, size_1* size_2> m_var_array_union; + std::array, size_1+5>, size_1*size_2> m_var_array_union; }; /*! @@ -13389,7 +13520,7 @@ class ArrayMultiDimensionLiteralsStructure eProsima_user_DllExport ArrayMultiDimensionLiteralsStructure( const ArrayMultiDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; } @@ -13411,7 +13542,7 @@ class ArrayMultiDimensionLiteralsStructure const ArrayMultiDimensionLiteralsStructure& x) { - m_var_array_structure = x.m_var_array_structure; + m_var_array_structure = x.m_var_array_structure; return *this; } @@ -13453,7 +13584,7 @@ class ArrayMultiDimensionLiteralsStructure * @param _var_array_structure New value to be copied in member var_array_structure */ eProsima_user_DllExport void var_array_structure( - const std::array, size_1>, 5>& _var_array_structure) + const std::array, size_1>, 5>& _var_array_structure) { m_var_array_structure = _var_array_structure; } @@ -13463,7 +13594,7 @@ class ArrayMultiDimensionLiteralsStructure * @param _var_array_structure New value to be moved in member var_array_structure */ eProsima_user_DllExport void var_array_structure( - std::array, size_1>, 5>&& _var_array_structure) + std::array, size_1>, 5>&& _var_array_structure) { m_var_array_structure = std::move(_var_array_structure); } @@ -13472,8 +13603,7 @@ class ArrayMultiDimensionLiteralsStructure * @brief This function returns a constant reference to member var_array_structure * @return Constant reference to member var_array_structure */ - eProsima_user_DllExport const std::array, size_1>, - 5>& var_array_structure() const + eProsima_user_DllExport const std::array, size_1>, 5>& var_array_structure() const { return m_var_array_structure; } @@ -13482,15 +13612,16 @@ class ArrayMultiDimensionLiteralsStructure * @brief This function returns a reference to member var_array_structure * @return Reference to member var_array_structure */ - eProsima_user_DllExport std::array, size_1>, - 5>& var_array_structure() + eProsima_user_DllExport std::array, size_1>, 5>& var_array_structure() { return m_var_array_structure; } + + private: - std::array, size_1>, 5> m_var_array_structure; + std::array, size_1>, 5> m_var_array_structure; }; /*! @@ -13522,7 +13653,7 @@ class ArrayMultiDimensionLiteralsBitSet eProsima_user_DllExport ArrayMultiDimensionLiteralsBitSet( const ArrayMultiDimensionLiteralsBitSet& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; } @@ -13544,7 +13675,7 @@ class ArrayMultiDimensionLiteralsBitSet const ArrayMultiDimensionLiteralsBitSet& x) { - m_var_array_bitset = x.m_var_array_bitset; + m_var_array_bitset = x.m_var_array_bitset; return *this; } @@ -13586,8 +13717,7 @@ class ArrayMultiDimensionLiteralsBitSet * @param _var_array_bitset New value to be copied in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - const std::array, size_1*2>, - size_1 + 5>& _var_array_bitset) + const std::array, size_1*2>, size_1+5>& _var_array_bitset) { m_var_array_bitset = _var_array_bitset; } @@ -13597,8 +13727,7 @@ class ArrayMultiDimensionLiteralsBitSet * @param _var_array_bitset New value to be moved in member var_array_bitset */ eProsima_user_DllExport void var_array_bitset( - std::array, size_1*2>, - size_1 + 5>&& _var_array_bitset) + std::array, size_1*2>, size_1+5>&& _var_array_bitset) { m_var_array_bitset = std::move(_var_array_bitset); } @@ -13607,8 +13736,7 @@ class ArrayMultiDimensionLiteralsBitSet * @brief This function returns a constant reference to member var_array_bitset * @return Constant reference to member var_array_bitset */ - eProsima_user_DllExport const std::array, size_1*2>, - size_1 + 5>& var_array_bitset() const + eProsima_user_DllExport const std::array, size_1*2>, size_1+5>& var_array_bitset() const { return m_var_array_bitset; } @@ -13617,15 +13745,16 @@ class ArrayMultiDimensionLiteralsBitSet * @brief This function returns a reference to member var_array_bitset * @return Reference to member var_array_bitset */ - eProsima_user_DllExport std::array, size_1*2>, - size_1 + 5>& var_array_bitset() + eProsima_user_DllExport std::array, size_1*2>, size_1+5>& var_array_bitset() { return m_var_array_bitset; } + + private: - std::array, size_1*2>, size_1 + 5> m_var_array_bitset; + std::array, size_1*2>, size_1+5> m_var_array_bitset; }; /*! @@ -13657,7 +13786,7 @@ class BoundedSmallArrays eProsima_user_DllExport BoundedSmallArrays( const BoundedSmallArrays& x) { - m_var_array_small = x.m_var_array_small; + m_var_array_small = x.m_var_array_small; } @@ -13679,7 +13808,7 @@ class BoundedSmallArrays const BoundedSmallArrays& x) { - m_var_array_small = x.m_var_array_small; + m_var_array_small = x.m_var_array_small; return *this; } @@ -13754,6 +13883,8 @@ class BoundedSmallArrays return m_var_array_small; } + + private: std::array m_var_array_small{0}; @@ -13788,7 +13919,7 @@ class BoundedBigArrays eProsima_user_DllExport BoundedBigArrays( const BoundedBigArrays& x) { - m_var_array_big = x.m_var_array_big; + m_var_array_big = x.m_var_array_big; } @@ -13810,7 +13941,7 @@ class BoundedBigArrays const BoundedBigArrays& x) { - m_var_array_big = x.m_var_array_big; + m_var_array_big = x.m_var_array_big; return *this; } @@ -13885,6 +14016,8 @@ class BoundedBigArrays return m_var_array_big; } + + private: std::array m_var_array_big{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp index 076f79cf..f4e895b1 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/bitsets.hpp @@ -56,17 +56,17 @@ */ struct InnerTypedBitsetHelper { - bool boolean_bitfield : 1; + bool boolean_bitfield : 1; - uint8_t byte_bitfield : 8; + uint8_t byte_bitfield : 8; - int8_t int8_bitfield : 8; + int8_t int8_bitfield : 8; - uint8_t uint8_bitfield : 8; + uint8_t uint8_bitfield : 8; - int16_t short_bitfield : 16; + int16_t short_bitfield : 16; - uint16_t ushort_bitfield : 16; + uint16_t ushort_bitfield : 16; /*! @@ -77,11 +77,11 @@ struct InnerTypedBitsetHelper const InnerTypedBitsetHelper& x) const { return (boolean_bitfield == x.boolean_bitfield && - byte_bitfield == x.byte_bitfield && - int8_bitfield == x.int8_bitfield && - uint8_bitfield == x.uint8_bitfield && - short_bitfield == x.short_bitfield && - ushort_bitfield == x.ushort_bitfield); + byte_bitfield == x.byte_bitfield && + int8_bitfield == x.int8_bitfield && + uint8_bitfield == x.uint8_bitfield && + short_bitfield == x.short_bitfield && + ushort_bitfield == x.ushort_bitfield); } /*! @@ -93,7 +93,6 @@ struct InnerTypedBitsetHelper { return !(*this == x); } - }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper2 defined by the user in the IDL file. @@ -101,9 +100,9 @@ struct InnerTypedBitsetHelper */ struct InnerTypedBitsetHelper2 { - int32_t long_bitfield : 32; + int32_t long_bitfield : 32; - uint32_t ulong_bitfield : 32; + uint32_t ulong_bitfield : 32; /*! @@ -114,7 +113,7 @@ struct InnerTypedBitsetHelper2 const InnerTypedBitsetHelper2& x) const { return (long_bitfield == x.long_bitfield && - ulong_bitfield == x.ulong_bitfield); + ulong_bitfield == x.ulong_bitfield); } /*! @@ -126,7 +125,6 @@ struct InnerTypedBitsetHelper2 { return !(*this == x); } - }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper3 defined by the user in the IDL file. @@ -134,7 +132,7 @@ struct InnerTypedBitsetHelper2 */ struct InnerTypedBitsetHelper3 { - int64_t long_long_bitfield : 64; + int64_t long_long_bitfield : 64; /*! @@ -156,7 +154,6 @@ struct InnerTypedBitsetHelper3 { return !(*this == x); } - }; /*! * @brief This structure represents the bitset InnerTypedBitsetHelper4 defined by the user in the IDL file. @@ -164,7 +161,7 @@ struct InnerTypedBitsetHelper3 */ struct InnerTypedBitsetHelper4 { - uint64_t ulong_long_bitfield : 64; + uint64_t ulong_long_bitfield : 64; /*! @@ -186,7 +183,6 @@ struct InnerTypedBitsetHelper4 { return !(*this == x); } - }; /*! * @brief This class represents the structure BitsetStruct defined by the user in the IDL file. @@ -217,15 +213,15 @@ class BitsetStruct eProsima_user_DllExport BitsetStruct( const BitsetStruct& x) { - m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; + m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; - m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; + m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; - m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; + m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; - m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; + m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; - m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; + m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; } @@ -251,15 +247,15 @@ class BitsetStruct const BitsetStruct& x) { - m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; + m_var_InnerBitsetHelper = x.m_var_InnerBitsetHelper; - m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; + m_var_InnerTypedBitsetHelper = x.m_var_InnerTypedBitsetHelper; - m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; + m_var_InnerTypedBitsetHelper2 = x.m_var_InnerTypedBitsetHelper2; - m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; + m_var_InnerTypedBitsetHelper3 = x.m_var_InnerTypedBitsetHelper3; - m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; + m_var_InnerTypedBitsetHelper4 = x.m_var_InnerTypedBitsetHelper4; return *this; } @@ -288,10 +284,10 @@ class BitsetStruct const BitsetStruct& x) const { return (m_var_InnerBitsetHelper == x.m_var_InnerBitsetHelper && - m_var_InnerTypedBitsetHelper == x.m_var_InnerTypedBitsetHelper && - m_var_InnerTypedBitsetHelper2 == x.m_var_InnerTypedBitsetHelper2 && - m_var_InnerTypedBitsetHelper3 == x.m_var_InnerTypedBitsetHelper3 && - m_var_InnerTypedBitsetHelper4 == x.m_var_InnerTypedBitsetHelper4); + m_var_InnerTypedBitsetHelper == x.m_var_InnerTypedBitsetHelper && + m_var_InnerTypedBitsetHelper2 == x.m_var_InnerTypedBitsetHelper2 && + m_var_InnerTypedBitsetHelper3 == x.m_var_InnerTypedBitsetHelper3 && + m_var_InnerTypedBitsetHelper4 == x.m_var_InnerTypedBitsetHelper4); } /*! @@ -342,6 +338,7 @@ class BitsetStruct return m_var_InnerBitsetHelper; } + /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper * @param _var_InnerTypedBitsetHelper New value to be copied in member var_InnerTypedBitsetHelper @@ -380,6 +377,7 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper; } + /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper2 * @param _var_InnerTypedBitsetHelper2 New value to be copied in member var_InnerTypedBitsetHelper2 @@ -418,6 +416,7 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper2; } + /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper3 * @param _var_InnerTypedBitsetHelper3 New value to be copied in member var_InnerTypedBitsetHelper3 @@ -456,6 +455,7 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper3; } + /*! * @brief This function copies the value in member var_InnerTypedBitsetHelper4 * @param _var_InnerTypedBitsetHelper4 New value to be copied in member var_InnerTypedBitsetHelper4 @@ -494,6 +494,8 @@ class BitsetStruct return m_var_InnerTypedBitsetHelper4; } + + private: InnerBitsetHelper m_var_InnerBitsetHelper{}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp index fdc992ca..a17a6504 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/constants.hpp @@ -111,13 +111,13 @@ class ModuleConstsLiteralsStruct eProsima_user_DllExport ModuleConstsLiteralsStruct( const ModuleConstsLiteralsStruct& x) { - m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; + m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; - m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; + m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; - m_var1 = x.m_var1; + m_var1 = x.m_var1; - m_var2 = x.m_var2; + m_var2 = x.m_var2; } @@ -129,8 +129,7 @@ class ModuleConstsLiteralsStruct ModuleConstsLiteralsStruct&& x) noexcept { m_module1_array_literal_const_moduled = std::move(x.m_module1_array_literal_const_moduled); - m_module1_array_literal_const_alias_const_moduled = - std::move(x.m_module1_array_literal_const_alias_const_moduled); + m_module1_array_literal_const_alias_const_moduled = std::move(x.m_module1_array_literal_const_alias_const_moduled); m_var1 = x.m_var1; m_var2 = x.m_var2; } @@ -143,13 +142,13 @@ class ModuleConstsLiteralsStruct const ModuleConstsLiteralsStruct& x) { - m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; + m_module1_array_literal_const_moduled = x.m_module1_array_literal_const_moduled; - m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; + m_module1_array_literal_const_alias_const_moduled = x.m_module1_array_literal_const_alias_const_moduled; - m_var1 = x.m_var1; + m_var1 = x.m_var1; - m_var2 = x.m_var2; + m_var2 = x.m_var2; return *this; } @@ -163,8 +162,7 @@ class ModuleConstsLiteralsStruct { m_module1_array_literal_const_moduled = std::move(x.m_module1_array_literal_const_moduled); - m_module1_array_literal_const_alias_const_moduled = - std::move(x.m_module1_array_literal_const_alias_const_moduled); + m_module1_array_literal_const_alias_const_moduled = std::move(x.m_module1_array_literal_const_alias_const_moduled); m_var1 = x.m_var1; m_var2 = x.m_var2; return *this; @@ -178,10 +176,9 @@ class ModuleConstsLiteralsStruct const ModuleConstsLiteralsStruct& x) const { return (m_module1_array_literal_const_moduled == x.m_module1_array_literal_const_moduled && - m_module1_array_literal_const_alias_const_moduled == - x.m_module1_array_literal_const_alias_const_moduled && - m_var1 == x.m_var1 && - m_var2 == x.m_var2); + m_module1_array_literal_const_alias_const_moduled == x.m_module1_array_literal_const_alias_const_moduled && + m_var1 == x.m_var1 && + m_var2 == x.m_var2); } /*! @@ -232,6 +229,7 @@ class ModuleConstsLiteralsStruct return m_module1_array_literal_const_moduled; } + /*! * @brief This function copies the value in member module1_array_literal_const_alias_const_moduled * @param _module1_array_literal_const_alias_const_moduled New value to be copied in member module1_array_literal_const_alias_const_moduled @@ -256,8 +254,7 @@ class ModuleConstsLiteralsStruct * @brief This function returns a constant reference to member module1_array_literal_const_alias_const_moduled * @return Constant reference to member module1_array_literal_const_alias_const_moduled */ - eProsima_user_DllExport const std::array& module1_array_literal_const_alias_const_moduled() const + eProsima_user_DllExport const std::array& module1_array_literal_const_alias_const_moduled() const { return m_module1_array_literal_const_alias_const_moduled; } @@ -271,6 +268,7 @@ class ModuleConstsLiteralsStruct return m_module1_array_literal_const_alias_const_moduled; } + /*! * @brief This function sets a value in member var1 * @param _var1 New value for member var1 @@ -299,6 +297,7 @@ class ModuleConstsLiteralsStruct return m_var1; } + /*! * @brief This function sets a value in member var2 * @param _var2 New value for member var2 @@ -327,6 +326,8 @@ class ModuleConstsLiteralsStruct return m_var2; } + + private: std::array m_module1_array_literal_const_moduled{0}; @@ -371,15 +372,15 @@ class Module2ConstsLiteralsStruct eProsima_user_DllExport Module2ConstsLiteralsStruct( const Module2ConstsLiteralsStruct& x) { - m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; + m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; - m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; + m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; - m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; + m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; - m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; + m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; - m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; + m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; } @@ -391,8 +392,7 @@ class Module2ConstsLiteralsStruct Module2ConstsLiteralsStruct&& x) noexcept { m_module2_array_literal_const_moduled = std::move(x.m_module2_array_literal_const_moduled); - m_module2_array_literal_const_alias_const_moduled = - std::move(x.m_module2_array_literal_const_alias_const_moduled); + m_module2_array_literal_const_alias_const_moduled = std::move(x.m_module2_array_literal_const_alias_const_moduled); m_module2_array_literal_const_scoped_moduled = std::move(x.m_module2_array_literal_const_scoped_moduled); m_module2_array_literal_module1_const_moduled = std::move(x.m_module2_array_literal_module1_const_moduled); m_module2_array_literal_const_moduled_module1 = std::move(x.m_module2_array_literal_const_moduled_module1); @@ -406,15 +406,15 @@ class Module2ConstsLiteralsStruct const Module2ConstsLiteralsStruct& x) { - m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; + m_module2_array_literal_const_moduled = x.m_module2_array_literal_const_moduled; - m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; + m_module2_array_literal_const_alias_const_moduled = x.m_module2_array_literal_const_alias_const_moduled; - m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; + m_module2_array_literal_const_scoped_moduled = x.m_module2_array_literal_const_scoped_moduled; - m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; + m_module2_array_literal_module1_const_moduled = x.m_module2_array_literal_module1_const_moduled; - m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; + m_module2_array_literal_const_moduled_module1 = x.m_module2_array_literal_const_moduled_module1; return *this; } @@ -428,8 +428,7 @@ class Module2ConstsLiteralsStruct { m_module2_array_literal_const_moduled = std::move(x.m_module2_array_literal_const_moduled); - m_module2_array_literal_const_alias_const_moduled = - std::move(x.m_module2_array_literal_const_alias_const_moduled); + m_module2_array_literal_const_alias_const_moduled = std::move(x.m_module2_array_literal_const_alias_const_moduled); m_module2_array_literal_const_scoped_moduled = std::move(x.m_module2_array_literal_const_scoped_moduled); m_module2_array_literal_module1_const_moduled = std::move(x.m_module2_array_literal_module1_const_moduled); m_module2_array_literal_const_moduled_module1 = std::move(x.m_module2_array_literal_const_moduled_module1); @@ -444,11 +443,10 @@ class Module2ConstsLiteralsStruct const Module2ConstsLiteralsStruct& x) const { return (m_module2_array_literal_const_moduled == x.m_module2_array_literal_const_moduled && - m_module2_array_literal_const_alias_const_moduled == - x.m_module2_array_literal_const_alias_const_moduled && - m_module2_array_literal_const_scoped_moduled == x.m_module2_array_literal_const_scoped_moduled && - m_module2_array_literal_module1_const_moduled == x.m_module2_array_literal_module1_const_moduled && - m_module2_array_literal_const_moduled_module1 == x.m_module2_array_literal_const_moduled_module1); + m_module2_array_literal_const_alias_const_moduled == x.m_module2_array_literal_const_alias_const_moduled && + m_module2_array_literal_const_scoped_moduled == x.m_module2_array_literal_const_scoped_moduled && + m_module2_array_literal_module1_const_moduled == x.m_module2_array_literal_module1_const_moduled && + m_module2_array_literal_const_moduled_module1 == x.m_module2_array_literal_const_moduled_module1); } /*! @@ -499,6 +497,7 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_moduled; } + /*! * @brief This function copies the value in member module2_array_literal_const_alias_const_moduled * @param _module2_array_literal_const_alias_const_moduled New value to be copied in member module2_array_literal_const_alias_const_moduled @@ -523,8 +522,7 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_alias_const_moduled * @return Constant reference to member module2_array_literal_const_alias_const_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_const_alias_const_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_const_alias_const_moduled() const { return m_module2_array_literal_const_alias_const_moduled; } @@ -538,6 +536,7 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_alias_const_moduled; } + /*! * @brief This function copies the value in member module2_array_literal_const_scoped_moduled * @param _module2_array_literal_const_scoped_moduled New value to be copied in member module2_array_literal_const_scoped_moduled @@ -562,8 +561,7 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_scoped_moduled * @return Constant reference to member module2_array_literal_const_scoped_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_const_scoped_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_const_scoped_moduled() const { return m_module2_array_literal_const_scoped_moduled; } @@ -572,12 +570,12 @@ class Module2ConstsLiteralsStruct * @brief This function returns a reference to member module2_array_literal_const_scoped_moduled * @return Reference to member module2_array_literal_const_scoped_moduled */ - eProsima_user_DllExport std::array& module2_array_literal_const_scoped_moduled() + eProsima_user_DllExport std::array& module2_array_literal_const_scoped_moduled() { return m_module2_array_literal_const_scoped_moduled; } + /*! * @brief This function copies the value in member module2_array_literal_module1_const_moduled * @param _module2_array_literal_module1_const_moduled New value to be copied in member module2_array_literal_module1_const_moduled @@ -602,8 +600,7 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_module1_const_moduled * @return Constant reference to member module2_array_literal_module1_const_moduled */ - eProsima_user_DllExport const std::array& module2_array_literal_module1_const_moduled() const + eProsima_user_DllExport const std::array& module2_array_literal_module1_const_moduled() const { return m_module2_array_literal_module1_const_moduled; } @@ -612,12 +609,12 @@ class Module2ConstsLiteralsStruct * @brief This function returns a reference to member module2_array_literal_module1_const_moduled * @return Reference to member module2_array_literal_module1_const_moduled */ - eProsima_user_DllExport std::array& module2_array_literal_module1_const_moduled() + eProsima_user_DllExport std::array& module2_array_literal_module1_const_moduled() { return m_module2_array_literal_module1_const_moduled; } + /*! * @brief This function copies the value in member module2_array_literal_const_moduled_module1 * @param _module2_array_literal_const_moduled_module1 New value to be copied in member module2_array_literal_const_moduled_module1 @@ -642,8 +639,7 @@ class Module2ConstsLiteralsStruct * @brief This function returns a constant reference to member module2_array_literal_const_moduled_module1 * @return Constant reference to member module2_array_literal_const_moduled_module1 */ - eProsima_user_DllExport const std::array& module2_array_literal_const_moduled_module1() const + eProsima_user_DllExport const std::array& module2_array_literal_const_moduled_module1() const { return m_module2_array_literal_const_moduled_module1; } @@ -657,6 +653,8 @@ class Module2ConstsLiteralsStruct return m_module2_array_literal_const_moduled_module1; } + + private: std::array m_module2_array_literal_const_moduled{0}; @@ -697,61 +695,61 @@ class ConstsLiteralsStruct eProsima_user_DllExport ConstsLiteralsStruct( const ConstsLiteralsStruct& x) { - m_array_literal_const_short = x.m_array_literal_const_short; + m_array_literal_const_short = x.m_array_literal_const_short; - m_array_literal_const_ushort = x.m_array_literal_const_ushort; + m_array_literal_const_ushort = x.m_array_literal_const_ushort; - m_array_literal_const_long = x.m_array_literal_const_long; + m_array_literal_const_long = x.m_array_literal_const_long; - m_array_literal_const_ulong = x.m_array_literal_const_ulong; + m_array_literal_const_ulong = x.m_array_literal_const_ulong; - m_array_literal_const_longlong = x.m_array_literal_const_longlong; + m_array_literal_const_longlong = x.m_array_literal_const_longlong; - m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; + m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; - m_array_literal_const_int8 = x.m_array_literal_const_int8; + m_array_literal_const_int8 = x.m_array_literal_const_int8; - m_array_literal_const_uint8 = x.m_array_literal_const_uint8; + m_array_literal_const_uint8 = x.m_array_literal_const_uint8; - m_array_literal_const_int16 = x.m_array_literal_const_int16; + m_array_literal_const_int16 = x.m_array_literal_const_int16; - m_array_literal_const_uint16 = x.m_array_literal_const_uint16; + m_array_literal_const_uint16 = x.m_array_literal_const_uint16; - m_array_literal_const_int32 = x.m_array_literal_const_int32; + m_array_literal_const_int32 = x.m_array_literal_const_int32; - m_array_literal_const_uint32 = x.m_array_literal_const_uint32; + m_array_literal_const_uint32 = x.m_array_literal_const_uint32; - m_array_literal_const_int64 = x.m_array_literal_const_int64; + m_array_literal_const_int64 = x.m_array_literal_const_int64; - m_array_literal_const_uint64 = x.m_array_literal_const_uint64; + m_array_literal_const_uint64 = x.m_array_literal_const_uint64; - m_array_literals_operations1_const = x.m_array_literals_operations1_const; + m_array_literals_operations1_const = x.m_array_literals_operations1_const; - m_array_literals_operations2_const = x.m_array_literals_operations2_const; + m_array_literals_operations2_const = x.m_array_literals_operations2_const; - m_array_literals_operations3_const = x.m_array_literals_operations3_const; + m_array_literals_operations3_const = x.m_array_literals_operations3_const; - m_array_literals_operations4_const = x.m_array_literals_operations4_const; + m_array_literals_operations4_const = x.m_array_literals_operations4_const; - m_array_literals_operations5_const = x.m_array_literals_operations5_const; + m_array_literals_operations5_const = x.m_array_literals_operations5_const; - m_array_literals_operations6_const = x.m_array_literals_operations6_const; + m_array_literals_operations6_const = x.m_array_literals_operations6_const; - m_array_literals_operations7_const = x.m_array_literals_operations7_const; + m_array_literals_operations7_const = x.m_array_literals_operations7_const; - m_array_literals_operations8_const = x.m_array_literals_operations8_const; + m_array_literals_operations8_const = x.m_array_literals_operations8_const; - m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; + m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; - m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; + m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; - m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; + m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; - m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; + m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; - m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; + m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; - m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; + m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; } @@ -800,61 +798,61 @@ class ConstsLiteralsStruct const ConstsLiteralsStruct& x) { - m_array_literal_const_short = x.m_array_literal_const_short; + m_array_literal_const_short = x.m_array_literal_const_short; - m_array_literal_const_ushort = x.m_array_literal_const_ushort; + m_array_literal_const_ushort = x.m_array_literal_const_ushort; - m_array_literal_const_long = x.m_array_literal_const_long; + m_array_literal_const_long = x.m_array_literal_const_long; - m_array_literal_const_ulong = x.m_array_literal_const_ulong; + m_array_literal_const_ulong = x.m_array_literal_const_ulong; - m_array_literal_const_longlong = x.m_array_literal_const_longlong; + m_array_literal_const_longlong = x.m_array_literal_const_longlong; - m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; + m_array_literal_const_ulonglong = x.m_array_literal_const_ulonglong; - m_array_literal_const_int8 = x.m_array_literal_const_int8; + m_array_literal_const_int8 = x.m_array_literal_const_int8; - m_array_literal_const_uint8 = x.m_array_literal_const_uint8; + m_array_literal_const_uint8 = x.m_array_literal_const_uint8; - m_array_literal_const_int16 = x.m_array_literal_const_int16; + m_array_literal_const_int16 = x.m_array_literal_const_int16; - m_array_literal_const_uint16 = x.m_array_literal_const_uint16; + m_array_literal_const_uint16 = x.m_array_literal_const_uint16; - m_array_literal_const_int32 = x.m_array_literal_const_int32; + m_array_literal_const_int32 = x.m_array_literal_const_int32; - m_array_literal_const_uint32 = x.m_array_literal_const_uint32; + m_array_literal_const_uint32 = x.m_array_literal_const_uint32; - m_array_literal_const_int64 = x.m_array_literal_const_int64; + m_array_literal_const_int64 = x.m_array_literal_const_int64; - m_array_literal_const_uint64 = x.m_array_literal_const_uint64; + m_array_literal_const_uint64 = x.m_array_literal_const_uint64; - m_array_literals_operations1_const = x.m_array_literals_operations1_const; + m_array_literals_operations1_const = x.m_array_literals_operations1_const; - m_array_literals_operations2_const = x.m_array_literals_operations2_const; + m_array_literals_operations2_const = x.m_array_literals_operations2_const; - m_array_literals_operations3_const = x.m_array_literals_operations3_const; + m_array_literals_operations3_const = x.m_array_literals_operations3_const; - m_array_literals_operations4_const = x.m_array_literals_operations4_const; + m_array_literals_operations4_const = x.m_array_literals_operations4_const; - m_array_literals_operations5_const = x.m_array_literals_operations5_const; + m_array_literals_operations5_const = x.m_array_literals_operations5_const; - m_array_literals_operations6_const = x.m_array_literals_operations6_const; + m_array_literals_operations6_const = x.m_array_literals_operations6_const; - m_array_literals_operations7_const = x.m_array_literals_operations7_const; + m_array_literals_operations7_const = x.m_array_literals_operations7_const; - m_array_literals_operations8_const = x.m_array_literals_operations8_const; + m_array_literals_operations8_const = x.m_array_literals_operations8_const; - m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; + m_array_literal_const_inner_const_helper = x.m_array_literal_const_inner_const_helper; - m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; + m_array_moduled1_literal_const = x.m_array_moduled1_literal_const; - m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; + m_array_moduled2_literal_const = x.m_array_moduled2_literal_const; - m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; + m_array_literal_const_alias_const = x.m_array_literal_const_alias_const; - m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; + m_array_moduled1_literal_alias_const_moduled = x.m_array_moduled1_literal_alias_const_moduled; - m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; + m_array_moduled2_literal_alias_const_moduled = x.m_array_moduled2_literal_alias_const_moduled; return *this; } @@ -906,33 +904,33 @@ class ConstsLiteralsStruct const ConstsLiteralsStruct& x) const { return (m_array_literal_const_short == x.m_array_literal_const_short && - m_array_literal_const_ushort == x.m_array_literal_const_ushort && - m_array_literal_const_long == x.m_array_literal_const_long && - m_array_literal_const_ulong == x.m_array_literal_const_ulong && - m_array_literal_const_longlong == x.m_array_literal_const_longlong && - m_array_literal_const_ulonglong == x.m_array_literal_const_ulonglong && - m_array_literal_const_int8 == x.m_array_literal_const_int8 && - m_array_literal_const_uint8 == x.m_array_literal_const_uint8 && - m_array_literal_const_int16 == x.m_array_literal_const_int16 && - m_array_literal_const_uint16 == x.m_array_literal_const_uint16 && - m_array_literal_const_int32 == x.m_array_literal_const_int32 && - m_array_literal_const_uint32 == x.m_array_literal_const_uint32 && - m_array_literal_const_int64 == x.m_array_literal_const_int64 && - m_array_literal_const_uint64 == x.m_array_literal_const_uint64 && - m_array_literals_operations1_const == x.m_array_literals_operations1_const && - m_array_literals_operations2_const == x.m_array_literals_operations2_const && - m_array_literals_operations3_const == x.m_array_literals_operations3_const && - m_array_literals_operations4_const == x.m_array_literals_operations4_const && - m_array_literals_operations5_const == x.m_array_literals_operations5_const && - m_array_literals_operations6_const == x.m_array_literals_operations6_const && - m_array_literals_operations7_const == x.m_array_literals_operations7_const && - m_array_literals_operations8_const == x.m_array_literals_operations8_const && - m_array_literal_const_inner_const_helper == x.m_array_literal_const_inner_const_helper && - m_array_moduled1_literal_const == x.m_array_moduled1_literal_const && - m_array_moduled2_literal_const == x.m_array_moduled2_literal_const && - m_array_literal_const_alias_const == x.m_array_literal_const_alias_const && - m_array_moduled1_literal_alias_const_moduled == x.m_array_moduled1_literal_alias_const_moduled && - m_array_moduled2_literal_alias_const_moduled == x.m_array_moduled2_literal_alias_const_moduled); + m_array_literal_const_ushort == x.m_array_literal_const_ushort && + m_array_literal_const_long == x.m_array_literal_const_long && + m_array_literal_const_ulong == x.m_array_literal_const_ulong && + m_array_literal_const_longlong == x.m_array_literal_const_longlong && + m_array_literal_const_ulonglong == x.m_array_literal_const_ulonglong && + m_array_literal_const_int8 == x.m_array_literal_const_int8 && + m_array_literal_const_uint8 == x.m_array_literal_const_uint8 && + m_array_literal_const_int16 == x.m_array_literal_const_int16 && + m_array_literal_const_uint16 == x.m_array_literal_const_uint16 && + m_array_literal_const_int32 == x.m_array_literal_const_int32 && + m_array_literal_const_uint32 == x.m_array_literal_const_uint32 && + m_array_literal_const_int64 == x.m_array_literal_const_int64 && + m_array_literal_const_uint64 == x.m_array_literal_const_uint64 && + m_array_literals_operations1_const == x.m_array_literals_operations1_const && + m_array_literals_operations2_const == x.m_array_literals_operations2_const && + m_array_literals_operations3_const == x.m_array_literals_operations3_const && + m_array_literals_operations4_const == x.m_array_literals_operations4_const && + m_array_literals_operations5_const == x.m_array_literals_operations5_const && + m_array_literals_operations6_const == x.m_array_literals_operations6_const && + m_array_literals_operations7_const == x.m_array_literals_operations7_const && + m_array_literals_operations8_const == x.m_array_literals_operations8_const && + m_array_literal_const_inner_const_helper == x.m_array_literal_const_inner_const_helper && + m_array_moduled1_literal_const == x.m_array_moduled1_literal_const && + m_array_moduled2_literal_const == x.m_array_moduled2_literal_const && + m_array_literal_const_alias_const == x.m_array_literal_const_alias_const && + m_array_moduled1_literal_alias_const_moduled == x.m_array_moduled1_literal_alias_const_moduled && + m_array_moduled2_literal_alias_const_moduled == x.m_array_moduled2_literal_alias_const_moduled); } /*! @@ -983,6 +981,7 @@ class ConstsLiteralsStruct return m_array_literal_const_short; } + /*! * @brief This function copies the value in member array_literal_const_ushort * @param _array_literal_const_ushort New value to be copied in member array_literal_const_ushort @@ -1021,6 +1020,7 @@ class ConstsLiteralsStruct return m_array_literal_const_ushort; } + /*! * @brief This function copies the value in member array_literal_const_long * @param _array_literal_const_long New value to be copied in member array_literal_const_long @@ -1059,6 +1059,7 @@ class ConstsLiteralsStruct return m_array_literal_const_long; } + /*! * @brief This function copies the value in member array_literal_const_ulong * @param _array_literal_const_ulong New value to be copied in member array_literal_const_ulong @@ -1097,6 +1098,7 @@ class ConstsLiteralsStruct return m_array_literal_const_ulong; } + /*! * @brief This function copies the value in member array_literal_const_longlong * @param _array_literal_const_longlong New value to be copied in member array_literal_const_longlong @@ -1135,6 +1137,7 @@ class ConstsLiteralsStruct return m_array_literal_const_longlong; } + /*! * @brief This function copies the value in member array_literal_const_ulonglong * @param _array_literal_const_ulonglong New value to be copied in member array_literal_const_ulonglong @@ -1173,6 +1176,7 @@ class ConstsLiteralsStruct return m_array_literal_const_ulonglong; } + /*! * @brief This function copies the value in member array_literal_const_int8 * @param _array_literal_const_int8 New value to be copied in member array_literal_const_int8 @@ -1211,6 +1215,7 @@ class ConstsLiteralsStruct return m_array_literal_const_int8; } + /*! * @brief This function copies the value in member array_literal_const_uint8 * @param _array_literal_const_uint8 New value to be copied in member array_literal_const_uint8 @@ -1249,6 +1254,7 @@ class ConstsLiteralsStruct return m_array_literal_const_uint8; } + /*! * @brief This function copies the value in member array_literal_const_int16 * @param _array_literal_const_int16 New value to be copied in member array_literal_const_int16 @@ -1287,6 +1293,7 @@ class ConstsLiteralsStruct return m_array_literal_const_int16; } + /*! * @brief This function copies the value in member array_literal_const_uint16 * @param _array_literal_const_uint16 New value to be copied in member array_literal_const_uint16 @@ -1325,6 +1332,7 @@ class ConstsLiteralsStruct return m_array_literal_const_uint16; } + /*! * @brief This function copies the value in member array_literal_const_int32 * @param _array_literal_const_int32 New value to be copied in member array_literal_const_int32 @@ -1363,6 +1371,7 @@ class ConstsLiteralsStruct return m_array_literal_const_int32; } + /*! * @brief This function copies the value in member array_literal_const_uint32 * @param _array_literal_const_uint32 New value to be copied in member array_literal_const_uint32 @@ -1401,6 +1410,7 @@ class ConstsLiteralsStruct return m_array_literal_const_uint32; } + /*! * @brief This function copies the value in member array_literal_const_int64 * @param _array_literal_const_int64 New value to be copied in member array_literal_const_int64 @@ -1439,6 +1449,7 @@ class ConstsLiteralsStruct return m_array_literal_const_int64; } + /*! * @brief This function copies the value in member array_literal_const_uint64 * @param _array_literal_const_uint64 New value to be copied in member array_literal_const_uint64 @@ -1477,12 +1488,13 @@ class ConstsLiteralsStruct return m_array_literal_const_uint64; } + /*! * @brief This function copies the value in member array_literals_operations1_const * @param _array_literals_operations1_const New value to be copied in member array_literals_operations1_const */ eProsima_user_DllExport void array_literals_operations1_const( - const std::array& _array_literals_operations1_const) + const std::array& _array_literals_operations1_const) { m_array_literals_operations1_const = _array_literals_operations1_const; } @@ -1492,7 +1504,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations1_const New value to be moved in member array_literals_operations1_const */ eProsima_user_DllExport void array_literals_operations1_const( - std::array&& _array_literals_operations1_const) + std::array&& _array_literals_operations1_const) { m_array_literals_operations1_const = std::move(_array_literals_operations1_const); } @@ -1501,8 +1513,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations1_const * @return Constant reference to member array_literals_operations1_const */ - eProsima_user_DllExport const std::array& array_literals_operations1_const() const + eProsima_user_DllExport const std::array& array_literals_operations1_const() const { return m_array_literals_operations1_const; } @@ -1511,17 +1522,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations1_const * @return Reference to member array_literals_operations1_const */ - eProsima_user_DllExport std::array& array_literals_operations1_const() + eProsima_user_DllExport std::array& array_literals_operations1_const() { return m_array_literals_operations1_const; } + /*! * @brief This function copies the value in member array_literals_operations2_const * @param _array_literals_operations2_const New value to be copied in member array_literals_operations2_const */ eProsima_user_DllExport void array_literals_operations2_const( - const std::array& _array_literals_operations2_const) + const std::array& _array_literals_operations2_const) { m_array_literals_operations2_const = _array_literals_operations2_const; } @@ -1531,7 +1543,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations2_const New value to be moved in member array_literals_operations2_const */ eProsima_user_DllExport void array_literals_operations2_const( - std::array&& _array_literals_operations2_const) + std::array&& _array_literals_operations2_const) { m_array_literals_operations2_const = std::move(_array_literals_operations2_const); } @@ -1540,8 +1552,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations2_const * @return Constant reference to member array_literals_operations2_const */ - eProsima_user_DllExport const std::array& array_literals_operations2_const() const + eProsima_user_DllExport const std::array& array_literals_operations2_const() const { return m_array_literals_operations2_const; } @@ -1550,17 +1561,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations2_const * @return Reference to member array_literals_operations2_const */ - eProsima_user_DllExport std::array& array_literals_operations2_const() + eProsima_user_DllExport std::array& array_literals_operations2_const() { return m_array_literals_operations2_const; } + /*! * @brief This function copies the value in member array_literals_operations3_const * @param _array_literals_operations3_const New value to be copied in member array_literals_operations3_const */ eProsima_user_DllExport void array_literals_operations3_const( - const std::array& _array_literals_operations3_const) + const std::array& _array_literals_operations3_const) { m_array_literals_operations3_const = _array_literals_operations3_const; } @@ -1570,7 +1582,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations3_const New value to be moved in member array_literals_operations3_const */ eProsima_user_DllExport void array_literals_operations3_const( - std::array&& _array_literals_operations3_const) + std::array&& _array_literals_operations3_const) { m_array_literals_operations3_const = std::move(_array_literals_operations3_const); } @@ -1579,8 +1591,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations3_const * @return Constant reference to member array_literals_operations3_const */ - eProsima_user_DllExport const std::array& array_literals_operations3_const() const + eProsima_user_DllExport const std::array& array_literals_operations3_const() const { return m_array_literals_operations3_const; } @@ -1589,19 +1600,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations3_const * @return Reference to member array_literals_operations3_const */ - eProsima_user_DllExport std::array& array_literals_operations3_const() + eProsima_user_DllExport std::array& array_literals_operations3_const() { return m_array_literals_operations3_const; } + /*! * @brief This function copies the value in member array_literals_operations4_const * @param _array_literals_operations4_const New value to be copied in member array_literals_operations4_const */ eProsima_user_DllExport void array_literals_operations4_const( - const std::array& _array_literals_operations4_const) + const std::array& _array_literals_operations4_const) { m_array_literals_operations4_const = _array_literals_operations4_const; } @@ -1611,8 +1621,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations4_const New value to be moved in member array_literals_operations4_const */ eProsima_user_DllExport void array_literals_operations4_const( - std::array&& _array_literals_operations4_const) + std::array&& _array_literals_operations4_const) { m_array_literals_operations4_const = std::move(_array_literals_operations4_const); } @@ -1621,8 +1630,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations4_const * @return Constant reference to member array_literals_operations4_const */ - eProsima_user_DllExport const std::array& array_literals_operations4_const() const + eProsima_user_DllExport const std::array& array_literals_operations4_const() const { return m_array_literals_operations4_const; } @@ -1631,18 +1639,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations4_const * @return Reference to member array_literals_operations4_const */ - eProsima_user_DllExport std::array& array_literals_operations4_const() + eProsima_user_DllExport std::array& array_literals_operations4_const() { return m_array_literals_operations4_const; } + /*! * @brief This function copies the value in member array_literals_operations5_const * @param _array_literals_operations5_const New value to be copied in member array_literals_operations5_const */ eProsima_user_DllExport void array_literals_operations5_const( - const std::array& _array_literals_operations5_const) + const std::array& _array_literals_operations5_const) { m_array_literals_operations5_const = _array_literals_operations5_const; } @@ -1652,7 +1660,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations5_const New value to be moved in member array_literals_operations5_const */ eProsima_user_DllExport void array_literals_operations5_const( - std::array&& _array_literals_operations5_const) + std::array&& _array_literals_operations5_const) { m_array_literals_operations5_const = std::move(_array_literals_operations5_const); } @@ -1675,12 +1683,13 @@ class ConstsLiteralsStruct return m_array_literals_operations5_const; } + /*! * @brief This function copies the value in member array_literals_operations6_const * @param _array_literals_operations6_const New value to be copied in member array_literals_operations6_const */ eProsima_user_DllExport void array_literals_operations6_const( - const std::array& _array_literals_operations6_const) + const std::array& _array_literals_operations6_const) { m_array_literals_operations6_const = _array_literals_operations6_const; } @@ -1690,7 +1699,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations6_const New value to be moved in member array_literals_operations6_const */ eProsima_user_DllExport void array_literals_operations6_const( - std::array&& _array_literals_operations6_const) + std::array&& _array_literals_operations6_const) { m_array_literals_operations6_const = std::move(_array_literals_operations6_const); } @@ -1699,8 +1708,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations6_const * @return Constant reference to member array_literals_operations6_const */ - eProsima_user_DllExport const std::array& array_literals_operations6_const() const + eProsima_user_DllExport const std::array& array_literals_operations6_const() const { return m_array_literals_operations6_const; } @@ -1709,17 +1717,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations6_const * @return Reference to member array_literals_operations6_const */ - eProsima_user_DllExport std::array& array_literals_operations6_const() + eProsima_user_DllExport std::array& array_literals_operations6_const() { return m_array_literals_operations6_const; } + /*! * @brief This function copies the value in member array_literals_operations7_const * @param _array_literals_operations7_const New value to be copied in member array_literals_operations7_const */ eProsima_user_DllExport void array_literals_operations7_const( - const std::array& _array_literals_operations7_const) + const std::array& _array_literals_operations7_const) { m_array_literals_operations7_const = _array_literals_operations7_const; } @@ -1729,7 +1738,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations7_const New value to be moved in member array_literals_operations7_const */ eProsima_user_DllExport void array_literals_operations7_const( - std::array&& _array_literals_operations7_const) + std::array&& _array_literals_operations7_const) { m_array_literals_operations7_const = std::move(_array_literals_operations7_const); } @@ -1738,8 +1747,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations7_const * @return Constant reference to member array_literals_operations7_const */ - eProsima_user_DllExport const std::array& array_literals_operations7_const() const + eProsima_user_DllExport const std::array& array_literals_operations7_const() const { return m_array_literals_operations7_const; } @@ -1748,19 +1756,18 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations7_const * @return Reference to member array_literals_operations7_const */ - eProsima_user_DllExport std::array& array_literals_operations7_const() + eProsima_user_DllExport std::array& array_literals_operations7_const() { return m_array_literals_operations7_const; } + /*! * @brief This function copies the value in member array_literals_operations8_const * @param _array_literals_operations8_const New value to be copied in member array_literals_operations8_const */ eProsima_user_DllExport void array_literals_operations8_const( - const std::array& _array_literals_operations8_const) + const std::array& _array_literals_operations8_const) { m_array_literals_operations8_const = _array_literals_operations8_const; } @@ -1770,8 +1777,7 @@ class ConstsLiteralsStruct * @param _array_literals_operations8_const New value to be moved in member array_literals_operations8_const */ eProsima_user_DllExport void array_literals_operations8_const( - std::array&& _array_literals_operations8_const) + std::array&& _array_literals_operations8_const) { m_array_literals_operations8_const = std::move(_array_literals_operations8_const); } @@ -1780,8 +1786,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literals_operations8_const * @return Constant reference to member array_literals_operations8_const */ - eProsima_user_DllExport const std::array& array_literals_operations8_const() const + eProsima_user_DllExport const std::array& array_literals_operations8_const() const { return m_array_literals_operations8_const; } @@ -1790,12 +1795,12 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_literals_operations8_const * @return Reference to member array_literals_operations8_const */ - eProsima_user_DllExport std::array& array_literals_operations8_const() + eProsima_user_DllExport std::array& array_literals_operations8_const() { return m_array_literals_operations8_const; } + /*! * @brief This function copies the value in member array_literal_const_inner_const_helper * @param _array_literal_const_inner_const_helper New value to be copied in member array_literal_const_inner_const_helper @@ -1820,8 +1825,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_literal_const_inner_const_helper * @return Constant reference to member array_literal_const_inner_const_helper */ - eProsima_user_DllExport const std::array& array_literal_const_inner_const_helper() const + eProsima_user_DllExport const std::array& array_literal_const_inner_const_helper() const { return m_array_literal_const_inner_const_helper; } @@ -1835,6 +1839,7 @@ class ConstsLiteralsStruct return m_array_literal_const_inner_const_helper; } + /*! * @brief This function copies the value in member array_moduled1_literal_const * @param _array_moduled1_literal_const New value to be copied in member array_moduled1_literal_const @@ -1859,8 +1864,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled1_literal_const * @return Constant reference to member array_moduled1_literal_const */ - eProsima_user_DllExport const std::array& array_moduled1_literal_const() const + eProsima_user_DllExport const std::array& array_moduled1_literal_const() const { return m_array_moduled1_literal_const; } @@ -1874,6 +1878,7 @@ class ConstsLiteralsStruct return m_array_moduled1_literal_const; } + /*! * @brief This function copies the value in member array_moduled2_literal_const * @param _array_moduled2_literal_const New value to be copied in member array_moduled2_literal_const @@ -1898,8 +1903,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled2_literal_const * @return Constant reference to member array_moduled2_literal_const */ - eProsima_user_DllExport const std::array& array_moduled2_literal_const() const + eProsima_user_DllExport const std::array& array_moduled2_literal_const() const { return m_array_moduled2_literal_const; } @@ -1913,6 +1917,7 @@ class ConstsLiteralsStruct return m_array_moduled2_literal_const; } + /*! * @brief This function copies the value in member array_literal_const_alias_const * @param _array_literal_const_alias_const New value to be copied in member array_literal_const_alias_const @@ -1951,6 +1956,7 @@ class ConstsLiteralsStruct return m_array_literal_const_alias_const; } + /*! * @brief This function copies the value in member array_moduled1_literal_alias_const_moduled * @param _array_moduled1_literal_alias_const_moduled New value to be copied in member array_moduled1_literal_alias_const_moduled @@ -1975,8 +1981,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled1_literal_alias_const_moduled * @return Constant reference to member array_moduled1_literal_alias_const_moduled */ - eProsima_user_DllExport const std::array& array_moduled1_literal_alias_const_moduled() const + eProsima_user_DllExport const std::array& array_moduled1_literal_alias_const_moduled() const { return m_array_moduled1_literal_alias_const_moduled; } @@ -1985,12 +1990,12 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_moduled1_literal_alias_const_moduled * @return Reference to member array_moduled1_literal_alias_const_moduled */ - eProsima_user_DllExport std::array& array_moduled1_literal_alias_const_moduled() + eProsima_user_DllExport std::array& array_moduled1_literal_alias_const_moduled() { return m_array_moduled1_literal_alias_const_moduled; } + /*! * @brief This function copies the value in member array_moduled2_literal_alias_const_moduled * @param _array_moduled2_literal_alias_const_moduled New value to be copied in member array_moduled2_literal_alias_const_moduled @@ -2015,8 +2020,7 @@ class ConstsLiteralsStruct * @brief This function returns a constant reference to member array_moduled2_literal_alias_const_moduled * @return Constant reference to member array_moduled2_literal_alias_const_moduled */ - eProsima_user_DllExport const std::array& array_moduled2_literal_alias_const_moduled() const + eProsima_user_DllExport const std::array& array_moduled2_literal_alias_const_moduled() const { return m_array_moduled2_literal_alias_const_moduled; } @@ -2025,12 +2029,13 @@ class ConstsLiteralsStruct * @brief This function returns a reference to member array_moduled2_literal_alias_const_moduled * @return Reference to member array_moduled2_literal_alias_const_moduled */ - eProsima_user_DllExport std::array& array_moduled2_literal_alias_const_moduled() + eProsima_user_DllExport std::array& array_moduled2_literal_alias_const_moduled() { return m_array_moduled2_literal_alias_const_moduled; } + + private: std::array m_array_literal_const_short{0}; @@ -2047,16 +2052,14 @@ class ConstsLiteralsStruct std::array m_array_literal_const_uint32{0}; std::array m_array_literal_const_int64{0}; std::array m_array_literal_const_uint64{0}; - std::array m_array_literals_operations1_const{0}; - std::array m_array_literals_operations2_const{0}; - std::array m_array_literals_operations3_const{0}; - std::array m_array_literals_operations4_const{0}; - std::array m_array_literals_operations5_const{0}; - std::array m_array_literals_operations6_const{0}; - std::array m_array_literals_operations7_const{0}; - std::array m_array_literals_operations8_const{0}; + std::array m_array_literals_operations1_const{0}; + std::array m_array_literals_operations2_const{0}; + std::array m_array_literals_operations3_const{0}; + std::array m_array_literals_operations4_const{0}; + std::array m_array_literals_operations5_const{0}; + std::array m_array_literals_operations6_const{0}; + std::array m_array_literals_operations7_const{0}; + std::array m_array_literals_operations8_const{0}; std::array m_array_literal_const_inner_const_helper{0}; std::array m_array_moduled1_literal_const{0}; std::array m_array_moduled2_literal_const{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp index d2cdd826..c23af216 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/constantsPubSubTypes.hpp @@ -41,173 +41,175 @@ typedef int16_t alias_short; -namespace const_module1 { -typedef int16_t alias_short_moduled; +namespace const_module1 +{ + typedef int16_t alias_short_moduled; -/*! - * @brief This class represents the TopicDataType of the type ModuleConstsLiteralsStruct defined by the user in the IDL file. - * @ingroup constants - */ -class ModuleConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type ModuleConstsLiteralsStruct defined by the user in the IDL file. + * @ingroup constants + */ + class ModuleConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef ModuleConstsLiteralsStruct type; + typedef ModuleConstsLiteralsStruct type; - eProsima_user_DllExport ModuleConstsLiteralsStructPubSubType(); + eProsima_user_DllExport ModuleConstsLiteralsStructPubSubType(); - eProsima_user_DllExport ~ModuleConstsLiteralsStructPubSubType() override; + eProsima_user_DllExport ~ModuleConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace const_module1 -namespace const_module2 { - -/*! - * @brief This class represents the TopicDataType of the type Module2ConstsLiteralsStruct defined by the user in the IDL file. - * @ingroup constants - */ -class Module2ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType +namespace const_module2 { -public: - typedef Module2ConstsLiteralsStruct type; + /*! + * @brief This class represents the TopicDataType of the type Module2ConstsLiteralsStruct defined by the user in the IDL file. + * @ingroup constants + */ + class Module2ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - eProsima_user_DllExport Module2ConstsLiteralsStructPubSubType(); + typedef Module2ConstsLiteralsStruct type; - eProsima_user_DllExport ~Module2ConstsLiteralsStructPubSubType() override; + eProsima_user_DllExport Module2ConstsLiteralsStructPubSubType(); - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport ~Module2ConstsLiteralsStructPubSubType() override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void* create_data() override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + eProsima_user_DllExport void delete_data( + void* data) override; + + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace const_module2 /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp index 05e043ed..ac7b675f 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/declarations.hpp @@ -98,13 +98,13 @@ class ForwardDeclarationsRecursiveStruct eProsima_user_DllExport ForwardDeclarationsRecursiveStruct( const ForwardDeclarationsRecursiveStruct& x) { - m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; + m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; - m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; + m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; - m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; + m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; - m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; + m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; } @@ -129,13 +129,13 @@ class ForwardDeclarationsRecursiveStruct const ForwardDeclarationsRecursiveStruct& x) { - m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; + m_var_RecursiveUnboundedSeqForwardStruct = x.m_var_RecursiveUnboundedSeqForwardStruct; - m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; + m_var_RecursiveBoundedSeqForwardStruct = x.m_var_RecursiveBoundedSeqForwardStruct; - m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; + m_var_RecursiveUnboundedSeqForwardUnion = x.m_var_RecursiveUnboundedSeqForwardUnion; - m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; + m_var_RecursiveBoundedSeqForwardUnion = x.m_var_RecursiveBoundedSeqForwardUnion; return *this; } @@ -163,9 +163,9 @@ class ForwardDeclarationsRecursiveStruct const ForwardDeclarationsRecursiveStruct& x) const { return (m_var_RecursiveUnboundedSeqForwardStruct == x.m_var_RecursiveUnboundedSeqForwardStruct && - m_var_RecursiveBoundedSeqForwardStruct == x.m_var_RecursiveBoundedSeqForwardStruct && - m_var_RecursiveUnboundedSeqForwardUnion == x.m_var_RecursiveUnboundedSeqForwardUnion && - m_var_RecursiveBoundedSeqForwardUnion == x.m_var_RecursiveBoundedSeqForwardUnion); + m_var_RecursiveBoundedSeqForwardStruct == x.m_var_RecursiveBoundedSeqForwardStruct && + m_var_RecursiveUnboundedSeqForwardUnion == x.m_var_RecursiveUnboundedSeqForwardUnion && + m_var_RecursiveBoundedSeqForwardUnion == x.m_var_RecursiveBoundedSeqForwardUnion); } /*! @@ -216,6 +216,7 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveUnboundedSeqForwardStruct; } + /*! * @brief This function copies the value in member var_RecursiveBoundedSeqForwardStruct * @param _var_RecursiveBoundedSeqForwardStruct New value to be copied in member var_RecursiveBoundedSeqForwardStruct @@ -254,6 +255,7 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveBoundedSeqForwardStruct; } + /*! * @brief This function copies the value in member var_RecursiveUnboundedSeqForwardUnion * @param _var_RecursiveUnboundedSeqForwardUnion New value to be copied in member var_RecursiveUnboundedSeqForwardUnion @@ -292,6 +294,7 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveUnboundedSeqForwardUnion; } + /*! * @brief This function copies the value in member var_RecursiveBoundedSeqForwardUnion * @param _var_RecursiveBoundedSeqForwardUnion New value to be copied in member var_RecursiveBoundedSeqForwardUnion @@ -330,6 +333,8 @@ class ForwardDeclarationsRecursiveStruct return m_var_RecursiveBoundedSeqForwardUnion; } + + private: RecursiveUnboundedSeqForwardStruct m_var_RecursiveUnboundedSeqForwardStruct; @@ -375,13 +380,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } } @@ -397,13 +402,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } } @@ -419,13 +424,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } @@ -443,13 +448,13 @@ class ForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } @@ -470,13 +475,13 @@ class ForwardUnion { switch (selected_member_) { - case 0x00000001: - ret_value = (m_case_zero == x.m_case_zero); - break; + case 0x00000001: + ret_value = (m_case_zero == x.m_case_zero); + break; - case 0x00000002: - ret_value = (m_case_one == x.m_case_one); - break; + case 0x00000002: + ret_value = (m_case_one == x.m_case_one); + break; } } @@ -506,26 +511,25 @@ class ForwardUnion switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -581,6 +585,7 @@ class ForwardUnion return m_case_zero; } + /*! * @brief This function sets a value in member case_one * @param _case_one New value for member case_one @@ -622,6 +627,7 @@ class ForwardUnion return m_case_one; } + void _default() { if (member_destructor_) @@ -632,43 +638,45 @@ class ForwardUnion selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& case_zero_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& case_zero_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_case_zero = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_case_zero = {0}; - } + } - return m_case_zero; - } + return m_case_zero; + } - int32_t& case_one_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int32_t& case_one_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_case_one = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_case_one = {0}; - } + } + + return m_case_one; + } - return m_case_one; - } int32_t m__d {2147483647}; @@ -711,9 +719,9 @@ class ForwardStruct eProsima_user_DllExport ForwardStruct( const ForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -736,9 +744,9 @@ class ForwardStruct const ForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -764,7 +772,7 @@ class ForwardStruct const ForwardStruct& x) const { return (m_var_short == x.m_var_short && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -805,6 +813,7 @@ class ForwardStruct return m_var_short; } + /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -833,6 +842,8 @@ class ForwardStruct return m_var_long; } + + private: int16_t m_var_short{0}; @@ -882,7 +893,7 @@ class ForwardStruct eProsima_user_DllExport ForwardStruct( const ForwardStruct& x) { - m_var_u_long_long = x.m_var_u_long_long; + m_var_u_long_long = x.m_var_u_long_long; } @@ -904,7 +915,7 @@ class ForwardStruct const ForwardStruct& x) { - m_var_u_long_long = x.m_var_u_long_long; + m_var_u_long_long = x.m_var_u_long_long; return *this; } @@ -969,6 +980,8 @@ class ForwardStruct return m_var_u_long_long; } + + private: uint64_t m_var_u_long_long{0}; @@ -1005,13 +1018,13 @@ class ModuledForwardDeclarationsRecursiveStruct eProsima_user_DllExport ModuledForwardDeclarationsRecursiveStruct( const ModuledForwardDeclarationsRecursiveStruct& x) { - m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; + m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; - m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; + m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; - m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; + m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; - m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; + m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1036,13 +1049,13 @@ class ModuledForwardDeclarationsRecursiveStruct const ModuledForwardDeclarationsRecursiveStruct& x) { - m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; + m_var_ModuledRecursiveUnboundedSeqForwardStruct = x.m_var_ModuledRecursiveUnboundedSeqForwardStruct; - m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; + m_var_ModuledRecursiveBoundedSeqForwardStruct = x.m_var_ModuledRecursiveBoundedSeqForwardStruct; - m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; + m_var_ModuledRecursiveUnboundedSeqForwardUnion = x.m_var_ModuledRecursiveUnboundedSeqForwardUnion; - m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; + m_var_ModuledRecursiveBoundedSeqForwardUnion = x.m_var_ModuledRecursiveBoundedSeqForwardUnion; return *this; } @@ -1070,9 +1083,9 @@ class ModuledForwardDeclarationsRecursiveStruct const ModuledForwardDeclarationsRecursiveStruct& x) const { return (m_var_ModuledRecursiveUnboundedSeqForwardStruct == x.m_var_ModuledRecursiveUnboundedSeqForwardStruct && - m_var_ModuledRecursiveBoundedSeqForwardStruct == x.m_var_ModuledRecursiveBoundedSeqForwardStruct && - m_var_ModuledRecursiveUnboundedSeqForwardUnion == x.m_var_ModuledRecursiveUnboundedSeqForwardUnion && - m_var_ModuledRecursiveBoundedSeqForwardUnion == x.m_var_ModuledRecursiveBoundedSeqForwardUnion); + m_var_ModuledRecursiveBoundedSeqForwardStruct == x.m_var_ModuledRecursiveBoundedSeqForwardStruct && + m_var_ModuledRecursiveUnboundedSeqForwardUnion == x.m_var_ModuledRecursiveUnboundedSeqForwardUnion && + m_var_ModuledRecursiveBoundedSeqForwardUnion == x.m_var_ModuledRecursiveBoundedSeqForwardUnion); } /*! @@ -1090,8 +1103,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardStruct New value to be copied in member var_ModuledRecursiveUnboundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardStruct( - const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& - _var_ModuledRecursiveUnboundedSeqForwardStruct) + const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& _var_ModuledRecursiveUnboundedSeqForwardStruct) { m_var_ModuledRecursiveUnboundedSeqForwardStruct = _var_ModuledRecursiveUnboundedSeqForwardStruct; } @@ -1101,8 +1113,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardStruct New value to be moved in member var_ModuledRecursiveUnboundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardStruct( - declarations_module::ModuledRecursiveUnboundedSeqForwardStruct&& - _var_ModuledRecursiveUnboundedSeqForwardStruct) + declarations_module::ModuledRecursiveUnboundedSeqForwardStruct&& _var_ModuledRecursiveUnboundedSeqForwardStruct) { m_var_ModuledRecursiveUnboundedSeqForwardStruct = std::move(_var_ModuledRecursiveUnboundedSeqForwardStruct); } @@ -1111,8 +1122,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveUnboundedSeqForwardStruct * @return Constant reference to member var_ModuledRecursiveUnboundedSeqForwardStruct */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& - var_ModuledRecursiveUnboundedSeqForwardStruct() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& var_ModuledRecursiveUnboundedSeqForwardStruct() const { return m_var_ModuledRecursiveUnboundedSeqForwardStruct; } @@ -1121,19 +1131,18 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveUnboundedSeqForwardStruct * @return Reference to member var_ModuledRecursiveUnboundedSeqForwardStruct */ - eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& - var_ModuledRecursiveUnboundedSeqForwardStruct() + eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardStruct& var_ModuledRecursiveUnboundedSeqForwardStruct() { return m_var_ModuledRecursiveUnboundedSeqForwardStruct; } + /*! * @brief This function copies the value in member var_ModuledRecursiveBoundedSeqForwardStruct * @param _var_ModuledRecursiveBoundedSeqForwardStruct New value to be copied in member var_ModuledRecursiveBoundedSeqForwardStruct */ eProsima_user_DllExport void var_ModuledRecursiveBoundedSeqForwardStruct( - const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& - _var_ModuledRecursiveBoundedSeqForwardStruct) + const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& _var_ModuledRecursiveBoundedSeqForwardStruct) { m_var_ModuledRecursiveBoundedSeqForwardStruct = _var_ModuledRecursiveBoundedSeqForwardStruct; } @@ -1152,8 +1161,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveBoundedSeqForwardStruct * @return Constant reference to member var_ModuledRecursiveBoundedSeqForwardStruct */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& - var_ModuledRecursiveBoundedSeqForwardStruct() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardStruct& var_ModuledRecursiveBoundedSeqForwardStruct() const { return m_var_ModuledRecursiveBoundedSeqForwardStruct; } @@ -1162,19 +1170,18 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveBoundedSeqForwardStruct * @return Reference to member var_ModuledRecursiveBoundedSeqForwardStruct */ - eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardStruct& - var_ModuledRecursiveBoundedSeqForwardStruct() + eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardStruct& var_ModuledRecursiveBoundedSeqForwardStruct() { return m_var_ModuledRecursiveBoundedSeqForwardStruct; } + /*! * @brief This function copies the value in member var_ModuledRecursiveUnboundedSeqForwardUnion * @param _var_ModuledRecursiveUnboundedSeqForwardUnion New value to be copied in member var_ModuledRecursiveUnboundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardUnion( - const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& - _var_ModuledRecursiveUnboundedSeqForwardUnion) + const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& _var_ModuledRecursiveUnboundedSeqForwardUnion) { m_var_ModuledRecursiveUnboundedSeqForwardUnion = _var_ModuledRecursiveUnboundedSeqForwardUnion; } @@ -1184,8 +1191,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @param _var_ModuledRecursiveUnboundedSeqForwardUnion New value to be moved in member var_ModuledRecursiveUnboundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveUnboundedSeqForwardUnion( - declarations_module::ModuledRecursiveUnboundedSeqForwardUnion&& - _var_ModuledRecursiveUnboundedSeqForwardUnion) + declarations_module::ModuledRecursiveUnboundedSeqForwardUnion&& _var_ModuledRecursiveUnboundedSeqForwardUnion) { m_var_ModuledRecursiveUnboundedSeqForwardUnion = std::move(_var_ModuledRecursiveUnboundedSeqForwardUnion); } @@ -1194,8 +1200,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveUnboundedSeqForwardUnion * @return Constant reference to member var_ModuledRecursiveUnboundedSeqForwardUnion */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& - var_ModuledRecursiveUnboundedSeqForwardUnion() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& var_ModuledRecursiveUnboundedSeqForwardUnion() const { return m_var_ModuledRecursiveUnboundedSeqForwardUnion; } @@ -1204,19 +1209,18 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveUnboundedSeqForwardUnion * @return Reference to member var_ModuledRecursiveUnboundedSeqForwardUnion */ - eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& - var_ModuledRecursiveUnboundedSeqForwardUnion() + eProsima_user_DllExport declarations_module::ModuledRecursiveUnboundedSeqForwardUnion& var_ModuledRecursiveUnboundedSeqForwardUnion() { return m_var_ModuledRecursiveUnboundedSeqForwardUnion; } + /*! * @brief This function copies the value in member var_ModuledRecursiveBoundedSeqForwardUnion * @param _var_ModuledRecursiveBoundedSeqForwardUnion New value to be copied in member var_ModuledRecursiveBoundedSeqForwardUnion */ eProsima_user_DllExport void var_ModuledRecursiveBoundedSeqForwardUnion( - const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& - _var_ModuledRecursiveBoundedSeqForwardUnion) + const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& _var_ModuledRecursiveBoundedSeqForwardUnion) { m_var_ModuledRecursiveBoundedSeqForwardUnion = _var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1235,8 +1239,7 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a constant reference to member var_ModuledRecursiveBoundedSeqForwardUnion * @return Constant reference to member var_ModuledRecursiveBoundedSeqForwardUnion */ - eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& - var_ModuledRecursiveBoundedSeqForwardUnion() const + eProsima_user_DllExport const declarations_module::ModuledRecursiveBoundedSeqForwardUnion& var_ModuledRecursiveBoundedSeqForwardUnion() const { return m_var_ModuledRecursiveBoundedSeqForwardUnion; } @@ -1245,12 +1248,13 @@ class ModuledForwardDeclarationsRecursiveStruct * @brief This function returns a reference to member var_ModuledRecursiveBoundedSeqForwardUnion * @return Reference to member var_ModuledRecursiveBoundedSeqForwardUnion */ - eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardUnion& - var_ModuledRecursiveBoundedSeqForwardUnion() + eProsima_user_DllExport declarations_module::ModuledRecursiveBoundedSeqForwardUnion& var_ModuledRecursiveBoundedSeqForwardUnion() { return m_var_ModuledRecursiveBoundedSeqForwardUnion; } + + private: declarations_module::ModuledRecursiveUnboundedSeqForwardStruct m_var_ModuledRecursiveUnboundedSeqForwardStruct; @@ -1290,9 +1294,9 @@ class ModuledForwardStruct eProsima_user_DllExport ModuledForwardStruct( const ModuledForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -1315,9 +1319,9 @@ class ModuledForwardStruct const ModuledForwardStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -1343,7 +1347,7 @@ class ModuledForwardStruct const ModuledForwardStruct& x) const { return (m_var_short == x.m_var_short && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -1384,6 +1388,7 @@ class ModuledForwardStruct return m_var_short; } + /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -1412,6 +1417,8 @@ class ModuledForwardStruct return m_var_long; } + + private: int16_t m_var_short{0}; @@ -1456,13 +1463,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } } @@ -1478,13 +1485,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } } @@ -1500,13 +1507,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = x.m_case_zero; - break; + case 0x00000001: + case_zero_() = x.m_case_zero; + break; - case 0x00000002: - case_one_() = x.m_case_one; - break; + case 0x00000002: + case_one_() = x.m_case_one; + break; } @@ -1524,13 +1531,13 @@ class ModuledForwardUnion switch (x.selected_member_) { - case 0x00000001: - case_zero_() = std::move(x.m_case_zero); - break; + case 0x00000001: + case_zero_() = std::move(x.m_case_zero); + break; - case 0x00000002: - case_one_() = std::move(x.m_case_one); - break; + case 0x00000002: + case_one_() = std::move(x.m_case_one); + break; } @@ -1551,13 +1558,13 @@ class ModuledForwardUnion { switch (selected_member_) { - case 0x00000001: - ret_value = (m_case_zero == x.m_case_zero); - break; + case 0x00000001: + ret_value = (m_case_zero == x.m_case_zero); + break; - case 0x00000002: - ret_value = (m_case_one == x.m_case_one); - break; + case 0x00000002: + ret_value = (m_case_one == x.m_case_one); + break; } } @@ -1587,26 +1594,25 @@ class ModuledForwardUnion switch (__d) { - case long_const: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case long_const: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1662,6 +1668,7 @@ class ModuledForwardUnion return m_case_zero; } + /*! * @brief This function sets a value in member case_one * @param _case_one New value for member case_one @@ -1703,6 +1710,7 @@ class ModuledForwardUnion return m_case_one; } + void _default() { if (member_destructor_) @@ -1713,43 +1721,45 @@ class ModuledForwardUnion selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& case_zero_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& case_zero_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_case_zero = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_case_zero = {0}; - } + } - return m_case_zero; - } + return m_case_zero; + } - int32_t& case_one_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int32_t& case_one_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_case_one = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_case_one = {0}; - } + } + + return m_case_one; + } - return m_case_one; - } int32_t m__d {2147483647}; @@ -1794,9 +1804,9 @@ class ModuledCommonNameStructure eProsima_user_DllExport ModuledCommonNameStructure( const ModuledCommonNameStructure& x) { - m_global_struct = x.m_global_struct; + m_global_struct = x.m_global_struct; - m_namespaced_struct = x.m_namespaced_struct; + m_namespaced_struct = x.m_namespaced_struct; } @@ -1819,9 +1829,9 @@ class ModuledCommonNameStructure const ModuledCommonNameStructure& x) { - m_global_struct = x.m_global_struct; + m_global_struct = x.m_global_struct; - m_namespaced_struct = x.m_namespaced_struct; + m_namespaced_struct = x.m_namespaced_struct; return *this; } @@ -1847,7 +1857,7 @@ class ModuledCommonNameStructure const ModuledCommonNameStructure& x) const { return (m_global_struct == x.m_global_struct && - m_namespaced_struct == x.m_namespaced_struct); + m_namespaced_struct == x.m_namespaced_struct); } /*! @@ -1898,6 +1908,7 @@ class ModuledCommonNameStructure return m_global_struct; } + /*! * @brief This function copies the value in member namespaced_struct * @param _namespaced_struct New value to be copied in member namespaced_struct @@ -1936,6 +1947,8 @@ class ModuledCommonNameStructure return m_namespaced_struct; } + + private: ForwardStruct m_global_struct; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp index bf0489ae..a3e57c0b 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/declarationsPubSubTypes.hpp @@ -205,92 +205,93 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType unsigned char* key_buffer_; }; -namespace declarations_module { -typedef std::vector ModuledRecursiveUnboundedSeqForwardStruct; -typedef std::vector ModuledRecursiveBoundedSeqForwardStruct; -typedef std::vector ModuledRecursiveUnboundedSeqForwardUnion; -typedef std::vector ModuledRecursiveBoundedSeqForwardUnion; - -/*! - * @brief This class represents the TopicDataType of the type ForwardStruct defined by the user in the IDL file. - * @ingroup declarations - */ -class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType +namespace declarations_module { -public: + typedef std::vector ModuledRecursiveUnboundedSeqForwardStruct; + typedef std::vector ModuledRecursiveBoundedSeqForwardStruct; + typedef std::vector ModuledRecursiveUnboundedSeqForwardUnion; + typedef std::vector ModuledRecursiveBoundedSeqForwardUnion; + + /*! + * @brief This class represents the TopicDataType of the type ForwardStruct defined by the user in the IDL file. + * @ingroup declarations + */ + class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef ForwardStruct type; + typedef ForwardStruct type; - eProsima_user_DllExport ForwardStructPubSubType(); + eProsima_user_DllExport ForwardStructPubSubType(); - eProsima_user_DllExport ~ForwardStructPubSubType() override; + eProsima_user_DllExport ~ForwardStructPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace declarations_module /*! @@ -373,88 +374,89 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas unsigned char* key_buffer_; }; -namespace declarations_module { - -/*! - * @brief This class represents the TopicDataType of the type ModuledForwardStruct defined by the user in the IDL file. - * @ingroup declarations - */ -class ModuledForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType +namespace declarations_module { -public: - typedef ModuledForwardStruct type; + /*! + * @brief This class represents the TopicDataType of the type ModuledForwardStruct defined by the user in the IDL file. + * @ingroup declarations + */ + class ModuledForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - eProsima_user_DllExport ModuledForwardStructPubSubType(); + typedef ModuledForwardStruct type; - eProsima_user_DllExport ~ModuledForwardStructPubSubType() override; + eProsima_user_DllExport ModuledForwardStructPubSubType(); - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport ~ModuledForwardStructPubSubType() override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void* create_data() override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + eProsima_user_DllExport void delete_data( + void* data) override; + + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace declarations_module diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp index d7e74d07..7308cd3a 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/enumerations.hpp @@ -93,9 +93,9 @@ class EnumStructure eProsima_user_DllExport EnumStructure( const EnumStructure& x) { - m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; + m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; - m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; + m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; } @@ -118,9 +118,9 @@ class EnumStructure const EnumStructure& x) { - m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; + m_var_InnerEnumHelper = x.m_var_InnerEnumHelper; - m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; + m_var_scoped_InnerEnumHelper = x.m_var_scoped_InnerEnumHelper; return *this; } @@ -146,7 +146,7 @@ class EnumStructure const EnumStructure& x) const { return (m_var_InnerEnumHelper == x.m_var_InnerEnumHelper && - m_var_scoped_InnerEnumHelper == x.m_var_scoped_InnerEnumHelper); + m_var_scoped_InnerEnumHelper == x.m_var_scoped_InnerEnumHelper); } /*! @@ -187,6 +187,7 @@ class EnumStructure return m_var_InnerEnumHelper; } + /*! * @brief This function sets a value in member var_scoped_InnerEnumHelper * @param _var_scoped_InnerEnumHelper New value for member var_scoped_InnerEnumHelper @@ -215,6 +216,8 @@ class EnumStructure return m_var_scoped_InnerEnumHelper; } + + private: InnerEnumHelper m_var_InnerEnumHelper{InnerEnumHelper::ENUM_VALUE_1}; @@ -250,7 +253,7 @@ class BitMaskStructure eProsima_user_DllExport BitMaskStructure( const BitMaskStructure& x) { - m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; + m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; } @@ -272,7 +275,7 @@ class BitMaskStructure const BitMaskStructure& x) { - m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; + m_var_InnerBitMaskHelper = x.m_var_InnerBitMaskHelper; return *this; } @@ -347,6 +350,8 @@ class BitMaskStructure return m_var_InnerBitMaskHelper; } + + private: InnerBitMaskHelper m_var_InnerBitMaskHelper{0}; @@ -381,7 +386,7 @@ class BoundedBitMaskStructure eProsima_user_DllExport BoundedBitMaskStructure( const BoundedBitMaskStructure& x) { - m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; + m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; } @@ -403,7 +408,7 @@ class BoundedBitMaskStructure const BoundedBitMaskStructure& x) { - m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; + m_var_InnerBoundedBitMaskHelper = x.m_var_InnerBoundedBitMaskHelper; return *this; } @@ -478,6 +483,8 @@ class BoundedBitMaskStructure return m_var_InnerBoundedBitMaskHelper; } + + private: InnerBoundedBitMaskHelper m_var_InnerBoundedBitMaskHelper{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp index ab2c075e..bd437018 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/enumerationsPubSubTypes.hpp @@ -38,7 +38,8 @@ Generated enumerations is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // FASTDDS_GEN_API_VER -namespace Test { +namespace Test +{ } // namespace Test /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp index b71e1772..069ec1c6 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/external.hpp @@ -90,7 +90,7 @@ class short_external eProsima_user_DllExport short_external( const short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -112,7 +112,7 @@ class short_external const short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -187,6 +187,8 @@ class short_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -221,7 +223,7 @@ class ushort_external eProsima_user_DllExport ushort_external( const ushort_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -243,7 +245,7 @@ class ushort_external const ushort_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -318,6 +320,8 @@ class ushort_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -352,7 +356,7 @@ class long_external eProsima_user_DllExport long_external( const long_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -374,7 +378,7 @@ class long_external const long_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -449,6 +453,8 @@ class long_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -483,7 +489,7 @@ class ulong_external eProsima_user_DllExport ulong_external( const ulong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -505,7 +511,7 @@ class ulong_external const ulong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -580,6 +586,8 @@ class ulong_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -614,7 +622,7 @@ class longlong_external eProsima_user_DllExport longlong_external( const longlong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -636,7 +644,7 @@ class longlong_external const longlong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -711,6 +719,8 @@ class longlong_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -745,7 +755,7 @@ class ulonglong_external eProsima_user_DllExport ulonglong_external( const ulonglong_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -767,7 +777,7 @@ class ulonglong_external const ulonglong_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -842,6 +852,8 @@ class ulonglong_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -876,7 +888,7 @@ class float_external eProsima_user_DllExport float_external( const float_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -898,7 +910,7 @@ class float_external const float_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -973,6 +985,8 @@ class float_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1007,7 +1021,7 @@ class double_external eProsima_user_DllExport double_external( const double_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1029,7 +1043,7 @@ class double_external const double_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1104,6 +1118,8 @@ class double_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1138,7 +1154,7 @@ class longdouble_external eProsima_user_DllExport longdouble_external( const longdouble_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1160,7 +1176,7 @@ class longdouble_external const longdouble_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1235,6 +1251,8 @@ class longdouble_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1269,7 +1287,7 @@ class boolean_external eProsima_user_DllExport boolean_external( const boolean_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1291,7 +1309,7 @@ class boolean_external const boolean_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1366,6 +1384,8 @@ class boolean_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1400,7 +1420,7 @@ class octet_external eProsima_user_DllExport octet_external( const octet_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1422,7 +1442,7 @@ class octet_external const octet_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1497,6 +1517,8 @@ class octet_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1531,7 +1553,7 @@ class char_external eProsima_user_DllExport char_external( const char_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1553,7 +1575,7 @@ class char_external const char_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1628,6 +1650,8 @@ class char_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1662,7 +1686,7 @@ class wchar_external eProsima_user_DllExport wchar_external( const wchar_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1684,7 +1708,7 @@ class wchar_external const wchar_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1759,6 +1783,8 @@ class wchar_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -1793,7 +1819,7 @@ class sequence_short_external eProsima_user_DllExport sequence_short_external( const sequence_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1815,7 +1841,7 @@ class sequence_short_external const sequence_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1890,6 +1916,8 @@ class sequence_short_external return m_value; } + + private: eprosima::fastcdr::external> m_value; @@ -1924,7 +1952,7 @@ class string_unbounded_external eProsima_user_DllExport string_unbounded_external( const string_unbounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1946,7 +1974,7 @@ class string_unbounded_external const string_unbounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2021,6 +2049,8 @@ class string_unbounded_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -2055,7 +2085,7 @@ class string_bounded_external eProsima_user_DllExport string_bounded_external( const string_bounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2077,7 +2107,7 @@ class string_bounded_external const string_bounded_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2152,6 +2182,8 @@ class string_bounded_external return m_value; } + + private: eprosima::fastcdr::external> m_value; @@ -2186,7 +2218,7 @@ class map_short_external eProsima_user_DllExport map_short_external( const map_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2208,7 +2240,7 @@ class map_short_external const map_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2283,6 +2315,8 @@ class map_short_external return m_value; } + + private: eprosima::fastcdr::external> m_value; @@ -2317,7 +2351,7 @@ class array_short_external eProsima_user_DllExport array_short_external( const array_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2339,7 +2373,7 @@ class array_short_external const array_short_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2414,6 +2448,8 @@ class array_short_external return m_value; } + + private: eprosima::fastcdr::external> m_value; @@ -2448,7 +2484,7 @@ class struct_external eProsima_user_DllExport struct_external( const struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2470,7 +2506,7 @@ class struct_external const struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2545,6 +2581,8 @@ class struct_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -2579,9 +2617,9 @@ class InnerStructExternal eProsima_user_DllExport InnerStructExternal( const InnerStructExternal& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; } @@ -2604,9 +2642,9 @@ class InnerStructExternal const InnerStructExternal& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; return *this; } @@ -2632,7 +2670,7 @@ class InnerStructExternal const InnerStructExternal& x) const { return (m_s == x.m_s && - m_l == x.m_l); + m_l == x.m_l); } /*! @@ -2673,6 +2711,7 @@ class InnerStructExternal return m_s; } + /*! * @brief This function copies the value in member l * @param _l New value to be copied in member l @@ -2711,6 +2750,8 @@ class InnerStructExternal return m_l; } + + private: int16_t m_s{0}; @@ -2746,7 +2787,7 @@ class ext_struct_external eProsima_user_DllExport ext_struct_external( const ext_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2768,7 +2809,7 @@ class ext_struct_external const ext_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2843,6 +2884,8 @@ class ext_struct_external return m_value; } + + private: InnerStructExternal m_value; @@ -2877,7 +2920,7 @@ class ext_and_inner_struct_external eProsima_user_DllExport ext_and_inner_struct_external( const ext_and_inner_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -2899,7 +2942,7 @@ class ext_and_inner_struct_external const ext_and_inner_struct_external& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2974,6 +3017,8 @@ class ext_and_inner_struct_external return m_value; } + + private: eprosima::fastcdr::external m_value; @@ -3008,7 +3053,7 @@ class struct_external_optional eProsima_user_DllExport struct_external_optional( const struct_external_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -3030,7 +3075,7 @@ class struct_external_optional const struct_external_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3091,8 +3136,7 @@ class struct_external_optional * @brief This function returns a constant reference to member value * @return Constant reference to member value */ - eProsima_user_DllExport const eprosima::fastcdr::optional>& value() - const + eProsima_user_DllExport const eprosima::fastcdr::optional>& value() const { return m_value; } @@ -3106,6 +3150,8 @@ class struct_external_optional return m_value; } + + private: eprosima::fastcdr::optional> m_value; @@ -3142,9 +3188,9 @@ class recursive_union_container eProsima_user_DllExport recursive_union_container( const recursive_union_container& x) { - m_l = x.m_l; + m_l = x.m_l; - m_ext = x.m_ext; + m_ext = x.m_ext; } @@ -3167,9 +3213,9 @@ class recursive_union_container const recursive_union_container& x) { - m_l = x.m_l; + m_l = x.m_l; - m_ext = x.m_ext; + m_ext = x.m_ext; return *this; } @@ -3195,7 +3241,7 @@ class recursive_union_container const recursive_union_container& x) const { return (m_l == x.m_l && - m_ext == x.m_ext); + m_ext == x.m_ext); } /*! @@ -3236,6 +3282,7 @@ class recursive_union_container return m_l; } + /*! * @brief This function copies the value in member ext * @param _ext New value to be copied in member ext @@ -3274,6 +3321,8 @@ class recursive_union_container return m_ext; } + + private: int32_t m_l{0}; @@ -3317,17 +3366,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - c_() = x.m_c; - break; + case 0x00000002: + c_() = x.m_c; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } } @@ -3343,17 +3392,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - c_() = std::move(x.m_c); - break; + case 0x00000002: + c_() = std::move(x.m_c); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } } @@ -3369,17 +3418,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - c_() = x.m_c; - break; + case 0x00000002: + c_() = x.m_c; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } @@ -3397,17 +3446,17 @@ class recursive_union switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - c_() = std::move(x.m_c); - break; + case 0x00000002: + c_() = std::move(x.m_c); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } @@ -3428,17 +3477,17 @@ class recursive_union { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; - case 0x00000002: - ret_value = (m_c == x.m_c); - break; + case 0x00000002: + ret_value = (m_c == x.m_c); + break; - case 0x00000003: - ret_value = (m_s == x.m_s); - break; + case 0x00000003: + ret_value = (m_s == x.m_s); + break; } } @@ -3468,33 +3517,32 @@ class recursive_union switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3550,6 +3598,7 @@ class recursive_union return m_l; } + /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -3602,6 +3651,7 @@ class recursive_union return m_c; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -3643,6 +3693,7 @@ class recursive_union return m_s; } + void _default() { if (member_destructor_) @@ -3653,64 +3704,63 @@ class recursive_union selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& l_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& l_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - return m_l; - } + } - recursive_union_container& c_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_l; } - selected_member_ = 0x00000002; - member_destructor_ = [&]() + recursive_union_container& c_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - m_c.~recursive_union_container(); - }; - new(&m_c) recursive_union_container(); + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_c.~recursive_union_container();}; + new(&m_c) recursive_union_container(); - return m_c; - } + } - int16_t& s_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_c; } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_s = {0}; + int16_t& s_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_s = {0}; + + } + + return m_s; + } - return m_s; - } uint8_t m__d {127}; @@ -3754,9 +3804,9 @@ class recursive_test_1 eProsima_user_DllExport recursive_test_1( const recursive_test_1& x) { - m_s = x.m_s; + m_s = x.m_s; - m_u = x.m_u; + m_u = x.m_u; } @@ -3779,9 +3829,9 @@ class recursive_test_1 const recursive_test_1& x) { - m_s = x.m_s; + m_s = x.m_s; - m_u = x.m_u; + m_u = x.m_u; return *this; } @@ -3807,7 +3857,7 @@ class recursive_test_1 const recursive_test_1& x) const { return (m_s == x.m_s && - m_u == x.m_u); + m_u == x.m_u); } /*! @@ -3848,6 +3898,7 @@ class recursive_test_1 return m_s; } + /*! * @brief This function copies the value in member u * @param _u New value to be copied in member u @@ -3886,6 +3937,8 @@ class recursive_test_1 return m_u; } + + private: int16_t m_s{0}; @@ -3931,17 +3984,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - ext_() = x.m_ext; - break; + case 0x00000002: + ext_() = x.m_ext; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } } @@ -3957,17 +4010,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - ext_() = std::move(x.m_ext); - break; + case 0x00000002: + ext_() = std::move(x.m_ext); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } } @@ -3983,17 +4036,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; - case 0x00000002: - ext_() = x.m_ext; - break; + case 0x00000002: + ext_() = x.m_ext; + break; - case 0x00000003: - s_() = x.m_s; - break; + case 0x00000003: + s_() = x.m_s; + break; } @@ -4011,17 +4064,17 @@ class recursive_structure_container switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; - case 0x00000002: - ext_() = std::move(x.m_ext); - break; + case 0x00000002: + ext_() = std::move(x.m_ext); + break; - case 0x00000003: - s_() = std::move(x.m_s); - break; + case 0x00000003: + s_() = std::move(x.m_s); + break; } @@ -4042,17 +4095,17 @@ class recursive_structure_container { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; - case 0x00000002: - ret_value = (m_ext == x.m_ext); - break; + case 0x00000002: + ret_value = (m_ext == x.m_ext); + break; - case 0x00000003: - ret_value = (m_s == x.m_s); - break; + case 0x00000003: + ret_value = (m_s == x.m_s); + break; } } @@ -4082,33 +4135,32 @@ class recursive_structure_container switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4164,6 +4216,7 @@ class recursive_structure_container return m_l; } + /*! * @brief This function copies the value in member ext * @param _ext New value to be copied in member ext @@ -4216,6 +4269,7 @@ class recursive_structure_container return m_ext; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -4257,6 +4311,7 @@ class recursive_structure_container return m_s; } + void _default() { if (member_destructor_) @@ -4267,64 +4322,63 @@ class recursive_structure_container selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& l_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& l_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - return m_l; - } + } - eprosima::fastcdr::external& ext_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_l; } - selected_member_ = 0x00000002; - member_destructor_ = [&]() + eprosima::fastcdr::external& ext_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - m_ext.~external(); - }; - new(&m_ext) eprosima::fastcdr::external(); + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_ext.~external();}; + new(&m_ext) eprosima::fastcdr::external(); - return m_ext; - } + } - int16_t& s_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_ext; } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_s = {0}; + int16_t& s_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_s = {0}; + + } + + return m_s; + } - return m_s; - } uint8_t m__d {127}; @@ -4368,9 +4422,9 @@ class recursive_structure eProsima_user_DllExport recursive_structure( const recursive_structure& x) { - m_s = x.m_s; + m_s = x.m_s; - m_c = x.m_c; + m_c = x.m_c; } @@ -4393,9 +4447,9 @@ class recursive_structure const recursive_structure& x) { - m_s = x.m_s; + m_s = x.m_s; - m_c = x.m_c; + m_c = x.m_c; return *this; } @@ -4421,7 +4475,7 @@ class recursive_structure const recursive_structure& x) const { return (m_s == x.m_s && - m_c == x.m_c); + m_c == x.m_c); } /*! @@ -4462,6 +4516,7 @@ class recursive_structure return m_s; } + /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -4500,6 +4555,8 @@ class recursive_structure return m_c; } + + private: int16_t m_s{0}; @@ -4535,9 +4592,9 @@ class recursive_test_2 eProsima_user_DllExport recursive_test_2( const recursive_test_2& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; } @@ -4560,9 +4617,9 @@ class recursive_test_2 const recursive_test_2& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; return *this; } @@ -4588,7 +4645,7 @@ class recursive_test_2 const recursive_test_2& x) const { return (m_o == x.m_o && - m_s == x.m_s); + m_s == x.m_s); } /*! @@ -4629,6 +4686,7 @@ class recursive_test_2 return m_o; } + /*! * @brief This function copies the value in member s * @param _s New value to be copied in member s @@ -4667,6 +4725,8 @@ class recursive_test_2 return m_s; } + + private: uint8_t m_o{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp index 94a06d0c..eccac14e 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/final.hpp @@ -81,7 +81,7 @@ class FinalShortStruct eProsima_user_DllExport FinalShortStruct( const FinalShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class FinalShortStruct const FinalShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,6 +168,8 @@ class FinalShortStruct return m_var_short; } + + private: int16_t m_var_short{0}; @@ -202,7 +204,7 @@ class FinalUShortStruct eProsima_user_DllExport FinalUShortStruct( const FinalUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -224,7 +226,7 @@ class FinalUShortStruct const FinalUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -289,6 +291,8 @@ class FinalUShortStruct return m_var_ushort; } + + private: uint16_t m_var_ushort{0}; @@ -323,7 +327,7 @@ class FinalLongStruct eProsima_user_DllExport FinalLongStruct( const FinalLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -345,7 +349,7 @@ class FinalLongStruct const FinalLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -410,6 +414,8 @@ class FinalLongStruct return m_var_long; } + + private: int32_t m_var_long{0}; @@ -444,7 +450,7 @@ class FinalULongStruct eProsima_user_DllExport FinalULongStruct( const FinalULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -466,7 +472,7 @@ class FinalULongStruct const FinalULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -531,6 +537,8 @@ class FinalULongStruct return m_var_ulong; } + + private: uint32_t m_var_ulong{0}; @@ -565,7 +573,7 @@ class FinalLongLongStruct eProsima_user_DllExport FinalLongLongStruct( const FinalLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -587,7 +595,7 @@ class FinalLongLongStruct const FinalLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -652,6 +660,8 @@ class FinalLongLongStruct return m_var_longlong; } + + private: int64_t m_var_longlong{0}; @@ -686,7 +696,7 @@ class FinalULongLongStruct eProsima_user_DllExport FinalULongLongStruct( const FinalULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -708,7 +718,7 @@ class FinalULongLongStruct const FinalULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -773,6 +783,8 @@ class FinalULongLongStruct return m_var_ulonglong; } + + private: uint64_t m_var_ulonglong{0}; @@ -807,7 +819,7 @@ class FinalFloatStruct eProsima_user_DllExport FinalFloatStruct( const FinalFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -829,7 +841,7 @@ class FinalFloatStruct const FinalFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -894,6 +906,8 @@ class FinalFloatStruct return m_var_float; } + + private: float m_var_float{0.0}; @@ -928,7 +942,7 @@ class FinalDoubleStruct eProsima_user_DllExport FinalDoubleStruct( const FinalDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -950,7 +964,7 @@ class FinalDoubleStruct const FinalDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1015,6 +1029,8 @@ class FinalDoubleStruct return m_var_double; } + + private: double m_var_double{0.0}; @@ -1049,7 +1065,7 @@ class FinalLongDoubleStruct eProsima_user_DllExport FinalLongDoubleStruct( const FinalLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1071,7 +1087,7 @@ class FinalLongDoubleStruct const FinalLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1136,6 +1152,8 @@ class FinalLongDoubleStruct return m_var_longdouble; } + + private: long double m_var_longdouble{0.0}; @@ -1170,7 +1188,7 @@ class FinalBooleanStruct eProsima_user_DllExport FinalBooleanStruct( const FinalBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1192,7 +1210,7 @@ class FinalBooleanStruct const FinalBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1257,6 +1275,8 @@ class FinalBooleanStruct return m_var_boolean; } + + private: bool m_var_boolean{false}; @@ -1291,7 +1311,7 @@ class FinalOctetStruct eProsima_user_DllExport FinalOctetStruct( const FinalOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1313,7 +1333,7 @@ class FinalOctetStruct const FinalOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1378,6 +1398,8 @@ class FinalOctetStruct return m_var_octet; } + + private: uint8_t m_var_octet{0}; @@ -1412,7 +1434,7 @@ class FinalCharStruct eProsima_user_DllExport FinalCharStruct( const FinalCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1434,7 +1456,7 @@ class FinalCharStruct const FinalCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1499,6 +1521,8 @@ class FinalCharStruct return m_var_char8; } + + private: char m_var_char8{0}; @@ -1533,7 +1557,7 @@ class FinalWCharStruct eProsima_user_DllExport FinalWCharStruct( const FinalWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1555,7 +1579,7 @@ class FinalWCharStruct const FinalWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1620,6 +1644,8 @@ class FinalWCharStruct return m_var_char16; } + + private: wchar_t m_var_char16{0}; @@ -1654,7 +1680,7 @@ class FinalUnionStruct eProsima_user_DllExport FinalUnionStruct( const FinalUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1676,7 +1702,7 @@ class FinalUnionStruct const FinalUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1751,6 +1777,8 @@ class FinalUnionStruct return m_var_union; } + + private: InnerUnionHelper m_var_union; @@ -1845,6 +1873,8 @@ class FinalEmptyStruct return !(*this == x); } + + private: @@ -1880,7 +1910,7 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct const FinalEmptyInheritanceStruct& x) : FinalEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1905,7 +1935,7 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct { FinalEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1931,9 +1961,9 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct const FinalEmptyInheritanceStruct& x) const { if (FinalEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -1985,6 +2015,8 @@ class FinalEmptyInheritanceStruct : public FinalEmptyStruct return m_var_str; } + + private: std::string m_var_str; @@ -2021,7 +2053,7 @@ class FinalInheritanceStruct : public FinalShortStruct const FinalInheritanceStruct& x) : FinalShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2046,7 +2078,7 @@ class FinalInheritanceStruct : public FinalShortStruct { FinalShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2072,9 +2104,9 @@ class FinalInheritanceStruct : public FinalShortStruct const FinalInheritanceStruct& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2126,6 +2158,8 @@ class FinalInheritanceStruct : public FinalShortStruct return m_var_str; } + + private: std::string m_var_str; @@ -2213,9 +2247,9 @@ class InheritanceEmptyStruct : public FinalShortStruct const InheritanceEmptyStruct& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2230,6 +2264,8 @@ class InheritanceEmptyStruct : public FinalShortStruct return !(*this == x); } + + private: @@ -2265,7 +2301,7 @@ class FinalExtensibilityInheritance : public FinalShortStruct const FinalExtensibilityInheritance& x) : FinalShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2290,7 +2326,7 @@ class FinalExtensibilityInheritance : public FinalShortStruct { FinalShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2316,9 +2352,9 @@ class FinalExtensibilityInheritance : public FinalShortStruct const FinalExtensibilityInheritance& x) const { if (FinalShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2360,6 +2396,8 @@ class FinalExtensibilityInheritance : public FinalShortStruct return m_var_long; } + + private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp index d41c9261..a8786266 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/finalPubSubTypes.hpp @@ -2258,8 +2258,7 @@ struct FinalExtensibilityInheritance_f FinalExtensibilityInheritance_f); }; -template struct FinalExtensibilityInheritance_rob; +template struct FinalExtensibilityInheritance_rob; template inline size_t constexpr FinalExtensibilityInheritance_offset_of() @@ -2360,16 +2359,14 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T static constexpr bool is_plain_xcdrv1_impl() { return 8ULL == - (detail::FinalExtensibilityInheritance_offset_of() + + (detail::FinalExtensibilityInheritance_offset_of() + sizeof(int32_t)); } static constexpr bool is_plain_xcdrv2_impl() { return 8ULL == - (detail::FinalExtensibilityInheritance_offset_of() + + (detail::FinalExtensibilityInheritance_offset_of() + sizeof(int32_t)); } diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp index d71a983b..1d57b907 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/helpers/basic_inner_types.hpp @@ -123,9 +123,9 @@ class InnerStructureHelper eProsima_user_DllExport InnerStructureHelper( const InnerStructureHelper& x) { - m_field1 = x.m_field1; + m_field1 = x.m_field1; - m_field2 = x.m_field2; + m_field2 = x.m_field2; } @@ -148,9 +148,9 @@ class InnerStructureHelper const InnerStructureHelper& x) { - m_field1 = x.m_field1; + m_field1 = x.m_field1; - m_field2 = x.m_field2; + m_field2 = x.m_field2; return *this; } @@ -176,7 +176,7 @@ class InnerStructureHelper const InnerStructureHelper& x) const { return (m_field1 == x.m_field1 && - m_field2 == x.m_field2); + m_field2 == x.m_field2); } /*! @@ -217,6 +217,7 @@ class InnerStructureHelper return m_field1; } + /*! * @brief This function sets a value in member field2 * @param _field2 New value for member field2 @@ -245,6 +246,8 @@ class InnerStructureHelper return m_field2; } + + private: int32_t m_field1{0}; @@ -340,6 +343,8 @@ class InnerEmptyStructureHelper return !(*this == x); } + + private: @@ -385,17 +390,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = x.m_longValue; - break; + case 0x00000001: + longValue_() = x.m_longValue; + break; - case 0x00000002: - floatValue_() = x.m_floatValue; - break; + case 0x00000002: + floatValue_() = x.m_floatValue; + break; - case 0x00000003: - shortValue_() = x.m_shortValue; - break; + case 0x00000003: + shortValue_() = x.m_shortValue; + break; } } @@ -411,17 +416,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = std::move(x.m_longValue); - break; + case 0x00000001: + longValue_() = std::move(x.m_longValue); + break; - case 0x00000002: - floatValue_() = std::move(x.m_floatValue); - break; + case 0x00000002: + floatValue_() = std::move(x.m_floatValue); + break; - case 0x00000003: - shortValue_() = std::move(x.m_shortValue); - break; + case 0x00000003: + shortValue_() = std::move(x.m_shortValue); + break; } } @@ -437,17 +442,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = x.m_longValue; - break; + case 0x00000001: + longValue_() = x.m_longValue; + break; - case 0x00000002: - floatValue_() = x.m_floatValue; - break; + case 0x00000002: + floatValue_() = x.m_floatValue; + break; - case 0x00000003: - shortValue_() = x.m_shortValue; - break; + case 0x00000003: + shortValue_() = x.m_shortValue; + break; } @@ -465,17 +470,17 @@ class InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - longValue_() = std::move(x.m_longValue); - break; + case 0x00000001: + longValue_() = std::move(x.m_longValue); + break; - case 0x00000002: - floatValue_() = std::move(x.m_floatValue); - break; + case 0x00000002: + floatValue_() = std::move(x.m_floatValue); + break; - case 0x00000003: - shortValue_() = std::move(x.m_shortValue); - break; + case 0x00000003: + shortValue_() = std::move(x.m_shortValue); + break; } @@ -496,17 +501,17 @@ class InnerUnionHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_longValue == x.m_longValue); - break; + case 0x00000001: + ret_value = (m_longValue == x.m_longValue); + break; - case 0x00000002: - ret_value = (m_floatValue == x.m_floatValue); - break; + case 0x00000002: + ret_value = (m_floatValue == x.m_floatValue); + break; - case 0x00000003: - ret_value = (m_shortValue == x.m_shortValue); - break; + case 0x00000003: + ret_value = (m_shortValue == x.m_shortValue); + break; } } @@ -536,33 +541,32 @@ class InnerUnionHelper switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -618,6 +622,7 @@ class InnerUnionHelper return m_longValue; } + /*! * @brief This function sets a value in member floatValue * @param _floatValue New value for member floatValue @@ -659,6 +664,7 @@ class InnerUnionHelper return m_floatValue; } + /*! * @brief This function sets a value in member shortValue * @param _shortValue New value for member shortValue @@ -700,61 +706,64 @@ class InnerUnionHelper return m_shortValue; } + + private: - int32_t& longValue_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& longValue_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_longValue = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_longValue = {0}; - } + } - return m_longValue; - } + return m_longValue; + } - float& floatValue_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + float& floatValue_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_floatValue = {0.0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_floatValue = {0.0}; - } + } - return m_floatValue; - } + return m_floatValue; + } - int16_t& shortValue_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + int16_t& shortValue_() { - member_destructor_(); - } + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_shortValue = {0}; + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_shortValue = {0}; - } + } + + return m_shortValue; + } - return m_shortValue; - } int32_t m__d {2147483647}; @@ -775,17 +784,17 @@ class InnerUnionHelper */ struct InnerBitsetHelper { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; /*! @@ -796,9 +805,9 @@ struct InnerBitsetHelper const InnerBitsetHelper& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d); + b == x.b && + c == x.c && + d == x.d); } /*! @@ -810,7 +819,6 @@ struct InnerBitsetHelper { return !(*this == x); } - }; const int16_t inner_const_helper = 1; typedef eprosima::fastcdr::fixed_string<10> Inner_alias_bounded_string_helper; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp index e8393cc0..68b4f1c2 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/inheritance.hpp @@ -81,9 +81,9 @@ class InnerStructureHelperChild : public InnerStructureHelper const InnerStructureHelperChild& x) : InnerStructureHelper(x) { - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; } @@ -109,9 +109,9 @@ class InnerStructureHelperChild : public InnerStructureHelper { InnerStructureHelper::operator =(x); - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; return *this; } @@ -138,11 +138,11 @@ class InnerStructureHelperChild : public InnerStructureHelper const InnerStructureHelperChild& x) const { if (InnerStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_longlong == x.m_var_child_longlong && - m_var_child_ulonglong == x.m_var_child_ulonglong); + m_var_child_ulonglong == x.m_var_child_ulonglong); } /*! @@ -183,6 +183,7 @@ class InnerStructureHelperChild : public InnerStructureHelper return m_var_child_longlong; } + /*! * @brief This function sets a value in member var_child_ulonglong * @param _var_child_ulonglong New value for member var_child_ulonglong @@ -211,6 +212,8 @@ class InnerStructureHelperChild : public InnerStructureHelper return m_var_child_ulonglong; } + + private: int64_t m_var_child_longlong{0}; @@ -248,9 +251,9 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild const InnerStructureHelperChildChild& x) : InnerStructureHelperChild(x) { - m_var_child_childlonglong2 = x.m_var_child_childlonglong2; + m_var_child_childlonglong2 = x.m_var_child_childlonglong2; - m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; + m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; } @@ -276,9 +279,9 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild { InnerStructureHelperChild::operator =(x); - m_var_child_childlonglong2 = x.m_var_child_childlonglong2; + m_var_child_childlonglong2 = x.m_var_child_childlonglong2; - m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; + m_var_childchild_ulonglong2 = x.m_var_childchild_ulonglong2; return *this; } @@ -305,11 +308,11 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild const InnerStructureHelperChildChild& x) const { if (InnerStructureHelperChild::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_childlonglong2 == x.m_var_child_childlonglong2 && - m_var_childchild_ulonglong2 == x.m_var_childchild_ulonglong2); + m_var_childchild_ulonglong2 == x.m_var_childchild_ulonglong2); } /*! @@ -350,6 +353,7 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild return m_var_child_childlonglong2; } + /*! * @brief This function sets a value in member var_childchild_ulonglong2 * @param _var_childchild_ulonglong2 New value for member var_childchild_ulonglong2 @@ -378,6 +382,8 @@ class InnerStructureHelperChildChild : public InnerStructureHelperChild return m_var_childchild_ulonglong2; } + + private: int64_t m_var_child_childlonglong2{0}; @@ -466,9 +472,9 @@ class InnerStructureHelperEmptyChild : public InnerStructureHelper const InnerStructureHelperEmptyChild& x) const { if (InnerStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -483,6 +489,8 @@ class InnerStructureHelperEmptyChild : public InnerStructureHelper return !(*this == x); } + + private: @@ -518,7 +526,7 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil const InnerStructureHelperEmptyChildChild& x) : InnerStructureHelperEmptyChild(x) { - m_var_char = x.m_var_char; + m_var_char = x.m_var_char; } @@ -543,7 +551,7 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil { InnerStructureHelperEmptyChild::operator =(x); - m_var_char = x.m_var_char; + m_var_char = x.m_var_char; return *this; } @@ -569,9 +577,9 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil const InnerStructureHelperEmptyChildChild& x) const { if (InnerStructureHelperEmptyChild::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_char == x.m_var_char); } @@ -613,6 +621,8 @@ class InnerStructureHelperEmptyChildChild : public InnerStructureHelperEmptyChil return m_var_char; } + + private: char m_var_char{0}; @@ -649,9 +659,9 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper const InnerEmptyStructureHelperChild& x) : InnerEmptyStructureHelper(x) { - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; } @@ -677,9 +687,9 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper { InnerEmptyStructureHelper::operator =(x); - m_var_child_longlong = x.m_var_child_longlong; + m_var_child_longlong = x.m_var_child_longlong; - m_var_child_ulonglong = x.m_var_child_ulonglong; + m_var_child_ulonglong = x.m_var_child_ulonglong; return *this; } @@ -706,11 +716,11 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper const InnerEmptyStructureHelperChild& x) const { if (InnerEmptyStructureHelper::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_child_longlong == x.m_var_child_longlong && - m_var_child_ulonglong == x.m_var_child_ulonglong); + m_var_child_ulonglong == x.m_var_child_ulonglong); } /*! @@ -751,6 +761,7 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper return m_var_child_longlong; } + /*! * @brief This function sets a value in member var_child_ulonglong * @param _var_child_ulonglong New value for member var_child_ulonglong @@ -779,6 +790,8 @@ class InnerEmptyStructureHelperChild : public InnerEmptyStructureHelper return m_var_child_ulonglong; } + + private: int64_t m_var_child_longlong{0}; @@ -816,7 +829,7 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias const StructAliasInheritanceStruct& x) : inner_structure_helper_alias(x) { - m_new_member = x.m_new_member; + m_new_member = x.m_new_member; } @@ -841,7 +854,7 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias { inner_structure_helper_alias::operator =(x); - m_new_member = x.m_new_member; + m_new_member = x.m_new_member; return *this; } @@ -867,9 +880,9 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias const StructAliasInheritanceStruct& x) const { if (inner_structure_helper_alias::operator !=(x)) - { - return false; - } + { + return false; + } return (m_new_member == x.m_new_member); } @@ -911,6 +924,8 @@ class StructAliasInheritanceStruct : public inner_structure_helper_alias return m_new_member; } + + private: int16_t m_new_member{0}; @@ -945,17 +960,17 @@ class StructuresInheritanceStruct eProsima_user_DllExport StructuresInheritanceStruct( const StructuresInheritanceStruct& x) { - m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; + m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; - m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; + m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; - m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; + m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; - m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; + m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; - m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; + m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; - m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; + m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; } @@ -982,17 +997,17 @@ class StructuresInheritanceStruct const StructuresInheritanceStruct& x) { - m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; + m_var_InnerStructureHelperChild = x.m_var_InnerStructureHelperChild; - m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; + m_var_InnerStructureHelperChildChild = x.m_var_InnerStructureHelperChildChild; - m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; + m_var_InnerStructureHelperEmptyChild = x.m_var_InnerStructureHelperEmptyChild; - m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; + m_var_InnerStructureHelperEmptyChildChild = x.m_var_InnerStructureHelperEmptyChildChild; - m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; + m_var_InnerEmptyStructureHelperChild = x.m_var_InnerEmptyStructureHelperChild; - m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; + m_var_StructAliasInheritanceStruct = x.m_var_StructAliasInheritanceStruct; return *this; } @@ -1022,11 +1037,11 @@ class StructuresInheritanceStruct const StructuresInheritanceStruct& x) const { return (m_var_InnerStructureHelperChild == x.m_var_InnerStructureHelperChild && - m_var_InnerStructureHelperChildChild == x.m_var_InnerStructureHelperChildChild && - m_var_InnerStructureHelperEmptyChild == x.m_var_InnerStructureHelperEmptyChild && - m_var_InnerStructureHelperEmptyChildChild == x.m_var_InnerStructureHelperEmptyChildChild && - m_var_InnerEmptyStructureHelperChild == x.m_var_InnerEmptyStructureHelperChild && - m_var_StructAliasInheritanceStruct == x.m_var_StructAliasInheritanceStruct); + m_var_InnerStructureHelperChildChild == x.m_var_InnerStructureHelperChildChild && + m_var_InnerStructureHelperEmptyChild == x.m_var_InnerStructureHelperEmptyChild && + m_var_InnerStructureHelperEmptyChildChild == x.m_var_InnerStructureHelperEmptyChildChild && + m_var_InnerEmptyStructureHelperChild == x.m_var_InnerEmptyStructureHelperChild && + m_var_StructAliasInheritanceStruct == x.m_var_StructAliasInheritanceStruct); } /*! @@ -1077,6 +1092,7 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperChild; } + /*! * @brief This function copies the value in member var_InnerStructureHelperChildChild * @param _var_InnerStructureHelperChildChild New value to be copied in member var_InnerStructureHelperChildChild @@ -1115,6 +1131,7 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperChildChild; } + /*! * @brief This function copies the value in member var_InnerStructureHelperEmptyChild * @param _var_InnerStructureHelperEmptyChild New value to be copied in member var_InnerStructureHelperEmptyChild @@ -1153,6 +1170,7 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperEmptyChild; } + /*! * @brief This function copies the value in member var_InnerStructureHelperEmptyChildChild * @param _var_InnerStructureHelperEmptyChildChild New value to be copied in member var_InnerStructureHelperEmptyChildChild @@ -1191,6 +1209,7 @@ class StructuresInheritanceStruct return m_var_InnerStructureHelperEmptyChildChild; } + /*! * @brief This function copies the value in member var_InnerEmptyStructureHelperChild * @param _var_InnerEmptyStructureHelperChild New value to be copied in member var_InnerEmptyStructureHelperChild @@ -1229,6 +1248,7 @@ class StructuresInheritanceStruct return m_var_InnerEmptyStructureHelperChild; } + /*! * @brief This function copies the value in member var_StructAliasInheritanceStruct * @param _var_StructAliasInheritanceStruct New value to be copied in member var_StructAliasInheritanceStruct @@ -1267,6 +1287,8 @@ class StructuresInheritanceStruct return m_var_StructAliasInheritanceStruct; } + + private: InnerStructureHelperChild m_var_InnerStructureHelperChild; @@ -1283,19 +1305,19 @@ class StructuresInheritanceStruct */ struct InnerBitsetHelperChild { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint32_t child_w : 17; + uint32_t child_w : 17; /*! @@ -1306,10 +1328,10 @@ struct InnerBitsetHelperChild const InnerBitsetHelperChild& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - child_w == x.child_w); + b == x.b && + c == x.c && + d == x.d && + child_w == x.child_w); } /*! @@ -1321,7 +1343,6 @@ struct InnerBitsetHelperChild { return !(*this == x); } - }; /*! * @brief This structure represents the bitset InnerBitsetHelperChildChild defined by the user in the IDL file. @@ -1329,21 +1350,21 @@ struct InnerBitsetHelperChild */ struct InnerBitsetHelperChildChild { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint32_t child_w : 17; + uint32_t child_w : 17; - uint16_t childchild_z : 14; + uint16_t childchild_z : 14; /*! @@ -1354,11 +1375,11 @@ struct InnerBitsetHelperChildChild const InnerBitsetHelperChildChild& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - child_w == x.child_w && - childchild_z == x.childchild_z); + b == x.b && + c == x.c && + d == x.d && + child_w == x.child_w && + childchild_z == x.childchild_z); } /*! @@ -1370,7 +1391,6 @@ struct InnerBitsetHelperChildChild { return !(*this == x); } - }; /*! * @brief This structure represents the bitset BitsetAliasInheritanceBitset defined by the user in the IDL file. @@ -1378,19 +1398,19 @@ struct InnerBitsetHelperChildChild */ struct BitsetAliasInheritanceBitset { - uint8_t a : 3; + uint8_t a : 3; - bool b : 1; + bool b : 1; - uint8_t : 4; + uint8_t : 4; - uint16_t c : 10; + uint16_t c : 10; - uint8_t : 3; + uint8_t : 3; - int16_t d : 12; + int16_t d : 12; - uint16_t new_bitfield : 10; + uint16_t new_bitfield : 10; /*! @@ -1401,10 +1421,10 @@ struct BitsetAliasInheritanceBitset const BitsetAliasInheritanceBitset& x) const { return (a == x.a && - b == x.b && - c == x.c && - d == x.d && - new_bitfield == x.new_bitfield); + b == x.b && + c == x.c && + d == x.d && + new_bitfield == x.new_bitfield); } /*! @@ -1416,7 +1436,6 @@ struct BitsetAliasInheritanceBitset { return !(*this == x); } - }; /*! * @brief This class represents the structure BitsetsChildInheritanceStruct defined by the user in the IDL file. @@ -1447,11 +1466,11 @@ class BitsetsChildInheritanceStruct eProsima_user_DllExport BitsetsChildInheritanceStruct( const BitsetsChildInheritanceStruct& x) { - m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; + m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; - m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; + m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; - m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; + m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; } @@ -1475,11 +1494,11 @@ class BitsetsChildInheritanceStruct const BitsetsChildInheritanceStruct& x) { - m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; + m_var_InnerBitsetHelperChild = x.m_var_InnerBitsetHelperChild; - m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; + m_var_InnerBitsetHelperChildChild = x.m_var_InnerBitsetHelperChildChild; - m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; + m_var_BitsetAliasInheritanceBitset = x.m_var_BitsetAliasInheritanceBitset; return *this; } @@ -1506,8 +1525,8 @@ class BitsetsChildInheritanceStruct const BitsetsChildInheritanceStruct& x) const { return (m_var_InnerBitsetHelperChild == x.m_var_InnerBitsetHelperChild && - m_var_InnerBitsetHelperChildChild == x.m_var_InnerBitsetHelperChildChild && - m_var_BitsetAliasInheritanceBitset == x.m_var_BitsetAliasInheritanceBitset); + m_var_InnerBitsetHelperChildChild == x.m_var_InnerBitsetHelperChildChild && + m_var_BitsetAliasInheritanceBitset == x.m_var_BitsetAliasInheritanceBitset); } /*! @@ -1558,6 +1577,7 @@ class BitsetsChildInheritanceStruct return m_var_InnerBitsetHelperChild; } + /*! * @brief This function copies the value in member var_InnerBitsetHelperChildChild * @param _var_InnerBitsetHelperChildChild New value to be copied in member var_InnerBitsetHelperChildChild @@ -1596,6 +1616,7 @@ class BitsetsChildInheritanceStruct return m_var_InnerBitsetHelperChildChild; } + /*! * @brief This function copies the value in member var_BitsetAliasInheritanceBitset * @param _var_BitsetAliasInheritanceBitset New value to be copied in member var_BitsetAliasInheritanceBitset @@ -1634,6 +1655,8 @@ class BitsetsChildInheritanceStruct return m_var_BitsetAliasInheritanceBitset; } + + private: InnerBitsetHelperChild m_var_InnerBitsetHelperChild{}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp index 6eea90e1..9a12e1fd 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/key.hpp @@ -80,9 +80,9 @@ class KeyedShortStruct eProsima_user_DllExport KeyedShortStruct( const KeyedShortStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -105,9 +105,9 @@ class KeyedShortStruct const KeyedShortStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -133,7 +133,7 @@ class KeyedShortStruct const KeyedShortStruct& x) const { return (m_key_short == x.m_key_short && - m_var_short == x.m_var_short); + m_var_short == x.m_var_short); } /*! @@ -174,6 +174,7 @@ class KeyedShortStruct return m_key_short; } + /*! * @brief This function sets a value in member var_short * @param _var_short New value for member var_short @@ -202,6 +203,8 @@ class KeyedShortStruct return m_var_short; } + + private: int16_t m_key_short{0}; @@ -237,9 +240,9 @@ class KeyedUShortStruct eProsima_user_DllExport KeyedUShortStruct( const KeyedUShortStruct& x) { - m_key_ushort = x.m_key_ushort; + m_key_ushort = x.m_key_ushort; - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -262,9 +265,9 @@ class KeyedUShortStruct const KeyedUShortStruct& x) { - m_key_ushort = x.m_key_ushort; + m_key_ushort = x.m_key_ushort; - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -290,7 +293,7 @@ class KeyedUShortStruct const KeyedUShortStruct& x) const { return (m_key_ushort == x.m_key_ushort && - m_var_ushort == x.m_var_ushort); + m_var_ushort == x.m_var_ushort); } /*! @@ -331,6 +334,7 @@ class KeyedUShortStruct return m_key_ushort; } + /*! * @brief This function sets a value in member var_ushort * @param _var_ushort New value for member var_ushort @@ -359,6 +363,8 @@ class KeyedUShortStruct return m_var_ushort; } + + private: uint16_t m_key_ushort{0}; @@ -394,9 +400,9 @@ class KeyedLongStruct eProsima_user_DllExport KeyedLongStruct( const KeyedLongStruct& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -419,9 +425,9 @@ class KeyedLongStruct const KeyedLongStruct& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -447,7 +453,7 @@ class KeyedLongStruct const KeyedLongStruct& x) const { return (m_key_long == x.m_key_long && - m_var_long == x.m_var_long); + m_var_long == x.m_var_long); } /*! @@ -488,6 +494,7 @@ class KeyedLongStruct return m_key_long; } + /*! * @brief This function sets a value in member var_long * @param _var_long New value for member var_long @@ -516,6 +523,8 @@ class KeyedLongStruct return m_var_long; } + + private: int32_t m_key_long{0}; @@ -551,9 +560,9 @@ class KeyedULongStruct eProsima_user_DllExport KeyedULongStruct( const KeyedULongStruct& x) { - m_key_ulong = x.m_key_ulong; + m_key_ulong = x.m_key_ulong; - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -576,9 +585,9 @@ class KeyedULongStruct const KeyedULongStruct& x) { - m_key_ulong = x.m_key_ulong; + m_key_ulong = x.m_key_ulong; - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -604,7 +613,7 @@ class KeyedULongStruct const KeyedULongStruct& x) const { return (m_key_ulong == x.m_key_ulong && - m_var_ulong == x.m_var_ulong); + m_var_ulong == x.m_var_ulong); } /*! @@ -645,6 +654,7 @@ class KeyedULongStruct return m_key_ulong; } + /*! * @brief This function sets a value in member var_ulong * @param _var_ulong New value for member var_ulong @@ -673,6 +683,8 @@ class KeyedULongStruct return m_var_ulong; } + + private: uint32_t m_key_ulong{0}; @@ -708,9 +720,9 @@ class KeyedLongLongStruct eProsima_user_DllExport KeyedLongLongStruct( const KeyedLongLongStruct& x) { - m_key_longlong = x.m_key_longlong; + m_key_longlong = x.m_key_longlong; - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -733,9 +745,9 @@ class KeyedLongLongStruct const KeyedLongLongStruct& x) { - m_key_longlong = x.m_key_longlong; + m_key_longlong = x.m_key_longlong; - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -761,7 +773,7 @@ class KeyedLongLongStruct const KeyedLongLongStruct& x) const { return (m_key_longlong == x.m_key_longlong && - m_var_longlong == x.m_var_longlong); + m_var_longlong == x.m_var_longlong); } /*! @@ -802,6 +814,7 @@ class KeyedLongLongStruct return m_key_longlong; } + /*! * @brief This function sets a value in member var_longlong * @param _var_longlong New value for member var_longlong @@ -830,6 +843,8 @@ class KeyedLongLongStruct return m_var_longlong; } + + private: int64_t m_key_longlong{0}; @@ -865,9 +880,9 @@ class KeyedULongLongStruct eProsima_user_DllExport KeyedULongLongStruct( const KeyedULongLongStruct& x) { - m_key_ulonglong = x.m_key_ulonglong; + m_key_ulonglong = x.m_key_ulonglong; - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -890,9 +905,9 @@ class KeyedULongLongStruct const KeyedULongLongStruct& x) { - m_key_ulonglong = x.m_key_ulonglong; + m_key_ulonglong = x.m_key_ulonglong; - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -918,7 +933,7 @@ class KeyedULongLongStruct const KeyedULongLongStruct& x) const { return (m_key_ulonglong == x.m_key_ulonglong && - m_var_ulonglong == x.m_var_ulonglong); + m_var_ulonglong == x.m_var_ulonglong); } /*! @@ -959,6 +974,7 @@ class KeyedULongLongStruct return m_key_ulonglong; } + /*! * @brief This function sets a value in member var_ulonglong * @param _var_ulonglong New value for member var_ulonglong @@ -987,6 +1003,8 @@ class KeyedULongLongStruct return m_var_ulonglong; } + + private: uint64_t m_key_ulonglong{0}; @@ -1022,9 +1040,9 @@ class KeyedFloatStruct eProsima_user_DllExport KeyedFloatStruct( const KeyedFloatStruct& x) { - m_key_float = x.m_key_float; + m_key_float = x.m_key_float; - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -1047,9 +1065,9 @@ class KeyedFloatStruct const KeyedFloatStruct& x) { - m_key_float = x.m_key_float; + m_key_float = x.m_key_float; - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -1075,7 +1093,7 @@ class KeyedFloatStruct const KeyedFloatStruct& x) const { return (m_key_float == x.m_key_float && - m_var_float == x.m_var_float); + m_var_float == x.m_var_float); } /*! @@ -1116,6 +1134,7 @@ class KeyedFloatStruct return m_key_float; } + /*! * @brief This function sets a value in member var_float * @param _var_float New value for member var_float @@ -1144,6 +1163,8 @@ class KeyedFloatStruct return m_var_float; } + + private: float m_key_float{0.0}; @@ -1179,9 +1200,9 @@ class KeyedDoubleStruct eProsima_user_DllExport KeyedDoubleStruct( const KeyedDoubleStruct& x) { - m_key_double = x.m_key_double; + m_key_double = x.m_key_double; - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -1204,9 +1225,9 @@ class KeyedDoubleStruct const KeyedDoubleStruct& x) { - m_key_double = x.m_key_double; + m_key_double = x.m_key_double; - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1232,7 +1253,7 @@ class KeyedDoubleStruct const KeyedDoubleStruct& x) const { return (m_key_double == x.m_key_double && - m_var_double == x.m_var_double); + m_var_double == x.m_var_double); } /*! @@ -1273,6 +1294,7 @@ class KeyedDoubleStruct return m_key_double; } + /*! * @brief This function sets a value in member var_double * @param _var_double New value for member var_double @@ -1301,6 +1323,8 @@ class KeyedDoubleStruct return m_var_double; } + + private: double m_key_double{0.0}; @@ -1336,9 +1360,9 @@ class KeyedLongDoubleStruct eProsima_user_DllExport KeyedLongDoubleStruct( const KeyedLongDoubleStruct& x) { - m_key_longdouble = x.m_key_longdouble; + m_key_longdouble = x.m_key_longdouble; - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1361,9 +1385,9 @@ class KeyedLongDoubleStruct const KeyedLongDoubleStruct& x) { - m_key_longdouble = x.m_key_longdouble; + m_key_longdouble = x.m_key_longdouble; - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1389,7 +1413,7 @@ class KeyedLongDoubleStruct const KeyedLongDoubleStruct& x) const { return (m_key_longdouble == x.m_key_longdouble && - m_var_longdouble == x.m_var_longdouble); + m_var_longdouble == x.m_var_longdouble); } /*! @@ -1430,6 +1454,7 @@ class KeyedLongDoubleStruct return m_key_longdouble; } + /*! * @brief This function sets a value in member var_longdouble * @param _var_longdouble New value for member var_longdouble @@ -1458,6 +1483,8 @@ class KeyedLongDoubleStruct return m_var_longdouble; } + + private: long double m_key_longdouble{0.0}; @@ -1493,9 +1520,9 @@ class KeyedBooleanStruct eProsima_user_DllExport KeyedBooleanStruct( const KeyedBooleanStruct& x) { - m_key_boolean = x.m_key_boolean; + m_key_boolean = x.m_key_boolean; - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1518,9 +1545,9 @@ class KeyedBooleanStruct const KeyedBooleanStruct& x) { - m_key_boolean = x.m_key_boolean; + m_key_boolean = x.m_key_boolean; - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1546,7 +1573,7 @@ class KeyedBooleanStruct const KeyedBooleanStruct& x) const { return (m_key_boolean == x.m_key_boolean && - m_var_boolean == x.m_var_boolean); + m_var_boolean == x.m_var_boolean); } /*! @@ -1587,6 +1614,7 @@ class KeyedBooleanStruct return m_key_boolean; } + /*! * @brief This function sets a value in member var_boolean * @param _var_boolean New value for member var_boolean @@ -1615,6 +1643,8 @@ class KeyedBooleanStruct return m_var_boolean; } + + private: bool m_key_boolean{false}; @@ -1650,9 +1680,9 @@ class KeyedOctetStruct eProsima_user_DllExport KeyedOctetStruct( const KeyedOctetStruct& x) { - m_key_octet = x.m_key_octet; + m_key_octet = x.m_key_octet; - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1675,9 +1705,9 @@ class KeyedOctetStruct const KeyedOctetStruct& x) { - m_key_octet = x.m_key_octet; + m_key_octet = x.m_key_octet; - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1703,7 +1733,7 @@ class KeyedOctetStruct const KeyedOctetStruct& x) const { return (m_key_octet == x.m_key_octet && - m_var_octet == x.m_var_octet); + m_var_octet == x.m_var_octet); } /*! @@ -1744,6 +1774,7 @@ class KeyedOctetStruct return m_key_octet; } + /*! * @brief This function sets a value in member var_octet * @param _var_octet New value for member var_octet @@ -1772,6 +1803,8 @@ class KeyedOctetStruct return m_var_octet; } + + private: uint8_t m_key_octet{0}; @@ -1807,9 +1840,9 @@ class KeyedCharStruct eProsima_user_DllExport KeyedCharStruct( const KeyedCharStruct& x) { - m_key_char8 = x.m_key_char8; + m_key_char8 = x.m_key_char8; - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1832,9 +1865,9 @@ class KeyedCharStruct const KeyedCharStruct& x) { - m_key_char8 = x.m_key_char8; + m_key_char8 = x.m_key_char8; - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1860,7 +1893,7 @@ class KeyedCharStruct const KeyedCharStruct& x) const { return (m_key_char8 == x.m_key_char8 && - m_var_char8 == x.m_var_char8); + m_var_char8 == x.m_var_char8); } /*! @@ -1901,6 +1934,7 @@ class KeyedCharStruct return m_key_char8; } + /*! * @brief This function sets a value in member var_char8 * @param _var_char8 New value for member var_char8 @@ -1929,6 +1963,8 @@ class KeyedCharStruct return m_var_char8; } + + private: char m_key_char8{0}; @@ -1964,9 +2000,9 @@ class KeyedWCharStruct eProsima_user_DllExport KeyedWCharStruct( const KeyedWCharStruct& x) { - m_key_char16 = x.m_key_char16; + m_key_char16 = x.m_key_char16; - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1989,9 +2025,9 @@ class KeyedWCharStruct const KeyedWCharStruct& x) { - m_key_char16 = x.m_key_char16; + m_key_char16 = x.m_key_char16; - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -2017,7 +2053,7 @@ class KeyedWCharStruct const KeyedWCharStruct& x) const { return (m_key_char16 == x.m_key_char16 && - m_var_char16 == x.m_var_char16); + m_var_char16 == x.m_var_char16); } /*! @@ -2058,6 +2094,7 @@ class KeyedWCharStruct return m_key_char16; } + /*! * @brief This function sets a value in member var_char16 * @param _var_char16 New value for member var_char16 @@ -2086,6 +2123,8 @@ class KeyedWCharStruct return m_var_char16; } + + private: wchar_t m_key_char16{0}; @@ -2121,7 +2160,7 @@ class KeyedEmptyStruct eProsima_user_DllExport KeyedEmptyStruct( const KeyedEmptyStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; } @@ -2143,7 +2182,7 @@ class KeyedEmptyStruct const KeyedEmptyStruct& x) { - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; return *this; } @@ -2208,6 +2247,8 @@ class KeyedEmptyStruct return m_key_short; } + + private: int16_t m_key_short{0}; @@ -2244,9 +2285,9 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct const KeyedEmptyInheritanceStruct& x) : KeyedEmptyStruct(x) { - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2272,9 +2313,9 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct { KeyedEmptyStruct::operator =(x); - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2301,11 +2342,11 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct const KeyedEmptyInheritanceStruct& x) const { if (KeyedEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_key_str == x.m_key_str && - m_var_str == x.m_var_str); + m_var_str == x.m_var_str); } /*! @@ -2356,6 +2397,7 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct return m_key_str; } + /*! * @brief This function copies the value in member var_str * @param _var_str New value to be copied in member var_str @@ -2394,6 +2436,8 @@ class KeyedEmptyInheritanceStruct : public KeyedEmptyStruct return m_var_str; } + + private: std::string m_key_str; @@ -2431,9 +2475,9 @@ class KeyedInheritanceStruct : public KeyedShortStruct const KeyedInheritanceStruct& x) : KeyedShortStruct(x) { - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2459,9 +2503,9 @@ class KeyedInheritanceStruct : public KeyedShortStruct { KeyedShortStruct::operator =(x); - m_key_str = x.m_key_str; + m_key_str = x.m_key_str; - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2488,11 +2532,11 @@ class KeyedInheritanceStruct : public KeyedShortStruct const KeyedInheritanceStruct& x) const { if (KeyedShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_key_str == x.m_key_str && - m_var_str == x.m_var_str); + m_var_str == x.m_var_str); } /*! @@ -2543,6 +2587,7 @@ class KeyedInheritanceStruct : public KeyedShortStruct return m_key_str; } + /*! * @brief This function copies the value in member var_str * @param _var_str New value to be copied in member var_str @@ -2581,6 +2626,8 @@ class KeyedInheritanceStruct : public KeyedShortStruct return m_var_str; } + + private: std::string m_key_str; @@ -2669,9 +2716,9 @@ class InheritanceKeyedEmptyStruct : public KeyedShortStruct const InheritanceKeyedEmptyStruct& x) const { if (KeyedShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2686,6 +2733,8 @@ class InheritanceKeyedEmptyStruct : public KeyedShortStruct return !(*this == x); } + + private: @@ -2719,11 +2768,11 @@ class KeyedFinal eProsima_user_DllExport KeyedFinal( const KeyedFinal& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -2747,11 +2796,11 @@ class KeyedFinal const KeyedFinal& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -2778,8 +2827,8 @@ class KeyedFinal const KeyedFinal& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -2820,6 +2869,7 @@ class KeyedFinal return m_key_long; } + /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -2848,6 +2898,7 @@ class KeyedFinal return m_key_short; } + /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -2886,6 +2937,8 @@ class KeyedFinal return m_key_string; } + + private: int32_t m_key_long{0}; @@ -2922,11 +2975,11 @@ class KeyedAppendable eProsima_user_DllExport KeyedAppendable( const KeyedAppendable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -2950,11 +3003,11 @@ class KeyedAppendable const KeyedAppendable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -2981,8 +3034,8 @@ class KeyedAppendable const KeyedAppendable& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -3023,6 +3076,7 @@ class KeyedAppendable return m_key_long; } + /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -3051,6 +3105,7 @@ class KeyedAppendable return m_key_short; } + /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -3089,6 +3144,8 @@ class KeyedAppendable return m_key_string; } + + private: int32_t m_key_long{0}; @@ -3125,11 +3182,11 @@ class KeyedMutable eProsima_user_DllExport KeyedMutable( const KeyedMutable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; } @@ -3153,11 +3210,11 @@ class KeyedMutable const KeyedMutable& x) { - m_key_long = x.m_key_long; + m_key_long = x.m_key_long; - m_key_short = x.m_key_short; + m_key_short = x.m_key_short; - m_key_string = x.m_key_string; + m_key_string = x.m_key_string; return *this; } @@ -3184,8 +3241,8 @@ class KeyedMutable const KeyedMutable& x) const { return (m_key_long == x.m_key_long && - m_key_short == x.m_key_short && - m_key_string == x.m_key_string); + m_key_short == x.m_key_short && + m_key_string == x.m_key_string); } /*! @@ -3226,6 +3283,7 @@ class KeyedMutable return m_key_long; } + /*! * @brief This function sets a value in member key_short * @param _key_short New value for member key_short @@ -3254,6 +3312,7 @@ class KeyedMutable return m_key_short; } + /*! * @brief This function copies the value in member key_string * @param _key_string New value to be copied in member key_string @@ -3292,6 +3351,8 @@ class KeyedMutable return m_key_string; } + + private: int32_t m_key_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp index 953490e5..feb3ddf3 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/maps.hpp @@ -82,7 +82,7 @@ class MapShortShort eProsima_user_DllExport MapShortShort( const MapShortShort& x) { - m_var_map_short_short = x.m_var_map_short_short; + m_var_map_short_short = x.m_var_map_short_short; } @@ -104,7 +104,7 @@ class MapShortShort const MapShortShort& x) { - m_var_map_short_short = x.m_var_map_short_short; + m_var_map_short_short = x.m_var_map_short_short; return *this; } @@ -179,6 +179,8 @@ class MapShortShort return m_var_map_short_short; } + + private: std::map m_var_map_short_short; @@ -213,7 +215,7 @@ class MapShortUShort eProsima_user_DllExport MapShortUShort( const MapShortUShort& x) { - m_var_map_short_ushort = x.m_var_map_short_ushort; + m_var_map_short_ushort = x.m_var_map_short_ushort; } @@ -235,7 +237,7 @@ class MapShortUShort const MapShortUShort& x) { - m_var_map_short_ushort = x.m_var_map_short_ushort; + m_var_map_short_ushort = x.m_var_map_short_ushort; return *this; } @@ -310,6 +312,8 @@ class MapShortUShort return m_var_map_short_ushort; } + + private: std::map m_var_map_short_ushort; @@ -344,7 +348,7 @@ class MapShortLong eProsima_user_DllExport MapShortLong( const MapShortLong& x) { - m_var_map_short_long = x.m_var_map_short_long; + m_var_map_short_long = x.m_var_map_short_long; } @@ -366,7 +370,7 @@ class MapShortLong const MapShortLong& x) { - m_var_map_short_long = x.m_var_map_short_long; + m_var_map_short_long = x.m_var_map_short_long; return *this; } @@ -441,6 +445,8 @@ class MapShortLong return m_var_map_short_long; } + + private: std::map m_var_map_short_long; @@ -475,7 +481,7 @@ class MapShortULong eProsima_user_DllExport MapShortULong( const MapShortULong& x) { - m_var_map_short_ulong = x.m_var_map_short_ulong; + m_var_map_short_ulong = x.m_var_map_short_ulong; } @@ -497,7 +503,7 @@ class MapShortULong const MapShortULong& x) { - m_var_map_short_ulong = x.m_var_map_short_ulong; + m_var_map_short_ulong = x.m_var_map_short_ulong; return *this; } @@ -572,6 +578,8 @@ class MapShortULong return m_var_map_short_ulong; } + + private: std::map m_var_map_short_ulong; @@ -606,7 +614,7 @@ class MapShortLongLong eProsima_user_DllExport MapShortLongLong( const MapShortLongLong& x) { - m_var_map_short_longlong = x.m_var_map_short_longlong; + m_var_map_short_longlong = x.m_var_map_short_longlong; } @@ -628,7 +636,7 @@ class MapShortLongLong const MapShortLongLong& x) { - m_var_map_short_longlong = x.m_var_map_short_longlong; + m_var_map_short_longlong = x.m_var_map_short_longlong; return *this; } @@ -703,6 +711,8 @@ class MapShortLongLong return m_var_map_short_longlong; } + + private: std::map m_var_map_short_longlong; @@ -737,7 +747,7 @@ class MapShortULongLong eProsima_user_DllExport MapShortULongLong( const MapShortULongLong& x) { - m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; + m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; } @@ -759,7 +769,7 @@ class MapShortULongLong const MapShortULongLong& x) { - m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; + m_var_map_short_ulonglong = x.m_var_map_short_ulonglong; return *this; } @@ -834,6 +844,8 @@ class MapShortULongLong return m_var_map_short_ulonglong; } + + private: std::map m_var_map_short_ulonglong; @@ -868,7 +880,7 @@ class MapShortFloat eProsima_user_DllExport MapShortFloat( const MapShortFloat& x) { - m_var_map_short_float = x.m_var_map_short_float; + m_var_map_short_float = x.m_var_map_short_float; } @@ -890,7 +902,7 @@ class MapShortFloat const MapShortFloat& x) { - m_var_map_short_float = x.m_var_map_short_float; + m_var_map_short_float = x.m_var_map_short_float; return *this; } @@ -965,6 +977,8 @@ class MapShortFloat return m_var_map_short_float; } + + private: std::map m_var_map_short_float; @@ -999,7 +1013,7 @@ class MapShortDouble eProsima_user_DllExport MapShortDouble( const MapShortDouble& x) { - m_var_map_short_double = x.m_var_map_short_double; + m_var_map_short_double = x.m_var_map_short_double; } @@ -1021,7 +1035,7 @@ class MapShortDouble const MapShortDouble& x) { - m_var_map_short_double = x.m_var_map_short_double; + m_var_map_short_double = x.m_var_map_short_double; return *this; } @@ -1096,6 +1110,8 @@ class MapShortDouble return m_var_map_short_double; } + + private: std::map m_var_map_short_double; @@ -1130,7 +1146,7 @@ class MapShortLongDouble eProsima_user_DllExport MapShortLongDouble( const MapShortLongDouble& x) { - m_var_map_short_longdouble = x.m_var_map_short_longdouble; + m_var_map_short_longdouble = x.m_var_map_short_longdouble; } @@ -1152,7 +1168,7 @@ class MapShortLongDouble const MapShortLongDouble& x) { - m_var_map_short_longdouble = x.m_var_map_short_longdouble; + m_var_map_short_longdouble = x.m_var_map_short_longdouble; return *this; } @@ -1227,6 +1243,8 @@ class MapShortLongDouble return m_var_map_short_longdouble; } + + private: std::map m_var_map_short_longdouble; @@ -1261,7 +1279,7 @@ class MapShortBoolean eProsima_user_DllExport MapShortBoolean( const MapShortBoolean& x) { - m_var_map_short_boolean = x.m_var_map_short_boolean; + m_var_map_short_boolean = x.m_var_map_short_boolean; } @@ -1283,7 +1301,7 @@ class MapShortBoolean const MapShortBoolean& x) { - m_var_map_short_boolean = x.m_var_map_short_boolean; + m_var_map_short_boolean = x.m_var_map_short_boolean; return *this; } @@ -1358,6 +1376,8 @@ class MapShortBoolean return m_var_map_short_boolean; } + + private: std::map m_var_map_short_boolean; @@ -1392,7 +1412,7 @@ class MapShortOctet eProsima_user_DllExport MapShortOctet( const MapShortOctet& x) { - m_var_map_short_octet = x.m_var_map_short_octet; + m_var_map_short_octet = x.m_var_map_short_octet; } @@ -1414,7 +1434,7 @@ class MapShortOctet const MapShortOctet& x) { - m_var_map_short_octet = x.m_var_map_short_octet; + m_var_map_short_octet = x.m_var_map_short_octet; return *this; } @@ -1489,6 +1509,8 @@ class MapShortOctet return m_var_map_short_octet; } + + private: std::map m_var_map_short_octet; @@ -1523,7 +1545,7 @@ class MapShortChar eProsima_user_DllExport MapShortChar( const MapShortChar& x) { - m_var_map_short_char = x.m_var_map_short_char; + m_var_map_short_char = x.m_var_map_short_char; } @@ -1545,7 +1567,7 @@ class MapShortChar const MapShortChar& x) { - m_var_map_short_char = x.m_var_map_short_char; + m_var_map_short_char = x.m_var_map_short_char; return *this; } @@ -1620,6 +1642,8 @@ class MapShortChar return m_var_map_short_char; } + + private: std::map m_var_map_short_char; @@ -1654,7 +1678,7 @@ class MapShortWChar eProsima_user_DllExport MapShortWChar( const MapShortWChar& x) { - m_var_map_short_wchar = x.m_var_map_short_wchar; + m_var_map_short_wchar = x.m_var_map_short_wchar; } @@ -1676,7 +1700,7 @@ class MapShortWChar const MapShortWChar& x) { - m_var_map_short_wchar = x.m_var_map_short_wchar; + m_var_map_short_wchar = x.m_var_map_short_wchar; return *this; } @@ -1751,6 +1775,8 @@ class MapShortWChar return m_var_map_short_wchar; } + + private: std::map m_var_map_short_wchar; @@ -1785,7 +1811,7 @@ class MapShortString eProsima_user_DllExport MapShortString( const MapShortString& x) { - m_var_map_short_string = x.m_var_map_short_string; + m_var_map_short_string = x.m_var_map_short_string; } @@ -1807,7 +1833,7 @@ class MapShortString const MapShortString& x) { - m_var_map_short_string = x.m_var_map_short_string; + m_var_map_short_string = x.m_var_map_short_string; return *this; } @@ -1882,6 +1908,8 @@ class MapShortString return m_var_map_short_string; } + + private: std::map m_var_map_short_string; @@ -1916,7 +1944,7 @@ class MapShortWString eProsima_user_DllExport MapShortWString( const MapShortWString& x) { - m_var_map_short_wstring = x.m_var_map_short_wstring; + m_var_map_short_wstring = x.m_var_map_short_wstring; } @@ -1938,7 +1966,7 @@ class MapShortWString const MapShortWString& x) { - m_var_map_short_wstring = x.m_var_map_short_wstring; + m_var_map_short_wstring = x.m_var_map_short_wstring; return *this; } @@ -2013,6 +2041,8 @@ class MapShortWString return m_var_map_short_wstring; } + + private: std::map m_var_map_short_wstring; @@ -2047,7 +2077,7 @@ class MapShortInnerAliasBoundedStringHelper eProsima_user_DllExport MapShortInnerAliasBoundedStringHelper( const MapShortInnerAliasBoundedStringHelper& x) { - m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; + m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; } @@ -2069,7 +2099,7 @@ class MapShortInnerAliasBoundedStringHelper const MapShortInnerAliasBoundedStringHelper& x) { - m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; + m_var_map_short_inneraliasboundedstringhelper = x.m_var_map_short_inneraliasboundedstringhelper; return *this; } @@ -2130,8 +2160,7 @@ class MapShortInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_short_inneraliasboundedstringhelper * @return Constant reference to member var_map_short_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedstringhelper() const { return m_var_map_short_inneraliasboundedstringhelper; } @@ -2140,12 +2169,13 @@ class MapShortInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_short_inneraliasboundedstringhelper * @return Reference to member var_map_short_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_short_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_short_inneraliasboundedstringhelper() { return m_var_map_short_inneraliasboundedstringhelper; } + + private: std::map m_var_map_short_inneraliasboundedstringhelper; @@ -2180,7 +2210,7 @@ class MapShortInnerAliasBoundedWStringHelper eProsima_user_DllExport MapShortInnerAliasBoundedWStringHelper( const MapShortInnerAliasBoundedWStringHelper& x) { - m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; + m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; } @@ -2202,7 +2232,7 @@ class MapShortInnerAliasBoundedWStringHelper const MapShortInnerAliasBoundedWStringHelper& x) { - m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; + m_var_map_short_inneraliasboundedwstringhelper = x.m_var_map_short_inneraliasboundedwstringhelper; return *this; } @@ -2263,8 +2293,7 @@ class MapShortInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_short_inneraliasboundedwstringhelper * @return Constant reference to member var_map_short_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasboundedwstringhelper() const { return m_var_map_short_inneraliasboundedwstringhelper; } @@ -2273,12 +2302,13 @@ class MapShortInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_short_inneraliasboundedwstringhelper * @return Reference to member var_map_short_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_short_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_short_inneraliasboundedwstringhelper() { return m_var_map_short_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_short_inneraliasboundedwstringhelper; @@ -2313,7 +2343,7 @@ class MapShortInnerEnumHelper eProsima_user_DllExport MapShortInnerEnumHelper( const MapShortInnerEnumHelper& x) { - m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; + m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; } @@ -2335,7 +2365,7 @@ class MapShortInnerEnumHelper const MapShortInnerEnumHelper& x) { - m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; + m_var_map_short_innerenumhelper = x.m_var_map_short_innerenumhelper; return *this; } @@ -2410,6 +2440,8 @@ class MapShortInnerEnumHelper return m_var_map_short_innerenumhelper; } + + private: std::map m_var_map_short_innerenumhelper; @@ -2444,7 +2476,7 @@ class MapShortInnerBitMaskHelper eProsima_user_DllExport MapShortInnerBitMaskHelper( const MapShortInnerBitMaskHelper& x) { - m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; + m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; } @@ -2466,7 +2498,7 @@ class MapShortInnerBitMaskHelper const MapShortInnerBitMaskHelper& x) { - m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; + m_var_map_short_innerbitmaskhelper = x.m_var_map_short_innerbitmaskhelper; return *this; } @@ -2541,6 +2573,8 @@ class MapShortInnerBitMaskHelper return m_var_map_short_innerbitmaskhelper; } + + private: std::map m_var_map_short_innerbitmaskhelper; @@ -2575,7 +2609,7 @@ class MapShortInnerAliasHelper eProsima_user_DllExport MapShortInnerAliasHelper( const MapShortInnerAliasHelper& x) { - m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; + m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; } @@ -2597,7 +2631,7 @@ class MapShortInnerAliasHelper const MapShortInnerAliasHelper& x) { - m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; + m_var_map_short_inneraliashelper = x.m_var_map_short_inneraliashelper; return *this; } @@ -2672,6 +2706,8 @@ class MapShortInnerAliasHelper return m_var_map_short_inneraliashelper; } + + private: std::map m_var_map_short_inneraliashelper; @@ -2706,7 +2742,7 @@ class MapShortInnerAliasArrayHelper eProsima_user_DllExport MapShortInnerAliasArrayHelper( const MapShortInnerAliasArrayHelper& x) { - m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; + m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; } @@ -2728,7 +2764,7 @@ class MapShortInnerAliasArrayHelper const MapShortInnerAliasArrayHelper& x) { - m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; + m_var_map_short_inneraliasarrayhelper = x.m_var_map_short_inneraliasarrayhelper; return *this; } @@ -2789,8 +2825,7 @@ class MapShortInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_short_inneraliasarrayhelper * @return Constant reference to member var_map_short_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliasarrayhelper() const { return m_var_map_short_inneraliasarrayhelper; } @@ -2804,6 +2839,8 @@ class MapShortInnerAliasArrayHelper return m_var_map_short_inneraliasarrayhelper; } + + private: std::map m_var_map_short_inneraliasarrayhelper; @@ -2838,7 +2875,7 @@ class MapShortInnerAliasSequenceHelper eProsima_user_DllExport MapShortInnerAliasSequenceHelper( const MapShortInnerAliasSequenceHelper& x) { - m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; + m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; } @@ -2860,7 +2897,7 @@ class MapShortInnerAliasSequenceHelper const MapShortInnerAliasSequenceHelper& x) { - m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; + m_var_map_short_inneraliassequencehelper = x.m_var_map_short_inneraliassequencehelper; return *this; } @@ -2921,8 +2958,7 @@ class MapShortInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_short_inneraliassequencehelper * @return Constant reference to member var_map_short_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_short_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_short_inneraliassequencehelper() const { return m_var_map_short_inneraliassequencehelper; } @@ -2936,6 +2972,8 @@ class MapShortInnerAliasSequenceHelper return m_var_map_short_inneraliassequencehelper; } + + private: std::map m_var_map_short_inneraliassequencehelper; @@ -2970,7 +3008,7 @@ class MapShortInnerAliasMapHelper eProsima_user_DllExport MapShortInnerAliasMapHelper( const MapShortInnerAliasMapHelper& x) { - m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; + m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; } @@ -2992,7 +3030,7 @@ class MapShortInnerAliasMapHelper const MapShortInnerAliasMapHelper& x) { - m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; + m_var_map_short_inneraliasmaphelper = x.m_var_map_short_inneraliasmaphelper; return *this; } @@ -3067,6 +3105,8 @@ class MapShortInnerAliasMapHelper return m_var_map_short_inneraliasmaphelper; } + + private: std::map m_var_map_short_inneraliasmaphelper; @@ -3101,7 +3141,7 @@ class MapShortInnerUnionHelper eProsima_user_DllExport MapShortInnerUnionHelper( const MapShortInnerUnionHelper& x) { - m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; + m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; } @@ -3123,7 +3163,7 @@ class MapShortInnerUnionHelper const MapShortInnerUnionHelper& x) { - m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; + m_var_map_short_innerunionhelper = x.m_var_map_short_innerunionhelper; return *this; } @@ -3198,6 +3238,8 @@ class MapShortInnerUnionHelper return m_var_map_short_innerunionhelper; } + + private: std::map m_var_map_short_innerunionhelper; @@ -3232,7 +3274,7 @@ class MapShortInnerStructureHelper eProsima_user_DllExport MapShortInnerStructureHelper( const MapShortInnerStructureHelper& x) { - m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; + m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; } @@ -3254,7 +3296,7 @@ class MapShortInnerStructureHelper const MapShortInnerStructureHelper& x) { - m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; + m_var_map_short_innerstructurehelper = x.m_var_map_short_innerstructurehelper; return *this; } @@ -3329,6 +3371,8 @@ class MapShortInnerStructureHelper return m_var_map_short_innerstructurehelper; } + + private: std::map m_var_map_short_innerstructurehelper; @@ -3363,7 +3407,7 @@ class MapShortInnerBitsetHelper eProsima_user_DllExport MapShortInnerBitsetHelper( const MapShortInnerBitsetHelper& x) { - m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; + m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; } @@ -3385,7 +3429,7 @@ class MapShortInnerBitsetHelper const MapShortInnerBitsetHelper& x) { - m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; + m_var_map_short_innerbitsethelper = x.m_var_map_short_innerbitsethelper; return *this; } @@ -3460,6 +3504,8 @@ class MapShortInnerBitsetHelper return m_var_map_short_innerbitsethelper; } + + private: std::map m_var_map_short_innerbitsethelper; @@ -3494,7 +3540,7 @@ class MapUShortShort eProsima_user_DllExport MapUShortShort( const MapUShortShort& x) { - m_var_map_ushort_short = x.m_var_map_ushort_short; + m_var_map_ushort_short = x.m_var_map_ushort_short; } @@ -3516,7 +3562,7 @@ class MapUShortShort const MapUShortShort& x) { - m_var_map_ushort_short = x.m_var_map_ushort_short; + m_var_map_ushort_short = x.m_var_map_ushort_short; return *this; } @@ -3591,6 +3637,8 @@ class MapUShortShort return m_var_map_ushort_short; } + + private: std::map m_var_map_ushort_short; @@ -3625,7 +3673,7 @@ class MapUShortUShort eProsima_user_DllExport MapUShortUShort( const MapUShortUShort& x) { - m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; + m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; } @@ -3647,7 +3695,7 @@ class MapUShortUShort const MapUShortUShort& x) { - m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; + m_var_map_ushort_ushort = x.m_var_map_ushort_ushort; return *this; } @@ -3722,6 +3770,8 @@ class MapUShortUShort return m_var_map_ushort_ushort; } + + private: std::map m_var_map_ushort_ushort; @@ -3756,7 +3806,7 @@ class MapUShortLong eProsima_user_DllExport MapUShortLong( const MapUShortLong& x) { - m_var_map_ushort_long = x.m_var_map_ushort_long; + m_var_map_ushort_long = x.m_var_map_ushort_long; } @@ -3778,7 +3828,7 @@ class MapUShortLong const MapUShortLong& x) { - m_var_map_ushort_long = x.m_var_map_ushort_long; + m_var_map_ushort_long = x.m_var_map_ushort_long; return *this; } @@ -3853,6 +3903,8 @@ class MapUShortLong return m_var_map_ushort_long; } + + private: std::map m_var_map_ushort_long; @@ -3887,7 +3939,7 @@ class MapUShortULong eProsima_user_DllExport MapUShortULong( const MapUShortULong& x) { - m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; + m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; } @@ -3909,7 +3961,7 @@ class MapUShortULong const MapUShortULong& x) { - m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; + m_var_map_ushort_ulong = x.m_var_map_ushort_ulong; return *this; } @@ -3984,6 +4036,8 @@ class MapUShortULong return m_var_map_ushort_ulong; } + + private: std::map m_var_map_ushort_ulong; @@ -4018,7 +4072,7 @@ class MapUShortLongLong eProsima_user_DllExport MapUShortLongLong( const MapUShortLongLong& x) { - m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; + m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; } @@ -4040,7 +4094,7 @@ class MapUShortLongLong const MapUShortLongLong& x) { - m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; + m_var_map_ushort_longlong = x.m_var_map_ushort_longlong; return *this; } @@ -4115,6 +4169,8 @@ class MapUShortLongLong return m_var_map_ushort_longlong; } + + private: std::map m_var_map_ushort_longlong; @@ -4149,7 +4205,7 @@ class MapUShortULongLong eProsima_user_DllExport MapUShortULongLong( const MapUShortULongLong& x) { - m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; + m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; } @@ -4171,7 +4227,7 @@ class MapUShortULongLong const MapUShortULongLong& x) { - m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; + m_var_map_ushort_ulonglong = x.m_var_map_ushort_ulonglong; return *this; } @@ -4246,6 +4302,8 @@ class MapUShortULongLong return m_var_map_ushort_ulonglong; } + + private: std::map m_var_map_ushort_ulonglong; @@ -4280,7 +4338,7 @@ class MapUShortFloat eProsima_user_DllExport MapUShortFloat( const MapUShortFloat& x) { - m_var_map_ushort_float = x.m_var_map_ushort_float; + m_var_map_ushort_float = x.m_var_map_ushort_float; } @@ -4302,7 +4360,7 @@ class MapUShortFloat const MapUShortFloat& x) { - m_var_map_ushort_float = x.m_var_map_ushort_float; + m_var_map_ushort_float = x.m_var_map_ushort_float; return *this; } @@ -4377,6 +4435,8 @@ class MapUShortFloat return m_var_map_ushort_float; } + + private: std::map m_var_map_ushort_float; @@ -4411,7 +4471,7 @@ class MapUShortDouble eProsima_user_DllExport MapUShortDouble( const MapUShortDouble& x) { - m_var_map_ushort_double = x.m_var_map_ushort_double; + m_var_map_ushort_double = x.m_var_map_ushort_double; } @@ -4433,7 +4493,7 @@ class MapUShortDouble const MapUShortDouble& x) { - m_var_map_ushort_double = x.m_var_map_ushort_double; + m_var_map_ushort_double = x.m_var_map_ushort_double; return *this; } @@ -4508,6 +4568,8 @@ class MapUShortDouble return m_var_map_ushort_double; } + + private: std::map m_var_map_ushort_double; @@ -4542,7 +4604,7 @@ class MapUShortLongDouble eProsima_user_DllExport MapUShortLongDouble( const MapUShortLongDouble& x) { - m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; + m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; } @@ -4564,7 +4626,7 @@ class MapUShortLongDouble const MapUShortLongDouble& x) { - m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; + m_var_map_ushort_longdouble = x.m_var_map_ushort_longdouble; return *this; } @@ -4639,6 +4701,8 @@ class MapUShortLongDouble return m_var_map_ushort_longdouble; } + + private: std::map m_var_map_ushort_longdouble; @@ -4673,7 +4737,7 @@ class MapUShortBoolean eProsima_user_DllExport MapUShortBoolean( const MapUShortBoolean& x) { - m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; + m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; } @@ -4695,7 +4759,7 @@ class MapUShortBoolean const MapUShortBoolean& x) { - m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; + m_var_map_ushort_boolean = x.m_var_map_ushort_boolean; return *this; } @@ -4770,6 +4834,8 @@ class MapUShortBoolean return m_var_map_ushort_boolean; } + + private: std::map m_var_map_ushort_boolean; @@ -4804,7 +4870,7 @@ class MapUShortOctet eProsima_user_DllExport MapUShortOctet( const MapUShortOctet& x) { - m_var_map_ushort_octet = x.m_var_map_ushort_octet; + m_var_map_ushort_octet = x.m_var_map_ushort_octet; } @@ -4826,7 +4892,7 @@ class MapUShortOctet const MapUShortOctet& x) { - m_var_map_ushort_octet = x.m_var_map_ushort_octet; + m_var_map_ushort_octet = x.m_var_map_ushort_octet; return *this; } @@ -4901,6 +4967,8 @@ class MapUShortOctet return m_var_map_ushort_octet; } + + private: std::map m_var_map_ushort_octet; @@ -4935,7 +5003,7 @@ class MapUShortChar eProsima_user_DllExport MapUShortChar( const MapUShortChar& x) { - m_var_map_ushort_char = x.m_var_map_ushort_char; + m_var_map_ushort_char = x.m_var_map_ushort_char; } @@ -4957,7 +5025,7 @@ class MapUShortChar const MapUShortChar& x) { - m_var_map_ushort_char = x.m_var_map_ushort_char; + m_var_map_ushort_char = x.m_var_map_ushort_char; return *this; } @@ -5032,6 +5100,8 @@ class MapUShortChar return m_var_map_ushort_char; } + + private: std::map m_var_map_ushort_char; @@ -5066,7 +5136,7 @@ class MapUShortWChar eProsima_user_DllExport MapUShortWChar( const MapUShortWChar& x) { - m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; + m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; } @@ -5088,7 +5158,7 @@ class MapUShortWChar const MapUShortWChar& x) { - m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; + m_var_map_ushort_wchar = x.m_var_map_ushort_wchar; return *this; } @@ -5163,6 +5233,8 @@ class MapUShortWChar return m_var_map_ushort_wchar; } + + private: std::map m_var_map_ushort_wchar; @@ -5197,7 +5269,7 @@ class MapUShortString eProsima_user_DllExport MapUShortString( const MapUShortString& x) { - m_var_map_ushort_string = x.m_var_map_ushort_string; + m_var_map_ushort_string = x.m_var_map_ushort_string; } @@ -5219,7 +5291,7 @@ class MapUShortString const MapUShortString& x) { - m_var_map_ushort_string = x.m_var_map_ushort_string; + m_var_map_ushort_string = x.m_var_map_ushort_string; return *this; } @@ -5294,6 +5366,8 @@ class MapUShortString return m_var_map_ushort_string; } + + private: std::map m_var_map_ushort_string; @@ -5328,7 +5402,7 @@ class MapUShortWString eProsima_user_DllExport MapUShortWString( const MapUShortWString& x) { - m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; + m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; } @@ -5350,7 +5424,7 @@ class MapUShortWString const MapUShortWString& x) { - m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; + m_var_map_ushort_wstring = x.m_var_map_ushort_wstring; return *this; } @@ -5425,6 +5499,8 @@ class MapUShortWString return m_var_map_ushort_wstring; } + + private: std::map m_var_map_ushort_wstring; @@ -5459,7 +5535,7 @@ class MapUShortInnerAliasBoundedStringHelper eProsima_user_DllExport MapUShortInnerAliasBoundedStringHelper( const MapUShortInnerAliasBoundedStringHelper& x) { - m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; + m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; } @@ -5481,7 +5557,7 @@ class MapUShortInnerAliasBoundedStringHelper const MapUShortInnerAliasBoundedStringHelper& x) { - m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; + m_var_map_ushort_inneraliasboundedstringhelper = x.m_var_map_ushort_inneraliasboundedstringhelper; return *this; } @@ -5542,8 +5618,7 @@ class MapUShortInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasboundedstringhelper * @return Constant reference to member var_map_ushort_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedstringhelper() const { return m_var_map_ushort_inneraliasboundedstringhelper; } @@ -5552,12 +5627,13 @@ class MapUShortInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_ushort_inneraliasboundedstringhelper * @return Reference to member var_map_ushort_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedstringhelper() { return m_var_map_ushort_inneraliasboundedstringhelper; } + + private: std::map m_var_map_ushort_inneraliasboundedstringhelper; @@ -5592,7 +5668,7 @@ class MapUShortInnerAliasBoundedWStringHelper eProsima_user_DllExport MapUShortInnerAliasBoundedWStringHelper( const MapUShortInnerAliasBoundedWStringHelper& x) { - m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; + m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; } @@ -5614,7 +5690,7 @@ class MapUShortInnerAliasBoundedWStringHelper const MapUShortInnerAliasBoundedWStringHelper& x) { - m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; + m_var_map_ushort_inneraliasboundedwstringhelper = x.m_var_map_ushort_inneraliasboundedwstringhelper; return *this; } @@ -5656,8 +5732,7 @@ class MapUShortInnerAliasBoundedWStringHelper * @param _var_map_ushort_inneraliasboundedwstringhelper New value to be copied in member var_map_ushort_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_ushort_inneraliasboundedwstringhelper( - const std::map& _var_map_ushort_inneraliasboundedwstringhelper) + const std::map& _var_map_ushort_inneraliasboundedwstringhelper) { m_var_map_ushort_inneraliasboundedwstringhelper = _var_map_ushort_inneraliasboundedwstringhelper; } @@ -5676,8 +5751,7 @@ class MapUShortInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasboundedwstringhelper * @return Constant reference to member var_map_ushort_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasboundedwstringhelper() const { return m_var_map_ushort_inneraliasboundedwstringhelper; } @@ -5686,12 +5760,13 @@ class MapUShortInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_ushort_inneraliasboundedwstringhelper * @return Reference to member var_map_ushort_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_ushort_inneraliasboundedwstringhelper() { return m_var_map_ushort_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_ushort_inneraliasboundedwstringhelper; @@ -5726,7 +5801,7 @@ class MapUShortInnerEnumHelper eProsima_user_DllExport MapUShortInnerEnumHelper( const MapUShortInnerEnumHelper& x) { - m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; + m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; } @@ -5748,7 +5823,7 @@ class MapUShortInnerEnumHelper const MapUShortInnerEnumHelper& x) { - m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; + m_var_map_ushort_innerenumhelper = x.m_var_map_ushort_innerenumhelper; return *this; } @@ -5823,6 +5898,8 @@ class MapUShortInnerEnumHelper return m_var_map_ushort_innerenumhelper; } + + private: std::map m_var_map_ushort_innerenumhelper; @@ -5857,7 +5934,7 @@ class MapUShortInnerBitMaskHelper eProsima_user_DllExport MapUShortInnerBitMaskHelper( const MapUShortInnerBitMaskHelper& x) { - m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; + m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; } @@ -5879,7 +5956,7 @@ class MapUShortInnerBitMaskHelper const MapUShortInnerBitMaskHelper& x) { - m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; + m_var_map_ushort_innerbitmaskhelper = x.m_var_map_ushort_innerbitmaskhelper; return *this; } @@ -5954,6 +6031,8 @@ class MapUShortInnerBitMaskHelper return m_var_map_ushort_innerbitmaskhelper; } + + private: std::map m_var_map_ushort_innerbitmaskhelper; @@ -5988,7 +6067,7 @@ class MapUShortInnerAliasHelper eProsima_user_DllExport MapUShortInnerAliasHelper( const MapUShortInnerAliasHelper& x) { - m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; + m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; } @@ -6010,7 +6089,7 @@ class MapUShortInnerAliasHelper const MapUShortInnerAliasHelper& x) { - m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; + m_var_map_ushort_inneraliashelper = x.m_var_map_ushort_inneraliashelper; return *this; } @@ -6085,6 +6164,8 @@ class MapUShortInnerAliasHelper return m_var_map_ushort_inneraliashelper; } + + private: std::map m_var_map_ushort_inneraliashelper; @@ -6119,7 +6200,7 @@ class MapUShortInnerAliasArrayHelper eProsima_user_DllExport MapUShortInnerAliasArrayHelper( const MapUShortInnerAliasArrayHelper& x) { - m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; + m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; } @@ -6141,7 +6222,7 @@ class MapUShortInnerAliasArrayHelper const MapUShortInnerAliasArrayHelper& x) { - m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; + m_var_map_ushort_inneraliasarrayhelper = x.m_var_map_ushort_inneraliasarrayhelper; return *this; } @@ -6202,8 +6283,7 @@ class MapUShortInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliasarrayhelper * @return Constant reference to member var_map_ushort_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliasarrayhelper() const { return m_var_map_ushort_inneraliasarrayhelper; } @@ -6217,6 +6297,8 @@ class MapUShortInnerAliasArrayHelper return m_var_map_ushort_inneraliasarrayhelper; } + + private: std::map m_var_map_ushort_inneraliasarrayhelper; @@ -6251,7 +6333,7 @@ class MapUShortInnerAliasSequenceHelper eProsima_user_DllExport MapUShortInnerAliasSequenceHelper( const MapUShortInnerAliasSequenceHelper& x) { - m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; + m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; } @@ -6273,7 +6355,7 @@ class MapUShortInnerAliasSequenceHelper const MapUShortInnerAliasSequenceHelper& x) { - m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; + m_var_map_ushort_inneraliassequencehelper = x.m_var_map_ushort_inneraliassequencehelper; return *this; } @@ -6334,8 +6416,7 @@ class MapUShortInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_ushort_inneraliassequencehelper * @return Constant reference to member var_map_ushort_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_ushort_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_ushort_inneraliassequencehelper() const { return m_var_map_ushort_inneraliassequencehelper; } @@ -6349,6 +6430,8 @@ class MapUShortInnerAliasSequenceHelper return m_var_map_ushort_inneraliassequencehelper; } + + private: std::map m_var_map_ushort_inneraliassequencehelper; @@ -6383,7 +6466,7 @@ class MapUShortInnerAliasMapHelper eProsima_user_DllExport MapUShortInnerAliasMapHelper( const MapUShortInnerAliasMapHelper& x) { - m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; + m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; } @@ -6405,7 +6488,7 @@ class MapUShortInnerAliasMapHelper const MapUShortInnerAliasMapHelper& x) { - m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; + m_var_map_ushort_inneraliasmaphelper = x.m_var_map_ushort_inneraliasmaphelper; return *this; } @@ -6480,6 +6563,8 @@ class MapUShortInnerAliasMapHelper return m_var_map_ushort_inneraliasmaphelper; } + + private: std::map m_var_map_ushort_inneraliasmaphelper; @@ -6514,7 +6599,7 @@ class MapUShortInnerUnionHelper eProsima_user_DllExport MapUShortInnerUnionHelper( const MapUShortInnerUnionHelper& x) { - m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; + m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; } @@ -6536,7 +6621,7 @@ class MapUShortInnerUnionHelper const MapUShortInnerUnionHelper& x) { - m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; + m_var_map_ushort_innerunionhelper = x.m_var_map_ushort_innerunionhelper; return *this; } @@ -6611,6 +6696,8 @@ class MapUShortInnerUnionHelper return m_var_map_ushort_innerunionhelper; } + + private: std::map m_var_map_ushort_innerunionhelper; @@ -6645,7 +6732,7 @@ class MapUShortInnerStructureHelper eProsima_user_DllExport MapUShortInnerStructureHelper( const MapUShortInnerStructureHelper& x) { - m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; + m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; } @@ -6667,7 +6754,7 @@ class MapUShortInnerStructureHelper const MapUShortInnerStructureHelper& x) { - m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; + m_var_map_ushort_innerstructurehelper = x.m_var_map_ushort_innerstructurehelper; return *this; } @@ -6742,6 +6829,8 @@ class MapUShortInnerStructureHelper return m_var_map_ushort_innerstructurehelper; } + + private: std::map m_var_map_ushort_innerstructurehelper; @@ -6776,7 +6865,7 @@ class MapUShortInnerBitsetHelper eProsima_user_DllExport MapUShortInnerBitsetHelper( const MapUShortInnerBitsetHelper& x) { - m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; + m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; } @@ -6798,7 +6887,7 @@ class MapUShortInnerBitsetHelper const MapUShortInnerBitsetHelper& x) { - m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; + m_var_map_ushort_innerbitsethelper = x.m_var_map_ushort_innerbitsethelper; return *this; } @@ -6873,6 +6962,8 @@ class MapUShortInnerBitsetHelper return m_var_map_ushort_innerbitsethelper; } + + private: std::map m_var_map_ushort_innerbitsethelper; @@ -6907,7 +6998,7 @@ class MapLongShort eProsima_user_DllExport MapLongShort( const MapLongShort& x) { - m_var_map_long_short = x.m_var_map_long_short; + m_var_map_long_short = x.m_var_map_long_short; } @@ -6929,7 +7020,7 @@ class MapLongShort const MapLongShort& x) { - m_var_map_long_short = x.m_var_map_long_short; + m_var_map_long_short = x.m_var_map_long_short; return *this; } @@ -7004,6 +7095,8 @@ class MapLongShort return m_var_map_long_short; } + + private: std::map m_var_map_long_short; @@ -7038,7 +7131,7 @@ class MapLongUShort eProsima_user_DllExport MapLongUShort( const MapLongUShort& x) { - m_var_map_long_ushort = x.m_var_map_long_ushort; + m_var_map_long_ushort = x.m_var_map_long_ushort; } @@ -7060,7 +7153,7 @@ class MapLongUShort const MapLongUShort& x) { - m_var_map_long_ushort = x.m_var_map_long_ushort; + m_var_map_long_ushort = x.m_var_map_long_ushort; return *this; } @@ -7135,6 +7228,8 @@ class MapLongUShort return m_var_map_long_ushort; } + + private: std::map m_var_map_long_ushort; @@ -7169,7 +7264,7 @@ class MapLongLong eProsima_user_DllExport MapLongLong( const MapLongLong& x) { - m_var_map_long_long = x.m_var_map_long_long; + m_var_map_long_long = x.m_var_map_long_long; } @@ -7191,7 +7286,7 @@ class MapLongLong const MapLongLong& x) { - m_var_map_long_long = x.m_var_map_long_long; + m_var_map_long_long = x.m_var_map_long_long; return *this; } @@ -7266,6 +7361,8 @@ class MapLongLong return m_var_map_long_long; } + + private: std::map m_var_map_long_long; @@ -7300,7 +7397,7 @@ class MapLongULong eProsima_user_DllExport MapLongULong( const MapLongULong& x) { - m_var_map_long_ulong = x.m_var_map_long_ulong; + m_var_map_long_ulong = x.m_var_map_long_ulong; } @@ -7322,7 +7419,7 @@ class MapLongULong const MapLongULong& x) { - m_var_map_long_ulong = x.m_var_map_long_ulong; + m_var_map_long_ulong = x.m_var_map_long_ulong; return *this; } @@ -7397,6 +7494,8 @@ class MapLongULong return m_var_map_long_ulong; } + + private: std::map m_var_map_long_ulong; @@ -7431,7 +7530,7 @@ class MapLongKeyLongLongValue eProsima_user_DllExport MapLongKeyLongLongValue( const MapLongKeyLongLongValue& x) { - m_var_map_long_longlong = x.m_var_map_long_longlong; + m_var_map_long_longlong = x.m_var_map_long_longlong; } @@ -7453,7 +7552,7 @@ class MapLongKeyLongLongValue const MapLongKeyLongLongValue& x) { - m_var_map_long_longlong = x.m_var_map_long_longlong; + m_var_map_long_longlong = x.m_var_map_long_longlong; return *this; } @@ -7528,6 +7627,8 @@ class MapLongKeyLongLongValue return m_var_map_long_longlong; } + + private: std::map m_var_map_long_longlong; @@ -7562,7 +7663,7 @@ class MapLongULongLong eProsima_user_DllExport MapLongULongLong( const MapLongULongLong& x) { - m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; + m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; } @@ -7584,7 +7685,7 @@ class MapLongULongLong const MapLongULongLong& x) { - m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; + m_var_map_long_ulonglong = x.m_var_map_long_ulonglong; return *this; } @@ -7659,6 +7760,8 @@ class MapLongULongLong return m_var_map_long_ulonglong; } + + private: std::map m_var_map_long_ulonglong; @@ -7693,7 +7796,7 @@ class MapLongFloat eProsima_user_DllExport MapLongFloat( const MapLongFloat& x) { - m_var_map_long_float = x.m_var_map_long_float; + m_var_map_long_float = x.m_var_map_long_float; } @@ -7715,7 +7818,7 @@ class MapLongFloat const MapLongFloat& x) { - m_var_map_long_float = x.m_var_map_long_float; + m_var_map_long_float = x.m_var_map_long_float; return *this; } @@ -7790,6 +7893,8 @@ class MapLongFloat return m_var_map_long_float; } + + private: std::map m_var_map_long_float; @@ -7824,7 +7929,7 @@ class MapLongDouble eProsima_user_DllExport MapLongDouble( const MapLongDouble& x) { - m_var_map_long_double = x.m_var_map_long_double; + m_var_map_long_double = x.m_var_map_long_double; } @@ -7846,7 +7951,7 @@ class MapLongDouble const MapLongDouble& x) { - m_var_map_long_double = x.m_var_map_long_double; + m_var_map_long_double = x.m_var_map_long_double; return *this; } @@ -7921,6 +8026,8 @@ class MapLongDouble return m_var_map_long_double; } + + private: std::map m_var_map_long_double; @@ -7955,7 +8062,7 @@ class MapLongKeyLongDoubleValue eProsima_user_DllExport MapLongKeyLongDoubleValue( const MapLongKeyLongDoubleValue& x) { - m_var_map_long_longdouble = x.m_var_map_long_longdouble; + m_var_map_long_longdouble = x.m_var_map_long_longdouble; } @@ -7977,7 +8084,7 @@ class MapLongKeyLongDoubleValue const MapLongKeyLongDoubleValue& x) { - m_var_map_long_longdouble = x.m_var_map_long_longdouble; + m_var_map_long_longdouble = x.m_var_map_long_longdouble; return *this; } @@ -8052,6 +8159,8 @@ class MapLongKeyLongDoubleValue return m_var_map_long_longdouble; } + + private: std::map m_var_map_long_longdouble; @@ -8086,7 +8195,7 @@ class MapLongBoolean eProsima_user_DllExport MapLongBoolean( const MapLongBoolean& x) { - m_var_map_long_boolean = x.m_var_map_long_boolean; + m_var_map_long_boolean = x.m_var_map_long_boolean; } @@ -8108,7 +8217,7 @@ class MapLongBoolean const MapLongBoolean& x) { - m_var_map_long_boolean = x.m_var_map_long_boolean; + m_var_map_long_boolean = x.m_var_map_long_boolean; return *this; } @@ -8183,6 +8292,8 @@ class MapLongBoolean return m_var_map_long_boolean; } + + private: std::map m_var_map_long_boolean; @@ -8217,7 +8328,7 @@ class MapLongOctet eProsima_user_DllExport MapLongOctet( const MapLongOctet& x) { - m_var_map_long_octet = x.m_var_map_long_octet; + m_var_map_long_octet = x.m_var_map_long_octet; } @@ -8239,7 +8350,7 @@ class MapLongOctet const MapLongOctet& x) { - m_var_map_long_octet = x.m_var_map_long_octet; + m_var_map_long_octet = x.m_var_map_long_octet; return *this; } @@ -8314,6 +8425,8 @@ class MapLongOctet return m_var_map_long_octet; } + + private: std::map m_var_map_long_octet; @@ -8348,7 +8461,7 @@ class MapLongChar eProsima_user_DllExport MapLongChar( const MapLongChar& x) { - m_var_map_long_char = x.m_var_map_long_char; + m_var_map_long_char = x.m_var_map_long_char; } @@ -8370,7 +8483,7 @@ class MapLongChar const MapLongChar& x) { - m_var_map_long_char = x.m_var_map_long_char; + m_var_map_long_char = x.m_var_map_long_char; return *this; } @@ -8445,6 +8558,8 @@ class MapLongChar return m_var_map_long_char; } + + private: std::map m_var_map_long_char; @@ -8479,7 +8594,7 @@ class MapLongWChar eProsima_user_DllExport MapLongWChar( const MapLongWChar& x) { - m_var_map_long_wchar = x.m_var_map_long_wchar; + m_var_map_long_wchar = x.m_var_map_long_wchar; } @@ -8501,7 +8616,7 @@ class MapLongWChar const MapLongWChar& x) { - m_var_map_long_wchar = x.m_var_map_long_wchar; + m_var_map_long_wchar = x.m_var_map_long_wchar; return *this; } @@ -8576,6 +8691,8 @@ class MapLongWChar return m_var_map_long_wchar; } + + private: std::map m_var_map_long_wchar; @@ -8610,7 +8727,7 @@ class MapLongString eProsima_user_DllExport MapLongString( const MapLongString& x) { - m_var_map_long_string = x.m_var_map_long_string; + m_var_map_long_string = x.m_var_map_long_string; } @@ -8632,7 +8749,7 @@ class MapLongString const MapLongString& x) { - m_var_map_long_string = x.m_var_map_long_string; + m_var_map_long_string = x.m_var_map_long_string; return *this; } @@ -8707,6 +8824,8 @@ class MapLongString return m_var_map_long_string; } + + private: std::map m_var_map_long_string; @@ -8741,7 +8860,7 @@ class MapLongWString eProsima_user_DllExport MapLongWString( const MapLongWString& x) { - m_var_map_long_wstring = x.m_var_map_long_wstring; + m_var_map_long_wstring = x.m_var_map_long_wstring; } @@ -8763,7 +8882,7 @@ class MapLongWString const MapLongWString& x) { - m_var_map_long_wstring = x.m_var_map_long_wstring; + m_var_map_long_wstring = x.m_var_map_long_wstring; return *this; } @@ -8838,6 +8957,8 @@ class MapLongWString return m_var_map_long_wstring; } + + private: std::map m_var_map_long_wstring; @@ -8872,7 +8993,7 @@ class MapLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongInnerAliasBoundedStringHelper( const MapLongInnerAliasBoundedStringHelper& x) { - m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; + m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; } @@ -8894,7 +9015,7 @@ class MapLongInnerAliasBoundedStringHelper const MapLongInnerAliasBoundedStringHelper& x) { - m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; + m_var_map_long_inneraliasboundedstringhelper = x.m_var_map_long_inneraliasboundedstringhelper; return *this; } @@ -8955,8 +9076,7 @@ class MapLongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_long_inneraliasboundedstringhelper * @return Constant reference to member var_map_long_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedstringhelper() const { return m_var_map_long_inneraliasboundedstringhelper; } @@ -8965,12 +9085,13 @@ class MapLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_long_inneraliasboundedstringhelper * @return Reference to member var_map_long_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_long_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_long_inneraliasboundedstringhelper() { return m_var_map_long_inneraliasboundedstringhelper; } + + private: std::map m_var_map_long_inneraliasboundedstringhelper; @@ -9005,7 +9126,7 @@ class MapLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongInnerAliasBoundedWStringHelper( const MapLongInnerAliasBoundedWStringHelper& x) { - m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; + m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; } @@ -9027,7 +9148,7 @@ class MapLongInnerAliasBoundedWStringHelper const MapLongInnerAliasBoundedWStringHelper& x) { - m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; + m_var_map_long_inneraliasboundedwstringhelper = x.m_var_map_long_inneraliasboundedwstringhelper; return *this; } @@ -9088,8 +9209,7 @@ class MapLongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_long_inneraliasboundedwstringhelper * @return Constant reference to member var_map_long_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasboundedwstringhelper() const { return m_var_map_long_inneraliasboundedwstringhelper; } @@ -9098,12 +9218,13 @@ class MapLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_long_inneraliasboundedwstringhelper * @return Reference to member var_map_long_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_long_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_long_inneraliasboundedwstringhelper() { return m_var_map_long_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_long_inneraliasboundedwstringhelper; @@ -9138,7 +9259,7 @@ class MapLongInnerEnumHelper eProsima_user_DllExport MapLongInnerEnumHelper( const MapLongInnerEnumHelper& x) { - m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; + m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; } @@ -9160,7 +9281,7 @@ class MapLongInnerEnumHelper const MapLongInnerEnumHelper& x) { - m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; + m_var_map_long_innerenumhelper = x.m_var_map_long_innerenumhelper; return *this; } @@ -9235,6 +9356,8 @@ class MapLongInnerEnumHelper return m_var_map_long_innerenumhelper; } + + private: std::map m_var_map_long_innerenumhelper; @@ -9269,7 +9392,7 @@ class MapLongInnerBitMaskHelper eProsima_user_DllExport MapLongInnerBitMaskHelper( const MapLongInnerBitMaskHelper& x) { - m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; + m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; } @@ -9291,7 +9414,7 @@ class MapLongInnerBitMaskHelper const MapLongInnerBitMaskHelper& x) { - m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; + m_var_map_long_innerbitmaskhelper = x.m_var_map_long_innerbitmaskhelper; return *this; } @@ -9366,6 +9489,8 @@ class MapLongInnerBitMaskHelper return m_var_map_long_innerbitmaskhelper; } + + private: std::map m_var_map_long_innerbitmaskhelper; @@ -9400,7 +9525,7 @@ class MapLongInnerAliasHelper eProsima_user_DllExport MapLongInnerAliasHelper( const MapLongInnerAliasHelper& x) { - m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; + m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; } @@ -9422,7 +9547,7 @@ class MapLongInnerAliasHelper const MapLongInnerAliasHelper& x) { - m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; + m_var_map_long_inneraliashelper = x.m_var_map_long_inneraliashelper; return *this; } @@ -9497,6 +9622,8 @@ class MapLongInnerAliasHelper return m_var_map_long_inneraliashelper; } + + private: std::map m_var_map_long_inneraliashelper; @@ -9531,7 +9658,7 @@ class MapLongInnerAliasArrayHelper eProsima_user_DllExport MapLongInnerAliasArrayHelper( const MapLongInnerAliasArrayHelper& x) { - m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; + m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; } @@ -9553,7 +9680,7 @@ class MapLongInnerAliasArrayHelper const MapLongInnerAliasArrayHelper& x) { - m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; + m_var_map_long_inneraliasarrayhelper = x.m_var_map_long_inneraliasarrayhelper; return *this; } @@ -9614,8 +9741,7 @@ class MapLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_long_inneraliasarrayhelper * @return Constant reference to member var_map_long_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliasarrayhelper() const { return m_var_map_long_inneraliasarrayhelper; } @@ -9629,6 +9755,8 @@ class MapLongInnerAliasArrayHelper return m_var_map_long_inneraliasarrayhelper; } + + private: std::map m_var_map_long_inneraliasarrayhelper; @@ -9663,7 +9791,7 @@ class MapLongInnerAliasSequenceHelper eProsima_user_DllExport MapLongInnerAliasSequenceHelper( const MapLongInnerAliasSequenceHelper& x) { - m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; + m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; } @@ -9685,7 +9813,7 @@ class MapLongInnerAliasSequenceHelper const MapLongInnerAliasSequenceHelper& x) { - m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; + m_var_map_long_inneraliassequencehelper = x.m_var_map_long_inneraliassequencehelper; return *this; } @@ -9746,8 +9874,7 @@ class MapLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_long_inneraliassequencehelper * @return Constant reference to member var_map_long_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_long_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_long_inneraliassequencehelper() const { return m_var_map_long_inneraliassequencehelper; } @@ -9761,6 +9888,8 @@ class MapLongInnerAliasSequenceHelper return m_var_map_long_inneraliassequencehelper; } + + private: std::map m_var_map_long_inneraliassequencehelper; @@ -9795,7 +9924,7 @@ class MapLongInnerAliasMapHelper eProsima_user_DllExport MapLongInnerAliasMapHelper( const MapLongInnerAliasMapHelper& x) { - m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; + m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; } @@ -9817,7 +9946,7 @@ class MapLongInnerAliasMapHelper const MapLongInnerAliasMapHelper& x) { - m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; + m_var_map_long_inneraliasmaphelper = x.m_var_map_long_inneraliasmaphelper; return *this; } @@ -9892,6 +10021,8 @@ class MapLongInnerAliasMapHelper return m_var_map_long_inneraliasmaphelper; } + + private: std::map m_var_map_long_inneraliasmaphelper; @@ -9926,7 +10057,7 @@ class MapLongInnerUnionHelper eProsima_user_DllExport MapLongInnerUnionHelper( const MapLongInnerUnionHelper& x) { - m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; + m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; } @@ -9948,7 +10079,7 @@ class MapLongInnerUnionHelper const MapLongInnerUnionHelper& x) { - m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; + m_var_map_long_innerunionhelper = x.m_var_map_long_innerunionhelper; return *this; } @@ -10023,6 +10154,8 @@ class MapLongInnerUnionHelper return m_var_map_long_innerunionhelper; } + + private: std::map m_var_map_long_innerunionhelper; @@ -10057,7 +10190,7 @@ class MapLongInnerStructureHelper eProsima_user_DllExport MapLongInnerStructureHelper( const MapLongInnerStructureHelper& x) { - m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; + m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; } @@ -10079,7 +10212,7 @@ class MapLongInnerStructureHelper const MapLongInnerStructureHelper& x) { - m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; + m_var_map_long_innerstructurehelper = x.m_var_map_long_innerstructurehelper; return *this; } @@ -10154,6 +10287,8 @@ class MapLongInnerStructureHelper return m_var_map_long_innerstructurehelper; } + + private: std::map m_var_map_long_innerstructurehelper; @@ -10188,7 +10323,7 @@ class MapLongInnerBitsetHelper eProsima_user_DllExport MapLongInnerBitsetHelper( const MapLongInnerBitsetHelper& x) { - m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; + m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; } @@ -10210,7 +10345,7 @@ class MapLongInnerBitsetHelper const MapLongInnerBitsetHelper& x) { - m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; + m_var_map_long_innerbitsethelper = x.m_var_map_long_innerbitsethelper; return *this; } @@ -10285,6 +10420,8 @@ class MapLongInnerBitsetHelper return m_var_map_long_innerbitsethelper; } + + private: std::map m_var_map_long_innerbitsethelper; @@ -10319,7 +10456,7 @@ class MapULongShort eProsima_user_DllExport MapULongShort( const MapULongShort& x) { - m_var_map_ulong_short = x.m_var_map_ulong_short; + m_var_map_ulong_short = x.m_var_map_ulong_short; } @@ -10341,7 +10478,7 @@ class MapULongShort const MapULongShort& x) { - m_var_map_ulong_short = x.m_var_map_ulong_short; + m_var_map_ulong_short = x.m_var_map_ulong_short; return *this; } @@ -10416,6 +10553,8 @@ class MapULongShort return m_var_map_ulong_short; } + + private: std::map m_var_map_ulong_short; @@ -10450,7 +10589,7 @@ class MapULongUShort eProsima_user_DllExport MapULongUShort( const MapULongUShort& x) { - m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; + m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; } @@ -10472,7 +10611,7 @@ class MapULongUShort const MapULongUShort& x) { - m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; + m_var_map_ulong_ushort = x.m_var_map_ulong_ushort; return *this; } @@ -10547,6 +10686,8 @@ class MapULongUShort return m_var_map_ulong_ushort; } + + private: std::map m_var_map_ulong_ushort; @@ -10581,7 +10722,7 @@ class MapULongLong eProsima_user_DllExport MapULongLong( const MapULongLong& x) { - m_var_map_ulong_long = x.m_var_map_ulong_long; + m_var_map_ulong_long = x.m_var_map_ulong_long; } @@ -10603,7 +10744,7 @@ class MapULongLong const MapULongLong& x) { - m_var_map_ulong_long = x.m_var_map_ulong_long; + m_var_map_ulong_long = x.m_var_map_ulong_long; return *this; } @@ -10678,6 +10819,8 @@ class MapULongLong return m_var_map_ulong_long; } + + private: std::map m_var_map_ulong_long; @@ -10712,7 +10855,7 @@ class MapULongULong eProsima_user_DllExport MapULongULong( const MapULongULong& x) { - m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; + m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; } @@ -10734,7 +10877,7 @@ class MapULongULong const MapULongULong& x) { - m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; + m_var_map_ulong_ulong = x.m_var_map_ulong_ulong; return *this; } @@ -10809,6 +10952,8 @@ class MapULongULong return m_var_map_ulong_ulong; } + + private: std::map m_var_map_ulong_ulong; @@ -10843,7 +10988,7 @@ class MapKeyULongValueLongLong eProsima_user_DllExport MapKeyULongValueLongLong( const MapKeyULongValueLongLong& x) { - m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; + m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; } @@ -10865,7 +11010,7 @@ class MapKeyULongValueLongLong const MapKeyULongValueLongLong& x) { - m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; + m_var_map_ulong_longlong = x.m_var_map_ulong_longlong; return *this; } @@ -10940,6 +11085,8 @@ class MapKeyULongValueLongLong return m_var_map_ulong_longlong; } + + private: std::map m_var_map_ulong_longlong; @@ -10974,7 +11121,7 @@ class MapULongULongLong eProsima_user_DllExport MapULongULongLong( const MapULongULongLong& x) { - m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; + m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; } @@ -10996,7 +11143,7 @@ class MapULongULongLong const MapULongULongLong& x) { - m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; + m_var_map_ulong_ulonglong = x.m_var_map_ulong_ulonglong; return *this; } @@ -11071,6 +11218,8 @@ class MapULongULongLong return m_var_map_ulong_ulonglong; } + + private: std::map m_var_map_ulong_ulonglong; @@ -11105,7 +11254,7 @@ class MapULongFloat eProsima_user_DllExport MapULongFloat( const MapULongFloat& x) { - m_var_map_ulong_float = x.m_var_map_ulong_float; + m_var_map_ulong_float = x.m_var_map_ulong_float; } @@ -11127,7 +11276,7 @@ class MapULongFloat const MapULongFloat& x) { - m_var_map_ulong_float = x.m_var_map_ulong_float; + m_var_map_ulong_float = x.m_var_map_ulong_float; return *this; } @@ -11202,6 +11351,8 @@ class MapULongFloat return m_var_map_ulong_float; } + + private: std::map m_var_map_ulong_float; @@ -11236,7 +11387,7 @@ class MapULongDouble eProsima_user_DllExport MapULongDouble( const MapULongDouble& x) { - m_var_map_ulong_double = x.m_var_map_ulong_double; + m_var_map_ulong_double = x.m_var_map_ulong_double; } @@ -11258,7 +11409,7 @@ class MapULongDouble const MapULongDouble& x) { - m_var_map_ulong_double = x.m_var_map_ulong_double; + m_var_map_ulong_double = x.m_var_map_ulong_double; return *this; } @@ -11333,6 +11484,8 @@ class MapULongDouble return m_var_map_ulong_double; } + + private: std::map m_var_map_ulong_double; @@ -11367,7 +11520,7 @@ class MapKeyULongValueLongDouble eProsima_user_DllExport MapKeyULongValueLongDouble( const MapKeyULongValueLongDouble& x) { - m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; + m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; } @@ -11389,7 +11542,7 @@ class MapKeyULongValueLongDouble const MapKeyULongValueLongDouble& x) { - m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; + m_var_map_ulong_longdouble = x.m_var_map_ulong_longdouble; return *this; } @@ -11464,6 +11617,8 @@ class MapKeyULongValueLongDouble return m_var_map_ulong_longdouble; } + + private: std::map m_var_map_ulong_longdouble; @@ -11498,7 +11653,7 @@ class MapULongBoolean eProsima_user_DllExport MapULongBoolean( const MapULongBoolean& x) { - m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; + m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; } @@ -11520,7 +11675,7 @@ class MapULongBoolean const MapULongBoolean& x) { - m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; + m_var_map_ulong_boolean = x.m_var_map_ulong_boolean; return *this; } @@ -11595,6 +11750,8 @@ class MapULongBoolean return m_var_map_ulong_boolean; } + + private: std::map m_var_map_ulong_boolean; @@ -11629,7 +11786,7 @@ class MapULongOctet eProsima_user_DllExport MapULongOctet( const MapULongOctet& x) { - m_var_map_ulong_octet = x.m_var_map_ulong_octet; + m_var_map_ulong_octet = x.m_var_map_ulong_octet; } @@ -11651,7 +11808,7 @@ class MapULongOctet const MapULongOctet& x) { - m_var_map_ulong_octet = x.m_var_map_ulong_octet; + m_var_map_ulong_octet = x.m_var_map_ulong_octet; return *this; } @@ -11726,6 +11883,8 @@ class MapULongOctet return m_var_map_ulong_octet; } + + private: std::map m_var_map_ulong_octet; @@ -11760,7 +11919,7 @@ class MapULongChar eProsima_user_DllExport MapULongChar( const MapULongChar& x) { - m_var_map_ulong_char = x.m_var_map_ulong_char; + m_var_map_ulong_char = x.m_var_map_ulong_char; } @@ -11782,7 +11941,7 @@ class MapULongChar const MapULongChar& x) { - m_var_map_ulong_char = x.m_var_map_ulong_char; + m_var_map_ulong_char = x.m_var_map_ulong_char; return *this; } @@ -11857,6 +12016,8 @@ class MapULongChar return m_var_map_ulong_char; } + + private: std::map m_var_map_ulong_char; @@ -11891,7 +12052,7 @@ class MapULongWChar eProsima_user_DllExport MapULongWChar( const MapULongWChar& x) { - m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; + m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; } @@ -11913,7 +12074,7 @@ class MapULongWChar const MapULongWChar& x) { - m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; + m_var_map_ulong_wchar = x.m_var_map_ulong_wchar; return *this; } @@ -11988,6 +12149,8 @@ class MapULongWChar return m_var_map_ulong_wchar; } + + private: std::map m_var_map_ulong_wchar; @@ -12022,7 +12185,7 @@ class MapULongString eProsima_user_DllExport MapULongString( const MapULongString& x) { - m_var_map_ulong_string = x.m_var_map_ulong_string; + m_var_map_ulong_string = x.m_var_map_ulong_string; } @@ -12044,7 +12207,7 @@ class MapULongString const MapULongString& x) { - m_var_map_ulong_string = x.m_var_map_ulong_string; + m_var_map_ulong_string = x.m_var_map_ulong_string; return *this; } @@ -12119,6 +12282,8 @@ class MapULongString return m_var_map_ulong_string; } + + private: std::map m_var_map_ulong_string; @@ -12153,7 +12318,7 @@ class MapULongWString eProsima_user_DllExport MapULongWString( const MapULongWString& x) { - m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; + m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; } @@ -12175,7 +12340,7 @@ class MapULongWString const MapULongWString& x) { - m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; + m_var_map_ulong_wstring = x.m_var_map_ulong_wstring; return *this; } @@ -12250,6 +12415,8 @@ class MapULongWString return m_var_map_ulong_wstring; } + + private: std::map m_var_map_ulong_wstring; @@ -12284,7 +12451,7 @@ class MapULongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongInnerAliasBoundedStringHelper( const MapULongInnerAliasBoundedStringHelper& x) { - m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; + m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; } @@ -12306,7 +12473,7 @@ class MapULongInnerAliasBoundedStringHelper const MapULongInnerAliasBoundedStringHelper& x) { - m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; + m_var_map_ulong_inneraliasboundedstringhelper = x.m_var_map_ulong_inneraliasboundedstringhelper; return *this; } @@ -12367,8 +12534,7 @@ class MapULongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasboundedstringhelper * @return Constant reference to member var_map_ulong_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedstringhelper() const { return m_var_map_ulong_inneraliasboundedstringhelper; } @@ -12377,12 +12543,13 @@ class MapULongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_ulong_inneraliasboundedstringhelper * @return Reference to member var_map_ulong_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedstringhelper() { return m_var_map_ulong_inneraliasboundedstringhelper; } + + private: std::map m_var_map_ulong_inneraliasboundedstringhelper; @@ -12417,7 +12584,7 @@ class MapULongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongInnerAliasBoundedWStringHelper( const MapULongInnerAliasBoundedWStringHelper& x) { - m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; + m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; } @@ -12439,7 +12606,7 @@ class MapULongInnerAliasBoundedWStringHelper const MapULongInnerAliasBoundedWStringHelper& x) { - m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; + m_var_map_ulong_inneraliasboundedwstringhelper = x.m_var_map_ulong_inneraliasboundedwstringhelper; return *this; } @@ -12500,8 +12667,7 @@ class MapULongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasboundedwstringhelper * @return Constant reference to member var_map_ulong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasboundedwstringhelper() const { return m_var_map_ulong_inneraliasboundedwstringhelper; } @@ -12510,12 +12676,13 @@ class MapULongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_ulong_inneraliasboundedwstringhelper * @return Reference to member var_map_ulong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_ulong_inneraliasboundedwstringhelper() { return m_var_map_ulong_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_ulong_inneraliasboundedwstringhelper; @@ -12550,7 +12717,7 @@ class MapULongInnerEnumHelper eProsima_user_DllExport MapULongInnerEnumHelper( const MapULongInnerEnumHelper& x) { - m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; + m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; } @@ -12572,7 +12739,7 @@ class MapULongInnerEnumHelper const MapULongInnerEnumHelper& x) { - m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; + m_var_map_ulong_innerenumhelper = x.m_var_map_ulong_innerenumhelper; return *this; } @@ -12647,6 +12814,8 @@ class MapULongInnerEnumHelper return m_var_map_ulong_innerenumhelper; } + + private: std::map m_var_map_ulong_innerenumhelper; @@ -12681,7 +12850,7 @@ class MapULongInnerBitMaskHelper eProsima_user_DllExport MapULongInnerBitMaskHelper( const MapULongInnerBitMaskHelper& x) { - m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; + m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; } @@ -12703,7 +12872,7 @@ class MapULongInnerBitMaskHelper const MapULongInnerBitMaskHelper& x) { - m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; + m_var_map_ulong_innerbitmaskhelper = x.m_var_map_ulong_innerbitmaskhelper; return *this; } @@ -12778,6 +12947,8 @@ class MapULongInnerBitMaskHelper return m_var_map_ulong_innerbitmaskhelper; } + + private: std::map m_var_map_ulong_innerbitmaskhelper; @@ -12812,7 +12983,7 @@ class MapULongInnerAliasHelper eProsima_user_DllExport MapULongInnerAliasHelper( const MapULongInnerAliasHelper& x) { - m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; + m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; } @@ -12834,7 +13005,7 @@ class MapULongInnerAliasHelper const MapULongInnerAliasHelper& x) { - m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; + m_var_map_ulong_inneraliashelper = x.m_var_map_ulong_inneraliashelper; return *this; } @@ -12909,6 +13080,8 @@ class MapULongInnerAliasHelper return m_var_map_ulong_inneraliashelper; } + + private: std::map m_var_map_ulong_inneraliashelper; @@ -12943,7 +13116,7 @@ class MapULongInnerAliasArrayHelper eProsima_user_DllExport MapULongInnerAliasArrayHelper( const MapULongInnerAliasArrayHelper& x) { - m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; + m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; } @@ -12965,7 +13138,7 @@ class MapULongInnerAliasArrayHelper const MapULongInnerAliasArrayHelper& x) { - m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; + m_var_map_ulong_inneraliasarrayhelper = x.m_var_map_ulong_inneraliasarrayhelper; return *this; } @@ -13026,8 +13199,7 @@ class MapULongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliasarrayhelper * @return Constant reference to member var_map_ulong_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliasarrayhelper() const { return m_var_map_ulong_inneraliasarrayhelper; } @@ -13041,6 +13213,8 @@ class MapULongInnerAliasArrayHelper return m_var_map_ulong_inneraliasarrayhelper; } + + private: std::map m_var_map_ulong_inneraliasarrayhelper; @@ -13075,7 +13249,7 @@ class MapULongInnerAliasSequenceHelper eProsima_user_DllExport MapULongInnerAliasSequenceHelper( const MapULongInnerAliasSequenceHelper& x) { - m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; + m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; } @@ -13097,7 +13271,7 @@ class MapULongInnerAliasSequenceHelper const MapULongInnerAliasSequenceHelper& x) { - m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; + m_var_map_ulong_inneraliassequencehelper = x.m_var_map_ulong_inneraliassequencehelper; return *this; } @@ -13158,8 +13332,7 @@ class MapULongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_ulong_inneraliassequencehelper * @return Constant reference to member var_map_ulong_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_ulong_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_ulong_inneraliassequencehelper() const { return m_var_map_ulong_inneraliassequencehelper; } @@ -13173,6 +13346,8 @@ class MapULongInnerAliasSequenceHelper return m_var_map_ulong_inneraliassequencehelper; } + + private: std::map m_var_map_ulong_inneraliassequencehelper; @@ -13207,7 +13382,7 @@ class MapULongInnerAliasMapHelper eProsima_user_DllExport MapULongInnerAliasMapHelper( const MapULongInnerAliasMapHelper& x) { - m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; + m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; } @@ -13229,7 +13404,7 @@ class MapULongInnerAliasMapHelper const MapULongInnerAliasMapHelper& x) { - m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; + m_var_map_ulong_inneraliasmaphelper = x.m_var_map_ulong_inneraliasmaphelper; return *this; } @@ -13304,6 +13479,8 @@ class MapULongInnerAliasMapHelper return m_var_map_ulong_inneraliasmaphelper; } + + private: std::map m_var_map_ulong_inneraliasmaphelper; @@ -13338,7 +13515,7 @@ class MapULongInnerUnionHelper eProsima_user_DllExport MapULongInnerUnionHelper( const MapULongInnerUnionHelper& x) { - m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; + m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; } @@ -13360,7 +13537,7 @@ class MapULongInnerUnionHelper const MapULongInnerUnionHelper& x) { - m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; + m_var_map_ulong_innerunionhelper = x.m_var_map_ulong_innerunionhelper; return *this; } @@ -13435,6 +13612,8 @@ class MapULongInnerUnionHelper return m_var_map_ulong_innerunionhelper; } + + private: std::map m_var_map_ulong_innerunionhelper; @@ -13469,7 +13648,7 @@ class MapULongInnerStructureHelper eProsima_user_DllExport MapULongInnerStructureHelper( const MapULongInnerStructureHelper& x) { - m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; + m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; } @@ -13491,7 +13670,7 @@ class MapULongInnerStructureHelper const MapULongInnerStructureHelper& x) { - m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; + m_var_map_ulong_innerstructurehelper = x.m_var_map_ulong_innerstructurehelper; return *this; } @@ -13566,6 +13745,8 @@ class MapULongInnerStructureHelper return m_var_map_ulong_innerstructurehelper; } + + private: std::map m_var_map_ulong_innerstructurehelper; @@ -13600,7 +13781,7 @@ class MapULongInnerBitsetHelper eProsima_user_DllExport MapULongInnerBitsetHelper( const MapULongInnerBitsetHelper& x) { - m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; + m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; } @@ -13622,7 +13803,7 @@ class MapULongInnerBitsetHelper const MapULongInnerBitsetHelper& x) { - m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; + m_var_map_ulong_innerbitsethelper = x.m_var_map_ulong_innerbitsethelper; return *this; } @@ -13697,6 +13878,8 @@ class MapULongInnerBitsetHelper return m_var_map_ulong_innerbitsethelper; } + + private: std::map m_var_map_ulong_innerbitsethelper; @@ -13731,7 +13914,7 @@ class MapLongLongShort eProsima_user_DllExport MapLongLongShort( const MapLongLongShort& x) { - m_var_map_longlong_short = x.m_var_map_longlong_short; + m_var_map_longlong_short = x.m_var_map_longlong_short; } @@ -13753,7 +13936,7 @@ class MapLongLongShort const MapLongLongShort& x) { - m_var_map_longlong_short = x.m_var_map_longlong_short; + m_var_map_longlong_short = x.m_var_map_longlong_short; return *this; } @@ -13828,6 +14011,8 @@ class MapLongLongShort return m_var_map_longlong_short; } + + private: std::map m_var_map_longlong_short; @@ -13862,7 +14047,7 @@ class MapLongLongUShort eProsima_user_DllExport MapLongLongUShort( const MapLongLongUShort& x) { - m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; + m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; } @@ -13884,7 +14069,7 @@ class MapLongLongUShort const MapLongLongUShort& x) { - m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; + m_var_map_longlong_ushort = x.m_var_map_longlong_ushort; return *this; } @@ -13959,6 +14144,8 @@ class MapLongLongUShort return m_var_map_longlong_ushort; } + + private: std::map m_var_map_longlong_ushort; @@ -13993,7 +14180,7 @@ class MapLongLongKeyLongValue eProsima_user_DllExport MapLongLongKeyLongValue( const MapLongLongKeyLongValue& x) { - m_var_map_longlong_long = x.m_var_map_longlong_long; + m_var_map_longlong_long = x.m_var_map_longlong_long; } @@ -14015,7 +14202,7 @@ class MapLongLongKeyLongValue const MapLongLongKeyLongValue& x) { - m_var_map_longlong_long = x.m_var_map_longlong_long; + m_var_map_longlong_long = x.m_var_map_longlong_long; return *this; } @@ -14090,6 +14277,8 @@ class MapLongLongKeyLongValue return m_var_map_longlong_long; } + + private: std::map m_var_map_longlong_long; @@ -14124,7 +14313,7 @@ class MapLongLongULong eProsima_user_DllExport MapLongLongULong( const MapLongLongULong& x) { - m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; + m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; } @@ -14146,7 +14335,7 @@ class MapLongLongULong const MapLongLongULong& x) { - m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; + m_var_map_longlong_ulong = x.m_var_map_longlong_ulong; return *this; } @@ -14221,6 +14410,8 @@ class MapLongLongULong return m_var_map_longlong_ulong; } + + private: std::map m_var_map_longlong_ulong; @@ -14255,7 +14446,7 @@ class MapLongLongLongLong eProsima_user_DllExport MapLongLongLongLong( const MapLongLongLongLong& x) { - m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; + m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; } @@ -14277,7 +14468,7 @@ class MapLongLongLongLong const MapLongLongLongLong& x) { - m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; + m_var_map_longlong_longlong = x.m_var_map_longlong_longlong; return *this; } @@ -14352,6 +14543,8 @@ class MapLongLongLongLong return m_var_map_longlong_longlong; } + + private: std::map m_var_map_longlong_longlong; @@ -14386,7 +14579,7 @@ class MapLongLongULongLong eProsima_user_DllExport MapLongLongULongLong( const MapLongLongULongLong& x) { - m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; + m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; } @@ -14408,7 +14601,7 @@ class MapLongLongULongLong const MapLongLongULongLong& x) { - m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; + m_var_map_longlong_ulonglong = x.m_var_map_longlong_ulonglong; return *this; } @@ -14483,6 +14676,8 @@ class MapLongLongULongLong return m_var_map_longlong_ulonglong; } + + private: std::map m_var_map_longlong_ulonglong; @@ -14517,7 +14712,7 @@ class MapLongLongFloat eProsima_user_DllExport MapLongLongFloat( const MapLongLongFloat& x) { - m_var_map_longlong_float = x.m_var_map_longlong_float; + m_var_map_longlong_float = x.m_var_map_longlong_float; } @@ -14539,7 +14734,7 @@ class MapLongLongFloat const MapLongLongFloat& x) { - m_var_map_longlong_float = x.m_var_map_longlong_float; + m_var_map_longlong_float = x.m_var_map_longlong_float; return *this; } @@ -14614,6 +14809,8 @@ class MapLongLongFloat return m_var_map_longlong_float; } + + private: std::map m_var_map_longlong_float; @@ -14648,7 +14845,7 @@ class MapLongLongKeyDoubleValue eProsima_user_DllExport MapLongLongKeyDoubleValue( const MapLongLongKeyDoubleValue& x) { - m_var_map_longlong_double = x.m_var_map_longlong_double; + m_var_map_longlong_double = x.m_var_map_longlong_double; } @@ -14670,7 +14867,7 @@ class MapLongLongKeyDoubleValue const MapLongLongKeyDoubleValue& x) { - m_var_map_longlong_double = x.m_var_map_longlong_double; + m_var_map_longlong_double = x.m_var_map_longlong_double; return *this; } @@ -14745,6 +14942,8 @@ class MapLongLongKeyDoubleValue return m_var_map_longlong_double; } + + private: std::map m_var_map_longlong_double; @@ -14779,7 +14978,7 @@ class MapLongLongLongDouble eProsima_user_DllExport MapLongLongLongDouble( const MapLongLongLongDouble& x) { - m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; + m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; } @@ -14801,7 +15000,7 @@ class MapLongLongLongDouble const MapLongLongLongDouble& x) { - m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; + m_var_map_longlong_longdouble = x.m_var_map_longlong_longdouble; return *this; } @@ -14876,6 +15075,8 @@ class MapLongLongLongDouble return m_var_map_longlong_longdouble; } + + private: std::map m_var_map_longlong_longdouble; @@ -14910,7 +15111,7 @@ class MapLongLongBoolean eProsima_user_DllExport MapLongLongBoolean( const MapLongLongBoolean& x) { - m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; + m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; } @@ -14932,7 +15133,7 @@ class MapLongLongBoolean const MapLongLongBoolean& x) { - m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; + m_var_map_longlong_boolean = x.m_var_map_longlong_boolean; return *this; } @@ -15007,6 +15208,8 @@ class MapLongLongBoolean return m_var_map_longlong_boolean; } + + private: std::map m_var_map_longlong_boolean; @@ -15041,7 +15244,7 @@ class MapLongLongOctet eProsima_user_DllExport MapLongLongOctet( const MapLongLongOctet& x) { - m_var_map_longlong_octet = x.m_var_map_longlong_octet; + m_var_map_longlong_octet = x.m_var_map_longlong_octet; } @@ -15063,7 +15266,7 @@ class MapLongLongOctet const MapLongLongOctet& x) { - m_var_map_longlong_octet = x.m_var_map_longlong_octet; + m_var_map_longlong_octet = x.m_var_map_longlong_octet; return *this; } @@ -15138,6 +15341,8 @@ class MapLongLongOctet return m_var_map_longlong_octet; } + + private: std::map m_var_map_longlong_octet; @@ -15172,7 +15377,7 @@ class MapLongLongChar eProsima_user_DllExport MapLongLongChar( const MapLongLongChar& x) { - m_var_map_longlong_char = x.m_var_map_longlong_char; + m_var_map_longlong_char = x.m_var_map_longlong_char; } @@ -15194,7 +15399,7 @@ class MapLongLongChar const MapLongLongChar& x) { - m_var_map_longlong_char = x.m_var_map_longlong_char; + m_var_map_longlong_char = x.m_var_map_longlong_char; return *this; } @@ -15269,6 +15474,8 @@ class MapLongLongChar return m_var_map_longlong_char; } + + private: std::map m_var_map_longlong_char; @@ -15303,7 +15510,7 @@ class MapLongLongWChar eProsima_user_DllExport MapLongLongWChar( const MapLongLongWChar& x) { - m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; + m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; } @@ -15325,7 +15532,7 @@ class MapLongLongWChar const MapLongLongWChar& x) { - m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; + m_var_map_longlong_wchar = x.m_var_map_longlong_wchar; return *this; } @@ -15400,6 +15607,8 @@ class MapLongLongWChar return m_var_map_longlong_wchar; } + + private: std::map m_var_map_longlong_wchar; @@ -15434,7 +15643,7 @@ class MapLongLongString eProsima_user_DllExport MapLongLongString( const MapLongLongString& x) { - m_var_map_longlong_string = x.m_var_map_longlong_string; + m_var_map_longlong_string = x.m_var_map_longlong_string; } @@ -15456,7 +15665,7 @@ class MapLongLongString const MapLongLongString& x) { - m_var_map_longlong_string = x.m_var_map_longlong_string; + m_var_map_longlong_string = x.m_var_map_longlong_string; return *this; } @@ -15531,6 +15740,8 @@ class MapLongLongString return m_var_map_longlong_string; } + + private: std::map m_var_map_longlong_string; @@ -15565,7 +15776,7 @@ class MapLongLongWString eProsima_user_DllExport MapLongLongWString( const MapLongLongWString& x) { - m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; + m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; } @@ -15587,7 +15798,7 @@ class MapLongLongWString const MapLongLongWString& x) { - m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; + m_var_map_longlong_wstring = x.m_var_map_longlong_wstring; return *this; } @@ -15662,6 +15873,8 @@ class MapLongLongWString return m_var_map_longlong_wstring; } + + private: std::map m_var_map_longlong_wstring; @@ -15696,7 +15909,7 @@ class MapLongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedStringHelper( const MapLongLongInnerAliasBoundedStringHelper& x) { - m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; + m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; } @@ -15707,8 +15920,7 @@ class MapLongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedStringHelper( MapLongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedstringhelper = - std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); + m_var_map_longlong_inneraliasboundedstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); } /*! @@ -15719,7 +15931,7 @@ class MapLongLongInnerAliasBoundedStringHelper const MapLongLongInnerAliasBoundedStringHelper& x) { - m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; + m_var_map_longlong_inneraliasboundedstringhelper = x.m_var_map_longlong_inneraliasboundedstringhelper; return *this; } @@ -15732,8 +15944,7 @@ class MapLongLongInnerAliasBoundedStringHelper MapLongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedstringhelper = - std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); + m_var_map_longlong_inneraliasboundedstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedstringhelper); return *this; } @@ -15781,8 +15992,7 @@ class MapLongLongInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasboundedstringhelper * @return Constant reference to member var_map_longlong_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedstringhelper() const { return m_var_map_longlong_inneraliasboundedstringhelper; } @@ -15791,12 +16001,13 @@ class MapLongLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_longlong_inneraliasboundedstringhelper * @return Reference to member var_map_longlong_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedstringhelper() { return m_var_map_longlong_inneraliasboundedstringhelper; } + + private: std::map m_var_map_longlong_inneraliasboundedstringhelper; @@ -15831,7 +16042,7 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedWStringHelper( const MapLongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; + m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; } @@ -15842,8 +16053,7 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapLongLongInnerAliasBoundedWStringHelper( MapLongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedwstringhelper = - std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); + m_var_map_longlong_inneraliasboundedwstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); } /*! @@ -15854,7 +16064,7 @@ class MapLongLongInnerAliasBoundedWStringHelper const MapLongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; + m_var_map_longlong_inneraliasboundedwstringhelper = x.m_var_map_longlong_inneraliasboundedwstringhelper; return *this; } @@ -15867,8 +16077,7 @@ class MapLongLongInnerAliasBoundedWStringHelper MapLongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_longlong_inneraliasboundedwstringhelper = - std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); + m_var_map_longlong_inneraliasboundedwstringhelper = std::move(x.m_var_map_longlong_inneraliasboundedwstringhelper); return *this; } @@ -15879,8 +16088,7 @@ class MapLongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapLongLongInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_longlong_inneraliasboundedwstringhelper == - x.m_var_map_longlong_inneraliasboundedwstringhelper); + return (m_var_map_longlong_inneraliasboundedwstringhelper == x.m_var_map_longlong_inneraliasboundedwstringhelper); } /*! @@ -15898,8 +16106,7 @@ class MapLongLongInnerAliasBoundedWStringHelper * @param _var_map_longlong_inneraliasboundedwstringhelper New value to be copied in member var_map_longlong_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_longlong_inneraliasboundedwstringhelper( - const std::map& _var_map_longlong_inneraliasboundedwstringhelper) + const std::map& _var_map_longlong_inneraliasboundedwstringhelper) { m_var_map_longlong_inneraliasboundedwstringhelper = _var_map_longlong_inneraliasboundedwstringhelper; } @@ -15918,8 +16125,7 @@ class MapLongLongInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasboundedwstringhelper * @return Constant reference to member var_map_longlong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasboundedwstringhelper() const { return m_var_map_longlong_inneraliasboundedwstringhelper; } @@ -15928,12 +16134,13 @@ class MapLongLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_longlong_inneraliasboundedwstringhelper * @return Reference to member var_map_longlong_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_longlong_inneraliasboundedwstringhelper() { return m_var_map_longlong_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_longlong_inneraliasboundedwstringhelper; @@ -15968,7 +16175,7 @@ class MapLongLongInnerEnumHelper eProsima_user_DllExport MapLongLongInnerEnumHelper( const MapLongLongInnerEnumHelper& x) { - m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; + m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; } @@ -15990,7 +16197,7 @@ class MapLongLongInnerEnumHelper const MapLongLongInnerEnumHelper& x) { - m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; + m_var_map_longlong_innerenumhelper = x.m_var_map_longlong_innerenumhelper; return *this; } @@ -16065,6 +16272,8 @@ class MapLongLongInnerEnumHelper return m_var_map_longlong_innerenumhelper; } + + private: std::map m_var_map_longlong_innerenumhelper; @@ -16099,7 +16308,7 @@ class MapLongLongInnerBitMaskHelper eProsima_user_DllExport MapLongLongInnerBitMaskHelper( const MapLongLongInnerBitMaskHelper& x) { - m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; + m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; } @@ -16121,7 +16330,7 @@ class MapLongLongInnerBitMaskHelper const MapLongLongInnerBitMaskHelper& x) { - m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; + m_var_map_longlong_innerbitmaskhelper = x.m_var_map_longlong_innerbitmaskhelper; return *this; } @@ -16196,6 +16405,8 @@ class MapLongLongInnerBitMaskHelper return m_var_map_longlong_innerbitmaskhelper; } + + private: std::map m_var_map_longlong_innerbitmaskhelper; @@ -16230,7 +16441,7 @@ class MapLongLongInnerAliasHelper eProsima_user_DllExport MapLongLongInnerAliasHelper( const MapLongLongInnerAliasHelper& x) { - m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; + m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; } @@ -16252,7 +16463,7 @@ class MapLongLongInnerAliasHelper const MapLongLongInnerAliasHelper& x) { - m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; + m_var_map_longlong_inneraliashelper = x.m_var_map_longlong_inneraliashelper; return *this; } @@ -16327,6 +16538,8 @@ class MapLongLongInnerAliasHelper return m_var_map_longlong_inneraliashelper; } + + private: std::map m_var_map_longlong_inneraliashelper; @@ -16361,7 +16574,7 @@ class MapLongLongInnerAliasArrayHelper eProsima_user_DllExport MapLongLongInnerAliasArrayHelper( const MapLongLongInnerAliasArrayHelper& x) { - m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; + m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; } @@ -16383,7 +16596,7 @@ class MapLongLongInnerAliasArrayHelper const MapLongLongInnerAliasArrayHelper& x) { - m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; + m_var_map_longlong_inneraliasarrayhelper = x.m_var_map_longlong_inneraliasarrayhelper; return *this; } @@ -16444,8 +16657,7 @@ class MapLongLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasarrayhelper * @return Constant reference to member var_map_longlong_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasarrayhelper() const { return m_var_map_longlong_inneraliasarrayhelper; } @@ -16459,6 +16671,8 @@ class MapLongLongInnerAliasArrayHelper return m_var_map_longlong_inneraliasarrayhelper; } + + private: std::map m_var_map_longlong_inneraliasarrayhelper; @@ -16493,7 +16707,7 @@ class MapLongLongInnerAliasSequenceHelper eProsima_user_DllExport MapLongLongInnerAliasSequenceHelper( const MapLongLongInnerAliasSequenceHelper& x) { - m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; + m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; } @@ -16515,7 +16729,7 @@ class MapLongLongInnerAliasSequenceHelper const MapLongLongInnerAliasSequenceHelper& x) { - m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; + m_var_map_longlong_inneraliassequencehelper = x.m_var_map_longlong_inneraliassequencehelper; return *this; } @@ -16576,8 +16790,7 @@ class MapLongLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliassequencehelper * @return Constant reference to member var_map_longlong_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliassequencehelper() const { return m_var_map_longlong_inneraliassequencehelper; } @@ -16591,6 +16804,8 @@ class MapLongLongInnerAliasSequenceHelper return m_var_map_longlong_inneraliassequencehelper; } + + private: std::map m_var_map_longlong_inneraliassequencehelper; @@ -16625,7 +16840,7 @@ class MapLongLongInnerAliasMapHelper eProsima_user_DllExport MapLongLongInnerAliasMapHelper( const MapLongLongInnerAliasMapHelper& x) { - m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; + m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; } @@ -16647,7 +16862,7 @@ class MapLongLongInnerAliasMapHelper const MapLongLongInnerAliasMapHelper& x) { - m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; + m_var_map_longlong_inneraliasmaphelper = x.m_var_map_longlong_inneraliasmaphelper; return *this; } @@ -16708,8 +16923,7 @@ class MapLongLongInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_longlong_inneraliasmaphelper * @return Constant reference to member var_map_longlong_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_longlong_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_longlong_inneraliasmaphelper() const { return m_var_map_longlong_inneraliasmaphelper; } @@ -16723,6 +16937,8 @@ class MapLongLongInnerAliasMapHelper return m_var_map_longlong_inneraliasmaphelper; } + + private: std::map m_var_map_longlong_inneraliasmaphelper; @@ -16757,7 +16973,7 @@ class MapLongLongInnerUnionHelper eProsima_user_DllExport MapLongLongInnerUnionHelper( const MapLongLongInnerUnionHelper& x) { - m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; + m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; } @@ -16779,7 +16995,7 @@ class MapLongLongInnerUnionHelper const MapLongLongInnerUnionHelper& x) { - m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; + m_var_map_longlong_innerunionhelper = x.m_var_map_longlong_innerunionhelper; return *this; } @@ -16854,6 +17070,8 @@ class MapLongLongInnerUnionHelper return m_var_map_longlong_innerunionhelper; } + + private: std::map m_var_map_longlong_innerunionhelper; @@ -16888,7 +17106,7 @@ class MapLongLongInnerStructureHelper eProsima_user_DllExport MapLongLongInnerStructureHelper( const MapLongLongInnerStructureHelper& x) { - m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; + m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; } @@ -16910,7 +17128,7 @@ class MapLongLongInnerStructureHelper const MapLongLongInnerStructureHelper& x) { - m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; + m_var_map_longlong_innerstructurehelper = x.m_var_map_longlong_innerstructurehelper; return *this; } @@ -16985,6 +17203,8 @@ class MapLongLongInnerStructureHelper return m_var_map_longlong_innerstructurehelper; } + + private: std::map m_var_map_longlong_innerstructurehelper; @@ -17019,7 +17239,7 @@ class MapLongLongInnerBitsetHelper eProsima_user_DllExport MapLongLongInnerBitsetHelper( const MapLongLongInnerBitsetHelper& x) { - m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; + m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; } @@ -17041,7 +17261,7 @@ class MapLongLongInnerBitsetHelper const MapLongLongInnerBitsetHelper& x) { - m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; + m_var_map_longlong_innerbitsethelper = x.m_var_map_longlong_innerbitsethelper; return *this; } @@ -17116,6 +17336,8 @@ class MapLongLongInnerBitsetHelper return m_var_map_longlong_innerbitsethelper; } + + private: std::map m_var_map_longlong_innerbitsethelper; @@ -17150,7 +17372,7 @@ class MapULongLongShort eProsima_user_DllExport MapULongLongShort( const MapULongLongShort& x) { - m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; + m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; } @@ -17172,7 +17394,7 @@ class MapULongLongShort const MapULongLongShort& x) { - m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; + m_var_map_u_long_long_short = x.m_var_map_u_long_long_short; return *this; } @@ -17247,6 +17469,8 @@ class MapULongLongShort return m_var_map_u_long_long_short; } + + private: std::map m_var_map_u_long_long_short; @@ -17281,7 +17505,7 @@ class MapULongLongUShort eProsima_user_DllExport MapULongLongUShort( const MapULongLongUShort& x) { - m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; + m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; } @@ -17303,7 +17527,7 @@ class MapULongLongUShort const MapULongLongUShort& x) { - m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; + m_var_map_u_long_long_u_short = x.m_var_map_u_long_long_u_short; return *this; } @@ -17378,6 +17602,8 @@ class MapULongLongUShort return m_var_map_u_long_long_u_short; } + + private: std::map m_var_map_u_long_long_u_short; @@ -17412,7 +17638,7 @@ class MapULongLongLong eProsima_user_DllExport MapULongLongLong( const MapULongLongLong& x) { - m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; + m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; } @@ -17434,7 +17660,7 @@ class MapULongLongLong const MapULongLongLong& x) { - m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; + m_var_map_u_long_long_long = x.m_var_map_u_long_long_long; return *this; } @@ -17509,6 +17735,8 @@ class MapULongLongLong return m_var_map_u_long_long_long; } + + private: std::map m_var_map_u_long_long_long; @@ -17543,7 +17771,7 @@ class MapULongLongULong eProsima_user_DllExport MapULongLongULong( const MapULongLongULong& x) { - m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; + m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; } @@ -17565,7 +17793,7 @@ class MapULongLongULong const MapULongLongULong& x) { - m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; + m_var_map_u_long_long_u_long = x.m_var_map_u_long_long_u_long; return *this; } @@ -17640,6 +17868,8 @@ class MapULongLongULong return m_var_map_u_long_long_u_long; } + + private: std::map m_var_map_u_long_long_u_long; @@ -17674,7 +17904,7 @@ class MapULongLongLongLong eProsima_user_DllExport MapULongLongLongLong( const MapULongLongLongLong& x) { - m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; + m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; } @@ -17696,7 +17926,7 @@ class MapULongLongLongLong const MapULongLongLongLong& x) { - m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; + m_var_map_u_long_long_long_long = x.m_var_map_u_long_long_long_long; return *this; } @@ -17771,6 +18001,8 @@ class MapULongLongLongLong return m_var_map_u_long_long_long_long; } + + private: std::map m_var_map_u_long_long_long_long; @@ -17805,7 +18037,7 @@ class MapULongLongULongLong eProsima_user_DllExport MapULongLongULongLong( const MapULongLongULongLong& x) { - m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; + m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; } @@ -17827,7 +18059,7 @@ class MapULongLongULongLong const MapULongLongULongLong& x) { - m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; + m_var_map_u_long_long_u_long_long = x.m_var_map_u_long_long_u_long_long; return *this; } @@ -17902,6 +18134,8 @@ class MapULongLongULongLong return m_var_map_u_long_long_u_long_long; } + + private: std::map m_var_map_u_long_long_u_long_long; @@ -17936,7 +18170,7 @@ class MapULongLongFloat eProsima_user_DllExport MapULongLongFloat( const MapULongLongFloat& x) { - m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; + m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; } @@ -17958,7 +18192,7 @@ class MapULongLongFloat const MapULongLongFloat& x) { - m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; + m_var_map_u_long_long_float = x.m_var_map_u_long_long_float; return *this; } @@ -18033,6 +18267,8 @@ class MapULongLongFloat return m_var_map_u_long_long_float; } + + private: std::map m_var_map_u_long_long_float; @@ -18067,7 +18303,7 @@ class MapKeyULongLongValueDouble eProsima_user_DllExport MapKeyULongLongValueDouble( const MapKeyULongLongValueDouble& x) { - m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; + m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; } @@ -18089,7 +18325,7 @@ class MapKeyULongLongValueDouble const MapKeyULongLongValueDouble& x) { - m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; + m_var_map_u_long_long_double = x.m_var_map_u_long_long_double; return *this; } @@ -18164,6 +18400,8 @@ class MapKeyULongLongValueDouble return m_var_map_u_long_long_double; } + + private: std::map m_var_map_u_long_long_double; @@ -18198,7 +18436,7 @@ class MapULongLongLongDouble eProsima_user_DllExport MapULongLongLongDouble( const MapULongLongLongDouble& x) { - m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; + m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; } @@ -18220,7 +18458,7 @@ class MapULongLongLongDouble const MapULongLongLongDouble& x) { - m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; + m_var_map_u_long_long_long_double = x.m_var_map_u_long_long_long_double; return *this; } @@ -18295,6 +18533,8 @@ class MapULongLongLongDouble return m_var_map_u_long_long_long_double; } + + private: std::map m_var_map_u_long_long_long_double; @@ -18329,7 +18569,7 @@ class MapULongLongBoolean eProsima_user_DllExport MapULongLongBoolean( const MapULongLongBoolean& x) { - m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; + m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; } @@ -18351,7 +18591,7 @@ class MapULongLongBoolean const MapULongLongBoolean& x) { - m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; + m_var_map_u_long_long_boolean = x.m_var_map_u_long_long_boolean; return *this; } @@ -18426,6 +18666,8 @@ class MapULongLongBoolean return m_var_map_u_long_long_boolean; } + + private: std::map m_var_map_u_long_long_boolean; @@ -18460,7 +18702,7 @@ class MapULongLongOctet eProsima_user_DllExport MapULongLongOctet( const MapULongLongOctet& x) { - m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; + m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; } @@ -18482,7 +18724,7 @@ class MapULongLongOctet const MapULongLongOctet& x) { - m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; + m_var_map_u_long_long_octet = x.m_var_map_u_long_long_octet; return *this; } @@ -18557,6 +18799,8 @@ class MapULongLongOctet return m_var_map_u_long_long_octet; } + + private: std::map m_var_map_u_long_long_octet; @@ -18591,7 +18835,7 @@ class MapULongLongChar eProsima_user_DllExport MapULongLongChar( const MapULongLongChar& x) { - m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; + m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; } @@ -18613,7 +18857,7 @@ class MapULongLongChar const MapULongLongChar& x) { - m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; + m_var_map_u_long_long_char = x.m_var_map_u_long_long_char; return *this; } @@ -18688,6 +18932,8 @@ class MapULongLongChar return m_var_map_u_long_long_char; } + + private: std::map m_var_map_u_long_long_char; @@ -18722,7 +18968,7 @@ class MapULongLongWChar eProsima_user_DllExport MapULongLongWChar( const MapULongLongWChar& x) { - m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; + m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; } @@ -18744,7 +18990,7 @@ class MapULongLongWChar const MapULongLongWChar& x) { - m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; + m_var_map_u_long_long_wchar = x.m_var_map_u_long_long_wchar; return *this; } @@ -18819,6 +19065,8 @@ class MapULongLongWChar return m_var_map_u_long_long_wchar; } + + private: std::map m_var_map_u_long_long_wchar; @@ -18853,7 +19101,7 @@ class MapULongLongString eProsima_user_DllExport MapULongLongString( const MapULongLongString& x) { - m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; + m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; } @@ -18875,7 +19123,7 @@ class MapULongLongString const MapULongLongString& x) { - m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; + m_var_map_u_long_long_string = x.m_var_map_u_long_long_string; return *this; } @@ -18950,6 +19198,8 @@ class MapULongLongString return m_var_map_u_long_long_string; } + + private: std::map m_var_map_u_long_long_string; @@ -18984,7 +19234,7 @@ class MapULongLongWString eProsima_user_DllExport MapULongLongWString( const MapULongLongWString& x) { - m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; + m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; } @@ -19006,7 +19256,7 @@ class MapULongLongWString const MapULongLongWString& x) { - m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; + m_var_map_u_long_long_wstring = x.m_var_map_u_long_long_wstring; return *this; } @@ -19081,6 +19331,8 @@ class MapULongLongWString return m_var_map_u_long_long_wstring; } + + private: std::map m_var_map_u_long_long_wstring; @@ -19115,8 +19367,7 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedStringHelper( const MapULongLongInnerAliasBoundedStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - x.m_var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = x.m_var_map_u_long_long_inner_alias_bounded_string_helper; } @@ -19127,8 +19378,7 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedStringHelper( MapULongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! @@ -19139,8 +19389,7 @@ class MapULongLongInnerAliasBoundedStringHelper const MapULongLongInnerAliasBoundedStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - x.m_var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = x.m_var_map_u_long_long_inner_alias_bounded_string_helper; return *this; } @@ -19153,8 +19402,7 @@ class MapULongLongInnerAliasBoundedStringHelper MapULongLongInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_string_helper); return *this; } @@ -19165,8 +19413,7 @@ class MapULongLongInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasBoundedStringHelper& x) const { - return (m_var_map_u_long_long_inner_alias_bounded_string_helper == - x.m_var_map_u_long_long_inner_alias_bounded_string_helper); + return (m_var_map_u_long_long_inner_alias_bounded_string_helper == x.m_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! @@ -19184,11 +19431,9 @@ class MapULongLongInnerAliasBoundedStringHelper * @param _var_map_u_long_long_inner_alias_bounded_string_helper New value to be copied in member var_map_u_long_long_inner_alias_bounded_string_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_string_helper( - const std::map& _var_map_u_long_long_inner_alias_bounded_string_helper) + const std::map& _var_map_u_long_long_inner_alias_bounded_string_helper) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - _var_map_u_long_long_inner_alias_bounded_string_helper; + m_var_map_u_long_long_inner_alias_bounded_string_helper = _var_map_u_long_long_inner_alias_bounded_string_helper; } /*! @@ -19196,19 +19441,16 @@ class MapULongLongInnerAliasBoundedStringHelper * @param _var_map_u_long_long_inner_alias_bounded_string_helper New value to be moved in member var_map_u_long_long_inner_alias_bounded_string_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_string_helper( - std::map&& _var_map_u_long_long_inner_alias_bounded_string_helper) + std::map&& _var_map_u_long_long_inner_alias_bounded_string_helper) { - m_var_map_u_long_long_inner_alias_bounded_string_helper = - std::move(_var_map_u_long_long_inner_alias_bounded_string_helper); + m_var_map_u_long_long_inner_alias_bounded_string_helper = std::move(_var_map_u_long_long_inner_alias_bounded_string_helper); } /*! * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_bounded_string_helper * @return Constant reference to member var_map_u_long_long_inner_alias_bounded_string_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_string_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_string_helper() const { return m_var_map_u_long_long_inner_alias_bounded_string_helper; } @@ -19217,12 +19459,13 @@ class MapULongLongInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_bounded_string_helper * @return Reference to member var_map_u_long_long_inner_alias_bounded_string_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_string_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_string_helper() { return m_var_map_u_long_long_inner_alias_bounded_string_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_bounded_string_helper; @@ -19257,8 +19500,7 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedWStringHelper( const MapULongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } @@ -19269,8 +19511,7 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport MapULongLongInnerAliasBoundedWStringHelper( MapULongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! @@ -19281,8 +19522,7 @@ class MapULongLongInnerAliasBoundedWStringHelper const MapULongLongInnerAliasBoundedWStringHelper& x) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper; return *this; } @@ -19295,8 +19535,7 @@ class MapULongLongInnerAliasBoundedWStringHelper MapULongLongInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); return *this; } @@ -19307,8 +19546,7 @@ class MapULongLongInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_u_long_long_inner_alias_bounded_wstring_helper == - x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); + return (m_var_map_u_long_long_inner_alias_bounded_wstring_helper == x.m_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! @@ -19326,11 +19564,9 @@ class MapULongLongInnerAliasBoundedWStringHelper * @param _var_map_u_long_long_inner_alias_bounded_wstring_helper New value to be copied in member var_map_u_long_long_inner_alias_bounded_wstring_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_wstring_helper( - const std::map& _var_map_u_long_long_inner_alias_bounded_wstring_helper) + const std::map& _var_map_u_long_long_inner_alias_bounded_wstring_helper) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - _var_map_u_long_long_inner_alias_bounded_wstring_helper; + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = _var_map_u_long_long_inner_alias_bounded_wstring_helper; } /*! @@ -19338,19 +19574,16 @@ class MapULongLongInnerAliasBoundedWStringHelper * @param _var_map_u_long_long_inner_alias_bounded_wstring_helper New value to be moved in member var_map_u_long_long_inner_alias_bounded_wstring_helper */ eProsima_user_DllExport void var_map_u_long_long_inner_alias_bounded_wstring_helper( - std::map&& _var_map_u_long_long_inner_alias_bounded_wstring_helper) + std::map&& _var_map_u_long_long_inner_alias_bounded_wstring_helper) { - m_var_map_u_long_long_inner_alias_bounded_wstring_helper = - std::move(_var_map_u_long_long_inner_alias_bounded_wstring_helper); + m_var_map_u_long_long_inner_alias_bounded_wstring_helper = std::move(_var_map_u_long_long_inner_alias_bounded_wstring_helper); } /*! * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper * @return Constant reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() const { return m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } @@ -19359,12 +19592,13 @@ class MapULongLongInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper * @return Reference to member var_map_u_long_long_inner_alias_bounded_wstring_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_bounded_wstring_helper() { return m_var_map_u_long_long_inner_alias_bounded_wstring_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_bounded_wstring_helper; @@ -19399,7 +19633,7 @@ class MapULongLongInnerEnumHelper eProsima_user_DllExport MapULongLongInnerEnumHelper( const MapULongLongInnerEnumHelper& x) { - m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; + m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; } @@ -19421,7 +19655,7 @@ class MapULongLongInnerEnumHelper const MapULongLongInnerEnumHelper& x) { - m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; + m_var_map_u_long_long_inner_enum_helper = x.m_var_map_u_long_long_inner_enum_helper; return *this; } @@ -19496,6 +19730,8 @@ class MapULongLongInnerEnumHelper return m_var_map_u_long_long_inner_enum_helper; } + + private: std::map m_var_map_u_long_long_inner_enum_helper; @@ -19530,7 +19766,7 @@ class MapULongLongInnerBitMaskHelper eProsima_user_DllExport MapULongLongInnerBitMaskHelper( const MapULongLongInnerBitMaskHelper& x) { - m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; + m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; } @@ -19552,7 +19788,7 @@ class MapULongLongInnerBitMaskHelper const MapULongLongInnerBitMaskHelper& x) { - m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; + m_var_map_u_long_long_inner_bit_mask_helper = x.m_var_map_u_long_long_inner_bit_mask_helper; return *this; } @@ -19613,8 +19849,7 @@ class MapULongLongInnerBitMaskHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_bit_mask_helper * @return Constant reference to member var_map_u_long_long_inner_bit_mask_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_bit_mask_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_bit_mask_helper() const { return m_var_map_u_long_long_inner_bit_mask_helper; } @@ -19628,6 +19863,8 @@ class MapULongLongInnerBitMaskHelper return m_var_map_u_long_long_inner_bit_mask_helper; } + + private: std::map m_var_map_u_long_long_inner_bit_mask_helper; @@ -19662,7 +19899,7 @@ class MapULongLongInnerAliasHelper eProsima_user_DllExport MapULongLongInnerAliasHelper( const MapULongLongInnerAliasHelper& x) { - m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; + m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; } @@ -19684,7 +19921,7 @@ class MapULongLongInnerAliasHelper const MapULongLongInnerAliasHelper& x) { - m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; + m_var_map_u_long_long_inner_alias_helper = x.m_var_map_u_long_long_inner_alias_helper; return *this; } @@ -19759,6 +19996,8 @@ class MapULongLongInnerAliasHelper return m_var_map_u_long_long_inner_alias_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_helper; @@ -19793,7 +20032,7 @@ class MapULongLongInnerAliasArrayHelper eProsima_user_DllExport MapULongLongInnerAliasArrayHelper( const MapULongLongInnerAliasArrayHelper& x) { - m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; + m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; } @@ -19815,7 +20054,7 @@ class MapULongLongInnerAliasArrayHelper const MapULongLongInnerAliasArrayHelper& x) { - m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; + m_var_map_u_long_long_inner_alias_array_helper = x.m_var_map_u_long_long_inner_alias_array_helper; return *this; } @@ -19876,8 +20115,7 @@ class MapULongLongInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_array_helper * @return Constant reference to member var_map_u_long_long_inner_alias_array_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_array_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_array_helper() const { return m_var_map_u_long_long_inner_alias_array_helper; } @@ -19891,6 +20129,8 @@ class MapULongLongInnerAliasArrayHelper return m_var_map_u_long_long_inner_alias_array_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_array_helper; @@ -19925,7 +20165,7 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport MapULongLongInnerAliasSequenceHelper( const MapULongLongInnerAliasSequenceHelper& x) { - m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; + m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; } @@ -19936,8 +20176,7 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport MapULongLongInnerAliasSequenceHelper( MapULongLongInnerAliasSequenceHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_sequence_helper = - std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); + m_var_map_u_long_long_inner_alias_sequence_helper = std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); } /*! @@ -19948,7 +20187,7 @@ class MapULongLongInnerAliasSequenceHelper const MapULongLongInnerAliasSequenceHelper& x) { - m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; + m_var_map_u_long_long_inner_alias_sequence_helper = x.m_var_map_u_long_long_inner_alias_sequence_helper; return *this; } @@ -19961,8 +20200,7 @@ class MapULongLongInnerAliasSequenceHelper MapULongLongInnerAliasSequenceHelper&& x) noexcept { - m_var_map_u_long_long_inner_alias_sequence_helper = - std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); + m_var_map_u_long_long_inner_alias_sequence_helper = std::move(x.m_var_map_u_long_long_inner_alias_sequence_helper); return *this; } @@ -19973,8 +20211,7 @@ class MapULongLongInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapULongLongInnerAliasSequenceHelper& x) const { - return (m_var_map_u_long_long_inner_alias_sequence_helper == - x.m_var_map_u_long_long_inner_alias_sequence_helper); + return (m_var_map_u_long_long_inner_alias_sequence_helper == x.m_var_map_u_long_long_inner_alias_sequence_helper); } /*! @@ -20011,8 +20248,7 @@ class MapULongLongInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_sequence_helper * @return Constant reference to member var_map_u_long_long_inner_alias_sequence_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_sequence_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_sequence_helper() const { return m_var_map_u_long_long_inner_alias_sequence_helper; } @@ -20021,12 +20257,13 @@ class MapULongLongInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_u_long_long_inner_alias_sequence_helper * @return Reference to member var_map_u_long_long_inner_alias_sequence_helper */ - eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_sequence_helper() + eProsima_user_DllExport std::map& var_map_u_long_long_inner_alias_sequence_helper() { return m_var_map_u_long_long_inner_alias_sequence_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_sequence_helper; @@ -20061,7 +20298,7 @@ class MapULongLongInnerAliasMapHelper eProsima_user_DllExport MapULongLongInnerAliasMapHelper( const MapULongLongInnerAliasMapHelper& x) { - m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; + m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; } @@ -20083,7 +20320,7 @@ class MapULongLongInnerAliasMapHelper const MapULongLongInnerAliasMapHelper& x) { - m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; + m_var_map_u_long_long_inner_alias_map_helper = x.m_var_map_u_long_long_inner_alias_map_helper; return *this; } @@ -20144,8 +20381,7 @@ class MapULongLongInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_alias_map_helper * @return Constant reference to member var_map_u_long_long_inner_alias_map_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_map_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_alias_map_helper() const { return m_var_map_u_long_long_inner_alias_map_helper; } @@ -20159,6 +20395,8 @@ class MapULongLongInnerAliasMapHelper return m_var_map_u_long_long_inner_alias_map_helper; } + + private: std::map m_var_map_u_long_long_inner_alias_map_helper; @@ -20193,7 +20431,7 @@ class MapULongLongInnerUnionHelper eProsima_user_DllExport MapULongLongInnerUnionHelper( const MapULongLongInnerUnionHelper& x) { - m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; + m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; } @@ -20215,7 +20453,7 @@ class MapULongLongInnerUnionHelper const MapULongLongInnerUnionHelper& x) { - m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; + m_var_map_u_long_long_inner_union_helper = x.m_var_map_u_long_long_inner_union_helper; return *this; } @@ -20290,6 +20528,8 @@ class MapULongLongInnerUnionHelper return m_var_map_u_long_long_inner_union_helper; } + + private: std::map m_var_map_u_long_long_inner_union_helper; @@ -20324,7 +20564,7 @@ class MapULongLongInnerStructureHelper eProsima_user_DllExport MapULongLongInnerStructureHelper( const MapULongLongInnerStructureHelper& x) { - m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; + m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; } @@ -20346,7 +20586,7 @@ class MapULongLongInnerStructureHelper const MapULongLongInnerStructureHelper& x) { - m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; + m_var_map_u_long_long_inner_structure_helper = x.m_var_map_u_long_long_inner_structure_helper; return *this; } @@ -20407,8 +20647,7 @@ class MapULongLongInnerStructureHelper * @brief This function returns a constant reference to member var_map_u_long_long_inner_structure_helper * @return Constant reference to member var_map_u_long_long_inner_structure_helper */ - eProsima_user_DllExport const std::map& var_map_u_long_long_inner_structure_helper() const + eProsima_user_DllExport const std::map& var_map_u_long_long_inner_structure_helper() const { return m_var_map_u_long_long_inner_structure_helper; } @@ -20422,6 +20661,8 @@ class MapULongLongInnerStructureHelper return m_var_map_u_long_long_inner_structure_helper; } + + private: std::map m_var_map_u_long_long_inner_structure_helper; @@ -20456,7 +20697,7 @@ class MapULongLongInnerBitsetHelper eProsima_user_DllExport MapULongLongInnerBitsetHelper( const MapULongLongInnerBitsetHelper& x) { - m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; + m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; } @@ -20478,7 +20719,7 @@ class MapULongLongInnerBitsetHelper const MapULongLongInnerBitsetHelper& x) { - m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; + m_var_map_u_long_long_inner_bitset_helper = x.m_var_map_u_long_long_inner_bitset_helper; return *this; } @@ -20553,6 +20794,8 @@ class MapULongLongInnerBitsetHelper return m_var_map_u_long_long_inner_bitset_helper; } + + private: std::map m_var_map_u_long_long_inner_bitset_helper; @@ -20587,7 +20830,7 @@ class MapStringShort eProsima_user_DllExport MapStringShort( const MapStringShort& x) { - m_var_map_string_short = x.m_var_map_string_short; + m_var_map_string_short = x.m_var_map_string_short; } @@ -20609,7 +20852,7 @@ class MapStringShort const MapStringShort& x) { - m_var_map_string_short = x.m_var_map_string_short; + m_var_map_string_short = x.m_var_map_string_short; return *this; } @@ -20684,6 +20927,8 @@ class MapStringShort return m_var_map_string_short; } + + private: std::map m_var_map_string_short; @@ -20718,7 +20963,7 @@ class MapStringUShort eProsima_user_DllExport MapStringUShort( const MapStringUShort& x) { - m_var_map_string_ushort = x.m_var_map_string_ushort; + m_var_map_string_ushort = x.m_var_map_string_ushort; } @@ -20740,7 +20985,7 @@ class MapStringUShort const MapStringUShort& x) { - m_var_map_string_ushort = x.m_var_map_string_ushort; + m_var_map_string_ushort = x.m_var_map_string_ushort; return *this; } @@ -20815,6 +21060,8 @@ class MapStringUShort return m_var_map_string_ushort; } + + private: std::map m_var_map_string_ushort; @@ -20849,7 +21096,7 @@ class MapStringLong eProsima_user_DllExport MapStringLong( const MapStringLong& x) { - m_var_map_string_long = x.m_var_map_string_long; + m_var_map_string_long = x.m_var_map_string_long; } @@ -20871,7 +21118,7 @@ class MapStringLong const MapStringLong& x) { - m_var_map_string_long = x.m_var_map_string_long; + m_var_map_string_long = x.m_var_map_string_long; return *this; } @@ -20946,6 +21193,8 @@ class MapStringLong return m_var_map_string_long; } + + private: std::map m_var_map_string_long; @@ -20980,7 +21229,7 @@ class MapStringULong eProsima_user_DllExport MapStringULong( const MapStringULong& x) { - m_var_map_string_ulong = x.m_var_map_string_ulong; + m_var_map_string_ulong = x.m_var_map_string_ulong; } @@ -21002,7 +21251,7 @@ class MapStringULong const MapStringULong& x) { - m_var_map_string_ulong = x.m_var_map_string_ulong; + m_var_map_string_ulong = x.m_var_map_string_ulong; return *this; } @@ -21077,6 +21326,8 @@ class MapStringULong return m_var_map_string_ulong; } + + private: std::map m_var_map_string_ulong; @@ -21111,7 +21362,7 @@ class MapStringLongLong eProsima_user_DllExport MapStringLongLong( const MapStringLongLong& x) { - m_var_map_string_longlong = x.m_var_map_string_longlong; + m_var_map_string_longlong = x.m_var_map_string_longlong; } @@ -21133,7 +21384,7 @@ class MapStringLongLong const MapStringLongLong& x) { - m_var_map_string_longlong = x.m_var_map_string_longlong; + m_var_map_string_longlong = x.m_var_map_string_longlong; return *this; } @@ -21208,6 +21459,8 @@ class MapStringLongLong return m_var_map_string_longlong; } + + private: std::map m_var_map_string_longlong; @@ -21242,7 +21495,7 @@ class MapStringULongLong eProsima_user_DllExport MapStringULongLong( const MapStringULongLong& x) { - m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; + m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; } @@ -21264,7 +21517,7 @@ class MapStringULongLong const MapStringULongLong& x) { - m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; + m_var_map_string_ulonglong = x.m_var_map_string_ulonglong; return *this; } @@ -21339,6 +21592,8 @@ class MapStringULongLong return m_var_map_string_ulonglong; } + + private: std::map m_var_map_string_ulonglong; @@ -21373,7 +21628,7 @@ class MapStringFloat eProsima_user_DllExport MapStringFloat( const MapStringFloat& x) { - m_var_map_string_float = x.m_var_map_string_float; + m_var_map_string_float = x.m_var_map_string_float; } @@ -21395,7 +21650,7 @@ class MapStringFloat const MapStringFloat& x) { - m_var_map_string_float = x.m_var_map_string_float; + m_var_map_string_float = x.m_var_map_string_float; return *this; } @@ -21470,6 +21725,8 @@ class MapStringFloat return m_var_map_string_float; } + + private: std::map m_var_map_string_float; @@ -21504,7 +21761,7 @@ class MapStringDouble eProsima_user_DllExport MapStringDouble( const MapStringDouble& x) { - m_var_map_string_double = x.m_var_map_string_double; + m_var_map_string_double = x.m_var_map_string_double; } @@ -21526,7 +21783,7 @@ class MapStringDouble const MapStringDouble& x) { - m_var_map_string_double = x.m_var_map_string_double; + m_var_map_string_double = x.m_var_map_string_double; return *this; } @@ -21601,6 +21858,8 @@ class MapStringDouble return m_var_map_string_double; } + + private: std::map m_var_map_string_double; @@ -21635,7 +21894,7 @@ class MapStringLongDouble eProsima_user_DllExport MapStringLongDouble( const MapStringLongDouble& x) { - m_var_map_string_longdouble = x.m_var_map_string_longdouble; + m_var_map_string_longdouble = x.m_var_map_string_longdouble; } @@ -21657,7 +21916,7 @@ class MapStringLongDouble const MapStringLongDouble& x) { - m_var_map_string_longdouble = x.m_var_map_string_longdouble; + m_var_map_string_longdouble = x.m_var_map_string_longdouble; return *this; } @@ -21732,6 +21991,8 @@ class MapStringLongDouble return m_var_map_string_longdouble; } + + private: std::map m_var_map_string_longdouble; @@ -21766,7 +22027,7 @@ class MapStringBoolean eProsima_user_DllExport MapStringBoolean( const MapStringBoolean& x) { - m_var_map_string_boolean = x.m_var_map_string_boolean; + m_var_map_string_boolean = x.m_var_map_string_boolean; } @@ -21788,7 +22049,7 @@ class MapStringBoolean const MapStringBoolean& x) { - m_var_map_string_boolean = x.m_var_map_string_boolean; + m_var_map_string_boolean = x.m_var_map_string_boolean; return *this; } @@ -21863,6 +22124,8 @@ class MapStringBoolean return m_var_map_string_boolean; } + + private: std::map m_var_map_string_boolean; @@ -21897,7 +22160,7 @@ class MapStringOctet eProsima_user_DllExport MapStringOctet( const MapStringOctet& x) { - m_var_map_string_octet = x.m_var_map_string_octet; + m_var_map_string_octet = x.m_var_map_string_octet; } @@ -21919,7 +22182,7 @@ class MapStringOctet const MapStringOctet& x) { - m_var_map_string_octet = x.m_var_map_string_octet; + m_var_map_string_octet = x.m_var_map_string_octet; return *this; } @@ -21994,6 +22257,8 @@ class MapStringOctet return m_var_map_string_octet; } + + private: std::map m_var_map_string_octet; @@ -22028,7 +22293,7 @@ class MapStringChar eProsima_user_DllExport MapStringChar( const MapStringChar& x) { - m_var_map_string_char = x.m_var_map_string_char; + m_var_map_string_char = x.m_var_map_string_char; } @@ -22050,7 +22315,7 @@ class MapStringChar const MapStringChar& x) { - m_var_map_string_char = x.m_var_map_string_char; + m_var_map_string_char = x.m_var_map_string_char; return *this; } @@ -22125,6 +22390,8 @@ class MapStringChar return m_var_map_string_char; } + + private: std::map m_var_map_string_char; @@ -22159,7 +22426,7 @@ class MapStringWChar eProsima_user_DllExport MapStringWChar( const MapStringWChar& x) { - m_var_map_string_wchar = x.m_var_map_string_wchar; + m_var_map_string_wchar = x.m_var_map_string_wchar; } @@ -22181,7 +22448,7 @@ class MapStringWChar const MapStringWChar& x) { - m_var_map_string_wchar = x.m_var_map_string_wchar; + m_var_map_string_wchar = x.m_var_map_string_wchar; return *this; } @@ -22256,6 +22523,8 @@ class MapStringWChar return m_var_map_string_wchar; } + + private: std::map m_var_map_string_wchar; @@ -22290,7 +22559,7 @@ class MapStringString eProsima_user_DllExport MapStringString( const MapStringString& x) { - m_var_map_string_string = x.m_var_map_string_string; + m_var_map_string_string = x.m_var_map_string_string; } @@ -22312,7 +22581,7 @@ class MapStringString const MapStringString& x) { - m_var_map_string_string = x.m_var_map_string_string; + m_var_map_string_string = x.m_var_map_string_string; return *this; } @@ -22387,6 +22656,8 @@ class MapStringString return m_var_map_string_string; } + + private: std::map m_var_map_string_string; @@ -22421,7 +22692,7 @@ class MapStringWString eProsima_user_DllExport MapStringWString( const MapStringWString& x) { - m_var_map_string_wstring = x.m_var_map_string_wstring; + m_var_map_string_wstring = x.m_var_map_string_wstring; } @@ -22443,7 +22714,7 @@ class MapStringWString const MapStringWString& x) { - m_var_map_string_wstring = x.m_var_map_string_wstring; + m_var_map_string_wstring = x.m_var_map_string_wstring; return *this; } @@ -22518,6 +22789,8 @@ class MapStringWString return m_var_map_string_wstring; } + + private: std::map m_var_map_string_wstring; @@ -22552,7 +22825,7 @@ class MapStringInnerAliasBoundedStringHelper eProsima_user_DllExport MapStringInnerAliasBoundedStringHelper( const MapStringInnerAliasBoundedStringHelper& x) { - m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; + m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; } @@ -22574,7 +22847,7 @@ class MapStringInnerAliasBoundedStringHelper const MapStringInnerAliasBoundedStringHelper& x) { - m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; + m_var_map_string_inneraliasboundedstringhelper = x.m_var_map_string_inneraliasboundedstringhelper; return *this; } @@ -22616,8 +22889,7 @@ class MapStringInnerAliasBoundedStringHelper * @param _var_map_string_inneraliasboundedstringhelper New value to be copied in member var_map_string_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_string_inneraliasboundedstringhelper( - const std::map& _var_map_string_inneraliasboundedstringhelper) + const std::map& _var_map_string_inneraliasboundedstringhelper) { m_var_map_string_inneraliasboundedstringhelper = _var_map_string_inneraliasboundedstringhelper; } @@ -22636,8 +22908,7 @@ class MapStringInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_string_inneraliasboundedstringhelper * @return Constant reference to member var_map_string_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedstringhelper() const { return m_var_map_string_inneraliasboundedstringhelper; } @@ -22646,12 +22917,13 @@ class MapStringInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_string_inneraliasboundedstringhelper * @return Reference to member var_map_string_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_string_inneraliasboundedstringhelper() { return m_var_map_string_inneraliasboundedstringhelper; } + + private: std::map m_var_map_string_inneraliasboundedstringhelper; @@ -22686,7 +22958,7 @@ class MapStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapStringInnerAliasBoundedWStringHelper( const MapStringInnerAliasBoundedWStringHelper& x) { - m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; + m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; } @@ -22708,7 +22980,7 @@ class MapStringInnerAliasBoundedWStringHelper const MapStringInnerAliasBoundedWStringHelper& x) { - m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; + m_var_map_string_inneraliasboundedwstringhelper = x.m_var_map_string_inneraliasboundedwstringhelper; return *this; } @@ -22750,8 +23022,7 @@ class MapStringInnerAliasBoundedWStringHelper * @param _var_map_string_inneraliasboundedwstringhelper New value to be copied in member var_map_string_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_string_inneraliasboundedwstringhelper( - const std::map& _var_map_string_inneraliasboundedwstringhelper) + const std::map& _var_map_string_inneraliasboundedwstringhelper) { m_var_map_string_inneraliasboundedwstringhelper = _var_map_string_inneraliasboundedwstringhelper; } @@ -22770,8 +23041,7 @@ class MapStringInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_string_inneraliasboundedwstringhelper * @return Constant reference to member var_map_string_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasboundedwstringhelper() const { return m_var_map_string_inneraliasboundedwstringhelper; } @@ -22780,12 +23050,13 @@ class MapStringInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_string_inneraliasboundedwstringhelper * @return Reference to member var_map_string_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_string_inneraliasboundedwstringhelper() { return m_var_map_string_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_string_inneraliasboundedwstringhelper; @@ -22820,7 +23091,7 @@ class MapStringInnerEnumHelper eProsima_user_DllExport MapStringInnerEnumHelper( const MapStringInnerEnumHelper& x) { - m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; + m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; } @@ -22842,7 +23113,7 @@ class MapStringInnerEnumHelper const MapStringInnerEnumHelper& x) { - m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; + m_var_map_string_innerenumhelper = x.m_var_map_string_innerenumhelper; return *this; } @@ -22917,6 +23188,8 @@ class MapStringInnerEnumHelper return m_var_map_string_innerenumhelper; } + + private: std::map m_var_map_string_innerenumhelper; @@ -22951,7 +23224,7 @@ class MapStringInnerBitMaskHelper eProsima_user_DllExport MapStringInnerBitMaskHelper( const MapStringInnerBitMaskHelper& x) { - m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; + m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; } @@ -22973,7 +23246,7 @@ class MapStringInnerBitMaskHelper const MapStringInnerBitMaskHelper& x) { - m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; + m_var_map_string_innerbitmaskhelper = x.m_var_map_string_innerbitmaskhelper; return *this; } @@ -23048,6 +23321,8 @@ class MapStringInnerBitMaskHelper return m_var_map_string_innerbitmaskhelper; } + + private: std::map m_var_map_string_innerbitmaskhelper; @@ -23082,7 +23357,7 @@ class MapStringInnerAliasHelper eProsima_user_DllExport MapStringInnerAliasHelper( const MapStringInnerAliasHelper& x) { - m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; + m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; } @@ -23104,7 +23379,7 @@ class MapStringInnerAliasHelper const MapStringInnerAliasHelper& x) { - m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; + m_var_map_string_inneraliashelper = x.m_var_map_string_inneraliashelper; return *this; } @@ -23179,6 +23454,8 @@ class MapStringInnerAliasHelper return m_var_map_string_inneraliashelper; } + + private: std::map m_var_map_string_inneraliashelper; @@ -23213,7 +23490,7 @@ class MapStringInnerAliasArrayHelper eProsima_user_DllExport MapStringInnerAliasArrayHelper( const MapStringInnerAliasArrayHelper& x) { - m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; + m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; } @@ -23235,7 +23512,7 @@ class MapStringInnerAliasArrayHelper const MapStringInnerAliasArrayHelper& x) { - m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; + m_var_map_string_inneraliasarrayhelper = x.m_var_map_string_inneraliasarrayhelper; return *this; } @@ -23296,8 +23573,7 @@ class MapStringInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_string_inneraliasarrayhelper * @return Constant reference to member var_map_string_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasarrayhelper() const { return m_var_map_string_inneraliasarrayhelper; } @@ -23311,6 +23587,8 @@ class MapStringInnerAliasArrayHelper return m_var_map_string_inneraliasarrayhelper; } + + private: std::map m_var_map_string_inneraliasarrayhelper; @@ -23345,7 +23623,7 @@ class MapStringInnerAliasSequenceHelper eProsima_user_DllExport MapStringInnerAliasSequenceHelper( const MapStringInnerAliasSequenceHelper& x) { - m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; + m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; } @@ -23367,7 +23645,7 @@ class MapStringInnerAliasSequenceHelper const MapStringInnerAliasSequenceHelper& x) { - m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; + m_var_map_string_inneraliassequencehelper = x.m_var_map_string_inneraliassequencehelper; return *this; } @@ -23428,8 +23706,7 @@ class MapStringInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_string_inneraliassequencehelper * @return Constant reference to member var_map_string_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliassequencehelper() const { return m_var_map_string_inneraliassequencehelper; } @@ -23438,12 +23715,13 @@ class MapStringInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_string_inneraliassequencehelper * @return Reference to member var_map_string_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_string_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_string_inneraliassequencehelper() { return m_var_map_string_inneraliassequencehelper; } + + private: std::map m_var_map_string_inneraliassequencehelper; @@ -23478,7 +23756,7 @@ class MapStringInnerAliasMapHelper eProsima_user_DllExport MapStringInnerAliasMapHelper( const MapStringInnerAliasMapHelper& x) { - m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; + m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; } @@ -23500,7 +23778,7 @@ class MapStringInnerAliasMapHelper const MapStringInnerAliasMapHelper& x) { - m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; + m_var_map_string_inneraliasmaphelper = x.m_var_map_string_inneraliasmaphelper; return *this; } @@ -23561,8 +23839,7 @@ class MapStringInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_string_inneraliasmaphelper * @return Constant reference to member var_map_string_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_string_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_string_inneraliasmaphelper() const { return m_var_map_string_inneraliasmaphelper; } @@ -23576,6 +23853,8 @@ class MapStringInnerAliasMapHelper return m_var_map_string_inneraliasmaphelper; } + + private: std::map m_var_map_string_inneraliasmaphelper; @@ -23610,7 +23889,7 @@ class MapStringInnerUnionHelper eProsima_user_DllExport MapStringInnerUnionHelper( const MapStringInnerUnionHelper& x) { - m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; + m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; } @@ -23632,7 +23911,7 @@ class MapStringInnerUnionHelper const MapStringInnerUnionHelper& x) { - m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; + m_var_map_string_innerunionhelper = x.m_var_map_string_innerunionhelper; return *this; } @@ -23707,6 +23986,8 @@ class MapStringInnerUnionHelper return m_var_map_string_innerunionhelper; } + + private: std::map m_var_map_string_innerunionhelper; @@ -23741,7 +24022,7 @@ class MapStringInnerStructureHelper eProsima_user_DllExport MapStringInnerStructureHelper( const MapStringInnerStructureHelper& x) { - m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; + m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; } @@ -23763,7 +24044,7 @@ class MapStringInnerStructureHelper const MapStringInnerStructureHelper& x) { - m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; + m_var_map_string_innerstructurehelper = x.m_var_map_string_innerstructurehelper; return *this; } @@ -23824,8 +24105,7 @@ class MapStringInnerStructureHelper * @brief This function returns a constant reference to member var_map_string_innerstructurehelper * @return Constant reference to member var_map_string_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_string_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_string_innerstructurehelper() const { return m_var_map_string_innerstructurehelper; } @@ -23839,6 +24119,8 @@ class MapStringInnerStructureHelper return m_var_map_string_innerstructurehelper; } + + private: std::map m_var_map_string_innerstructurehelper; @@ -23873,7 +24155,7 @@ class MapStringInnerBitsetHelper eProsima_user_DllExport MapStringInnerBitsetHelper( const MapStringInnerBitsetHelper& x) { - m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; + m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; } @@ -23895,7 +24177,7 @@ class MapStringInnerBitsetHelper const MapStringInnerBitsetHelper& x) { - m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; + m_var_map_string_innerbitsethelper = x.m_var_map_string_innerbitsethelper; return *this; } @@ -23970,6 +24252,8 @@ class MapStringInnerBitsetHelper return m_var_map_string_innerbitsethelper; } + + private: std::map m_var_map_string_innerbitsethelper; @@ -24004,7 +24288,7 @@ class MapWStringShort eProsima_user_DllExport MapWStringShort( const MapWStringShort& x) { - m_var_map_wstring_short = x.m_var_map_wstring_short; + m_var_map_wstring_short = x.m_var_map_wstring_short; } @@ -24026,7 +24310,7 @@ class MapWStringShort const MapWStringShort& x) { - m_var_map_wstring_short = x.m_var_map_wstring_short; + m_var_map_wstring_short = x.m_var_map_wstring_short; return *this; } @@ -24101,6 +24385,8 @@ class MapWStringShort return m_var_map_wstring_short; } + + private: std::map m_var_map_wstring_short; @@ -24135,7 +24421,7 @@ class MapWStringUShort eProsima_user_DllExport MapWStringUShort( const MapWStringUShort& x) { - m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; + m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; } @@ -24157,7 +24443,7 @@ class MapWStringUShort const MapWStringUShort& x) { - m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; + m_var_map_wstring_ushort = x.m_var_map_wstring_ushort; return *this; } @@ -24232,6 +24518,8 @@ class MapWStringUShort return m_var_map_wstring_ushort; } + + private: std::map m_var_map_wstring_ushort; @@ -24266,7 +24554,7 @@ class MapWStringLong eProsima_user_DllExport MapWStringLong( const MapWStringLong& x) { - m_var_map_wstring_long = x.m_var_map_wstring_long; + m_var_map_wstring_long = x.m_var_map_wstring_long; } @@ -24288,7 +24576,7 @@ class MapWStringLong const MapWStringLong& x) { - m_var_map_wstring_long = x.m_var_map_wstring_long; + m_var_map_wstring_long = x.m_var_map_wstring_long; return *this; } @@ -24363,6 +24651,8 @@ class MapWStringLong return m_var_map_wstring_long; } + + private: std::map m_var_map_wstring_long; @@ -24397,7 +24687,7 @@ class MapWStringULong eProsima_user_DllExport MapWStringULong( const MapWStringULong& x) { - m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; + m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; } @@ -24419,7 +24709,7 @@ class MapWStringULong const MapWStringULong& x) { - m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; + m_var_map_wstring_ulong = x.m_var_map_wstring_ulong; return *this; } @@ -24494,6 +24784,8 @@ class MapWStringULong return m_var_map_wstring_ulong; } + + private: std::map m_var_map_wstring_ulong; @@ -24528,7 +24820,7 @@ class MapWStringLongLong eProsima_user_DllExport MapWStringLongLong( const MapWStringLongLong& x) { - m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; + m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; } @@ -24550,7 +24842,7 @@ class MapWStringLongLong const MapWStringLongLong& x) { - m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; + m_var_map_wstring_longlong = x.m_var_map_wstring_longlong; return *this; } @@ -24625,6 +24917,8 @@ class MapWStringLongLong return m_var_map_wstring_longlong; } + + private: std::map m_var_map_wstring_longlong; @@ -24659,7 +24953,7 @@ class MapWStringULongLong eProsima_user_DllExport MapWStringULongLong( const MapWStringULongLong& x) { - m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; + m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; } @@ -24681,7 +24975,7 @@ class MapWStringULongLong const MapWStringULongLong& x) { - m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; + m_var_map_wstring_ulonglong = x.m_var_map_wstring_ulonglong; return *this; } @@ -24756,6 +25050,8 @@ class MapWStringULongLong return m_var_map_wstring_ulonglong; } + + private: std::map m_var_map_wstring_ulonglong; @@ -24790,7 +25086,7 @@ class MapWStringFloat eProsima_user_DllExport MapWStringFloat( const MapWStringFloat& x) { - m_var_map_wstring_float = x.m_var_map_wstring_float; + m_var_map_wstring_float = x.m_var_map_wstring_float; } @@ -24812,7 +25108,7 @@ class MapWStringFloat const MapWStringFloat& x) { - m_var_map_wstring_float = x.m_var_map_wstring_float; + m_var_map_wstring_float = x.m_var_map_wstring_float; return *this; } @@ -24887,6 +25183,8 @@ class MapWStringFloat return m_var_map_wstring_float; } + + private: std::map m_var_map_wstring_float; @@ -24921,7 +25219,7 @@ class MapWStringDouble eProsima_user_DllExport MapWStringDouble( const MapWStringDouble& x) { - m_var_map_wstring_double = x.m_var_map_wstring_double; + m_var_map_wstring_double = x.m_var_map_wstring_double; } @@ -24943,7 +25241,7 @@ class MapWStringDouble const MapWStringDouble& x) { - m_var_map_wstring_double = x.m_var_map_wstring_double; + m_var_map_wstring_double = x.m_var_map_wstring_double; return *this; } @@ -25018,6 +25316,8 @@ class MapWStringDouble return m_var_map_wstring_double; } + + private: std::map m_var_map_wstring_double; @@ -25052,7 +25352,7 @@ class MapWStringLongDouble eProsima_user_DllExport MapWStringLongDouble( const MapWStringLongDouble& x) { - m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; + m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; } @@ -25074,7 +25374,7 @@ class MapWStringLongDouble const MapWStringLongDouble& x) { - m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; + m_var_map_wstring_longdouble = x.m_var_map_wstring_longdouble; return *this; } @@ -25149,6 +25449,8 @@ class MapWStringLongDouble return m_var_map_wstring_longdouble; } + + private: std::map m_var_map_wstring_longdouble; @@ -25183,7 +25485,7 @@ class MapWStringBoolean eProsima_user_DllExport MapWStringBoolean( const MapWStringBoolean& x) { - m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; + m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; } @@ -25205,7 +25507,7 @@ class MapWStringBoolean const MapWStringBoolean& x) { - m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; + m_var_map_wstring_boolean = x.m_var_map_wstring_boolean; return *this; } @@ -25280,6 +25582,8 @@ class MapWStringBoolean return m_var_map_wstring_boolean; } + + private: std::map m_var_map_wstring_boolean; @@ -25314,7 +25618,7 @@ class MapWStringOctet eProsima_user_DllExport MapWStringOctet( const MapWStringOctet& x) { - m_var_map_wstring_octet = x.m_var_map_wstring_octet; + m_var_map_wstring_octet = x.m_var_map_wstring_octet; } @@ -25336,7 +25640,7 @@ class MapWStringOctet const MapWStringOctet& x) { - m_var_map_wstring_octet = x.m_var_map_wstring_octet; + m_var_map_wstring_octet = x.m_var_map_wstring_octet; return *this; } @@ -25411,6 +25715,8 @@ class MapWStringOctet return m_var_map_wstring_octet; } + + private: std::map m_var_map_wstring_octet; @@ -25445,7 +25751,7 @@ class MapWStringChar eProsima_user_DllExport MapWStringChar( const MapWStringChar& x) { - m_var_map_wstring_char = x.m_var_map_wstring_char; + m_var_map_wstring_char = x.m_var_map_wstring_char; } @@ -25467,7 +25773,7 @@ class MapWStringChar const MapWStringChar& x) { - m_var_map_wstring_char = x.m_var_map_wstring_char; + m_var_map_wstring_char = x.m_var_map_wstring_char; return *this; } @@ -25542,6 +25848,8 @@ class MapWStringChar return m_var_map_wstring_char; } + + private: std::map m_var_map_wstring_char; @@ -25576,7 +25884,7 @@ class MapWStringWChar eProsima_user_DllExport MapWStringWChar( const MapWStringWChar& x) { - m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; + m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; } @@ -25598,7 +25906,7 @@ class MapWStringWChar const MapWStringWChar& x) { - m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; + m_var_map_wstring_wchar = x.m_var_map_wstring_wchar; return *this; } @@ -25673,6 +25981,8 @@ class MapWStringWChar return m_var_map_wstring_wchar; } + + private: std::map m_var_map_wstring_wchar; @@ -25707,7 +26017,7 @@ class MapWStringString eProsima_user_DllExport MapWStringString( const MapWStringString& x) { - m_var_map_wstring_string = x.m_var_map_wstring_string; + m_var_map_wstring_string = x.m_var_map_wstring_string; } @@ -25729,7 +26039,7 @@ class MapWStringString const MapWStringString& x) { - m_var_map_wstring_string = x.m_var_map_wstring_string; + m_var_map_wstring_string = x.m_var_map_wstring_string; return *this; } @@ -25804,6 +26114,8 @@ class MapWStringString return m_var_map_wstring_string; } + + private: std::map m_var_map_wstring_string; @@ -25838,7 +26150,7 @@ class MapWStringWString eProsima_user_DllExport MapWStringWString( const MapWStringWString& x) { - m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; + m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; } @@ -25860,7 +26172,7 @@ class MapWStringWString const MapWStringWString& x) { - m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; + m_var_map_wstring_wstring = x.m_var_map_wstring_wstring; return *this; } @@ -25935,6 +26247,8 @@ class MapWStringWString return m_var_map_wstring_wstring; } + + private: std::map m_var_map_wstring_wstring; @@ -25969,7 +26283,7 @@ class MapWStringInnerAliasBoundedStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedStringHelper( const MapWStringInnerAliasBoundedStringHelper& x) { - m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; + m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; } @@ -25991,7 +26305,7 @@ class MapWStringInnerAliasBoundedStringHelper const MapWStringInnerAliasBoundedStringHelper& x) { - m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; + m_var_map_wstring_inneraliasboundedstringhelper = x.m_var_map_wstring_inneraliasboundedstringhelper; return *this; } @@ -26033,8 +26347,7 @@ class MapWStringInnerAliasBoundedStringHelper * @param _var_map_wstring_inneraliasboundedstringhelper New value to be copied in member var_map_wstring_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedstringhelper( - const std::map& _var_map_wstring_inneraliasboundedstringhelper) + const std::map& _var_map_wstring_inneraliasboundedstringhelper) { m_var_map_wstring_inneraliasboundedstringhelper = _var_map_wstring_inneraliasboundedstringhelper; } @@ -26053,8 +26366,7 @@ class MapWStringInnerAliasBoundedStringHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasboundedstringhelper * @return Constant reference to member var_map_wstring_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedstringhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedstringhelper() const { return m_var_map_wstring_inneraliasboundedstringhelper; } @@ -26063,12 +26375,13 @@ class MapWStringInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_wstring_inneraliasboundedstringhelper * @return Reference to member var_map_wstring_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedstringhelper() { return m_var_map_wstring_inneraliasboundedstringhelper; } + + private: std::map m_var_map_wstring_inneraliasboundedstringhelper; @@ -26103,7 +26416,7 @@ class MapWStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedWStringHelper( const MapWStringInnerAliasBoundedWStringHelper& x) { - m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; + m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; } @@ -26114,8 +26427,7 @@ class MapWStringInnerAliasBoundedWStringHelper eProsima_user_DllExport MapWStringInnerAliasBoundedWStringHelper( MapWStringInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_wstring_inneraliasboundedwstringhelper = - std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); + m_var_map_wstring_inneraliasboundedwstringhelper = std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); } /*! @@ -26126,7 +26438,7 @@ class MapWStringInnerAliasBoundedWStringHelper const MapWStringInnerAliasBoundedWStringHelper& x) { - m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; + m_var_map_wstring_inneraliasboundedwstringhelper = x.m_var_map_wstring_inneraliasboundedwstringhelper; return *this; } @@ -26139,8 +26451,7 @@ class MapWStringInnerAliasBoundedWStringHelper MapWStringInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_wstring_inneraliasboundedwstringhelper = - std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); + m_var_map_wstring_inneraliasboundedwstringhelper = std::move(x.m_var_map_wstring_inneraliasboundedwstringhelper); return *this; } @@ -26169,8 +26480,7 @@ class MapWStringInnerAliasBoundedWStringHelper * @param _var_map_wstring_inneraliasboundedwstringhelper New value to be copied in member var_map_wstring_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedwstringhelper( - const std::map& _var_map_wstring_inneraliasboundedwstringhelper) + const std::map& _var_map_wstring_inneraliasboundedwstringhelper) { m_var_map_wstring_inneraliasboundedwstringhelper = _var_map_wstring_inneraliasboundedwstringhelper; } @@ -26180,8 +26490,7 @@ class MapWStringInnerAliasBoundedWStringHelper * @param _var_map_wstring_inneraliasboundedwstringhelper New value to be moved in member var_map_wstring_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_wstring_inneraliasboundedwstringhelper( - std::map&& _var_map_wstring_inneraliasboundedwstringhelper) + std::map&& _var_map_wstring_inneraliasboundedwstringhelper) { m_var_map_wstring_inneraliasboundedwstringhelper = std::move(_var_map_wstring_inneraliasboundedwstringhelper); } @@ -26190,8 +26499,7 @@ class MapWStringInnerAliasBoundedWStringHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasboundedwstringhelper * @return Constant reference to member var_map_wstring_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedwstringhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasboundedwstringhelper() const { return m_var_map_wstring_inneraliasboundedwstringhelper; } @@ -26200,12 +26508,13 @@ class MapWStringInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_wstring_inneraliasboundedwstringhelper * @return Reference to member var_map_wstring_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliasboundedwstringhelper() { return m_var_map_wstring_inneraliasboundedwstringhelper; } + + private: std::map m_var_map_wstring_inneraliasboundedwstringhelper; @@ -26240,7 +26549,7 @@ class MapWStringInnerEnumHelper eProsima_user_DllExport MapWStringInnerEnumHelper( const MapWStringInnerEnumHelper& x) { - m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; + m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; } @@ -26262,7 +26571,7 @@ class MapWStringInnerEnumHelper const MapWStringInnerEnumHelper& x) { - m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; + m_var_map_wstring_innerenumhelper = x.m_var_map_wstring_innerenumhelper; return *this; } @@ -26337,6 +26646,8 @@ class MapWStringInnerEnumHelper return m_var_map_wstring_innerenumhelper; } + + private: std::map m_var_map_wstring_innerenumhelper; @@ -26371,7 +26682,7 @@ class MapWStringInnerBitMaskHelper eProsima_user_DllExport MapWStringInnerBitMaskHelper( const MapWStringInnerBitMaskHelper& x) { - m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; + m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; } @@ -26393,7 +26704,7 @@ class MapWStringInnerBitMaskHelper const MapWStringInnerBitMaskHelper& x) { - m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; + m_var_map_wstring_innerbitmaskhelper = x.m_var_map_wstring_innerbitmaskhelper; return *this; } @@ -26468,6 +26779,8 @@ class MapWStringInnerBitMaskHelper return m_var_map_wstring_innerbitmaskhelper; } + + private: std::map m_var_map_wstring_innerbitmaskhelper; @@ -26502,7 +26815,7 @@ class MapWStringInnerAliasHelper eProsima_user_DllExport MapWStringInnerAliasHelper( const MapWStringInnerAliasHelper& x) { - m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; + m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; } @@ -26524,7 +26837,7 @@ class MapWStringInnerAliasHelper const MapWStringInnerAliasHelper& x) { - m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; + m_var_map_wstring_inneraliashelper = x.m_var_map_wstring_inneraliashelper; return *this; } @@ -26599,6 +26912,8 @@ class MapWStringInnerAliasHelper return m_var_map_wstring_inneraliashelper; } + + private: std::map m_var_map_wstring_inneraliashelper; @@ -26633,7 +26948,7 @@ class MapWStringInnerAliasArrayHelper eProsima_user_DllExport MapWStringInnerAliasArrayHelper( const MapWStringInnerAliasArrayHelper& x) { - m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; + m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; } @@ -26655,7 +26970,7 @@ class MapWStringInnerAliasArrayHelper const MapWStringInnerAliasArrayHelper& x) { - m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; + m_var_map_wstring_inneraliasarrayhelper = x.m_var_map_wstring_inneraliasarrayhelper; return *this; } @@ -26716,8 +27031,7 @@ class MapWStringInnerAliasArrayHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasarrayhelper * @return Constant reference to member var_map_wstring_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasarrayhelper() const { return m_var_map_wstring_inneraliasarrayhelper; } @@ -26731,6 +27045,8 @@ class MapWStringInnerAliasArrayHelper return m_var_map_wstring_inneraliasarrayhelper; } + + private: std::map m_var_map_wstring_inneraliasarrayhelper; @@ -26765,7 +27081,7 @@ class MapWStringInnerAliasSequenceHelper eProsima_user_DllExport MapWStringInnerAliasSequenceHelper( const MapWStringInnerAliasSequenceHelper& x) { - m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; + m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; } @@ -26787,7 +27103,7 @@ class MapWStringInnerAliasSequenceHelper const MapWStringInnerAliasSequenceHelper& x) { - m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; + m_var_map_wstring_inneraliassequencehelper = x.m_var_map_wstring_inneraliassequencehelper; return *this; } @@ -26848,8 +27164,7 @@ class MapWStringInnerAliasSequenceHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliassequencehelper * @return Constant reference to member var_map_wstring_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliassequencehelper() const { return m_var_map_wstring_inneraliassequencehelper; } @@ -26858,12 +27173,13 @@ class MapWStringInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_wstring_inneraliassequencehelper * @return Reference to member var_map_wstring_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_wstring_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_wstring_inneraliassequencehelper() { return m_var_map_wstring_inneraliassequencehelper; } + + private: std::map m_var_map_wstring_inneraliassequencehelper; @@ -26898,7 +27214,7 @@ class MapWStringInnerAliasMapHelper eProsima_user_DllExport MapWStringInnerAliasMapHelper( const MapWStringInnerAliasMapHelper& x) { - m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; + m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; } @@ -26920,7 +27236,7 @@ class MapWStringInnerAliasMapHelper const MapWStringInnerAliasMapHelper& x) { - m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; + m_var_map_wstring_inneraliasmaphelper = x.m_var_map_wstring_inneraliasmaphelper; return *this; } @@ -26981,8 +27297,7 @@ class MapWStringInnerAliasMapHelper * @brief This function returns a constant reference to member var_map_wstring_inneraliasmaphelper * @return Constant reference to member var_map_wstring_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_wstring_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_wstring_inneraliasmaphelper() const { return m_var_map_wstring_inneraliasmaphelper; } @@ -26996,6 +27311,8 @@ class MapWStringInnerAliasMapHelper return m_var_map_wstring_inneraliasmaphelper; } + + private: std::map m_var_map_wstring_inneraliasmaphelper; @@ -27030,7 +27347,7 @@ class MapWStringInnerUnionHelper eProsima_user_DllExport MapWStringInnerUnionHelper( const MapWStringInnerUnionHelper& x) { - m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; + m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; } @@ -27052,7 +27369,7 @@ class MapWStringInnerUnionHelper const MapWStringInnerUnionHelper& x) { - m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; + m_var_map_wstring_innerunionhelper = x.m_var_map_wstring_innerunionhelper; return *this; } @@ -27127,6 +27444,8 @@ class MapWStringInnerUnionHelper return m_var_map_wstring_innerunionhelper; } + + private: std::map m_var_map_wstring_innerunionhelper; @@ -27161,7 +27480,7 @@ class MapWStringInnerStructureHelper eProsima_user_DllExport MapWStringInnerStructureHelper( const MapWStringInnerStructureHelper& x) { - m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; + m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; } @@ -27183,7 +27502,7 @@ class MapWStringInnerStructureHelper const MapWStringInnerStructureHelper& x) { - m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; + m_var_map_wstring_innerstructurehelper = x.m_var_map_wstring_innerstructurehelper; return *this; } @@ -27244,8 +27563,7 @@ class MapWStringInnerStructureHelper * @brief This function returns a constant reference to member var_map_wstring_innerstructurehelper * @return Constant reference to member var_map_wstring_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_wstring_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_wstring_innerstructurehelper() const { return m_var_map_wstring_innerstructurehelper; } @@ -27259,6 +27577,8 @@ class MapWStringInnerStructureHelper return m_var_map_wstring_innerstructurehelper; } + + private: std::map m_var_map_wstring_innerstructurehelper; @@ -27293,7 +27613,7 @@ class MapWStringInnerBitsetHelper eProsima_user_DllExport MapWStringInnerBitsetHelper( const MapWStringInnerBitsetHelper& x) { - m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; + m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; } @@ -27315,7 +27635,7 @@ class MapWStringInnerBitsetHelper const MapWStringInnerBitsetHelper& x) { - m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; + m_var_map_wstring_innerbitsethelper = x.m_var_map_wstring_innerbitsethelper; return *this; } @@ -27390,6 +27710,8 @@ class MapWStringInnerBitsetHelper return m_var_map_wstring_innerbitsethelper; } + + private: std::map m_var_map_wstring_innerbitsethelper; @@ -27424,7 +27746,7 @@ class MapInnerAliasBoundedStringHelperShort eProsima_user_DllExport MapInnerAliasBoundedStringHelperShort( const MapInnerAliasBoundedStringHelperShort& x) { - m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; + m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; } @@ -27446,7 +27768,7 @@ class MapInnerAliasBoundedStringHelperShort const MapInnerAliasBoundedStringHelperShort& x) { - m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; + m_var_map_inneraliasboundedstringhelper_short = x.m_var_map_inneraliasboundedstringhelper_short; return *this; } @@ -27507,8 +27829,7 @@ class MapInnerAliasBoundedStringHelperShort * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_short * @return Constant reference to member var_map_inneraliasboundedstringhelper_short */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_short() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_short() const { return m_var_map_inneraliasboundedstringhelper_short; } @@ -27517,12 +27838,13 @@ class MapInnerAliasBoundedStringHelperShort * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_short * @return Reference to member var_map_inneraliasboundedstringhelper_short */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_short() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_short() { return m_var_map_inneraliasboundedstringhelper_short; } + + private: std::map m_var_map_inneraliasboundedstringhelper_short; @@ -27557,7 +27879,7 @@ class MapInnerAliasBoundedStringHelperUShort eProsima_user_DllExport MapInnerAliasBoundedStringHelperUShort( const MapInnerAliasBoundedStringHelperUShort& x) { - m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; + m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; } @@ -27579,7 +27901,7 @@ class MapInnerAliasBoundedStringHelperUShort const MapInnerAliasBoundedStringHelperUShort& x) { - m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; + m_var_map_inneraliasboundedstringhelper_ushort = x.m_var_map_inneraliasboundedstringhelper_ushort; return *this; } @@ -27640,8 +27962,7 @@ class MapInnerAliasBoundedStringHelperUShort * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ushort * @return Constant reference to member var_map_inneraliasboundedstringhelper_ushort */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ushort() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ushort() const { return m_var_map_inneraliasboundedstringhelper_ushort; } @@ -27650,12 +27971,13 @@ class MapInnerAliasBoundedStringHelperUShort * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ushort * @return Reference to member var_map_inneraliasboundedstringhelper_ushort */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ushort() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ushort() { return m_var_map_inneraliasboundedstringhelper_ushort; } + + private: std::map m_var_map_inneraliasboundedstringhelper_ushort; @@ -27690,7 +28012,7 @@ class MapInnerAliasBoundedStringHelperLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLong( const MapInnerAliasBoundedStringHelperLong& x) { - m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; + m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; } @@ -27712,7 +28034,7 @@ class MapInnerAliasBoundedStringHelperLong const MapInnerAliasBoundedStringHelperLong& x) { - m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; + m_var_map_inneraliasboundedstringhelper_long = x.m_var_map_inneraliasboundedstringhelper_long; return *this; } @@ -27773,8 +28095,7 @@ class MapInnerAliasBoundedStringHelperLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_long * @return Constant reference to member var_map_inneraliasboundedstringhelper_long */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_long() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_long() const { return m_var_map_inneraliasboundedstringhelper_long; } @@ -27783,12 +28104,13 @@ class MapInnerAliasBoundedStringHelperLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_long * @return Reference to member var_map_inneraliasboundedstringhelper_long */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_long() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_long() { return m_var_map_inneraliasboundedstringhelper_long; } + + private: std::map m_var_map_inneraliasboundedstringhelper_long; @@ -27823,7 +28145,7 @@ class MapInnerAliasBoundedStringHelperULong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULong( const MapInnerAliasBoundedStringHelperULong& x) { - m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; + m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; } @@ -27845,7 +28167,7 @@ class MapInnerAliasBoundedStringHelperULong const MapInnerAliasBoundedStringHelperULong& x) { - m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; + m_var_map_inneraliasboundedstringhelper_ulong = x.m_var_map_inneraliasboundedstringhelper_ulong; return *this; } @@ -27906,8 +28228,7 @@ class MapInnerAliasBoundedStringHelperULong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ulong * @return Constant reference to member var_map_inneraliasboundedstringhelper_ulong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulong() const { return m_var_map_inneraliasboundedstringhelper_ulong; } @@ -27916,12 +28237,13 @@ class MapInnerAliasBoundedStringHelperULong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ulong * @return Reference to member var_map_inneraliasboundedstringhelper_ulong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulong() { return m_var_map_inneraliasboundedstringhelper_ulong; } + + private: std::map m_var_map_inneraliasboundedstringhelper_ulong; @@ -27956,7 +28278,7 @@ class MapInnerAliasBoundedStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongLong( const MapInnerAliasBoundedStringHelperLongLong& x) { - m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; + m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; } @@ -27967,8 +28289,7 @@ class MapInnerAliasBoundedStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongLong( MapInnerAliasBoundedStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longlong = - std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); + m_var_map_inneraliasboundedstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); } /*! @@ -27979,7 +28300,7 @@ class MapInnerAliasBoundedStringHelperLongLong const MapInnerAliasBoundedStringHelperLongLong& x) { - m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; + m_var_map_inneraliasboundedstringhelper_longlong = x.m_var_map_inneraliasboundedstringhelper_longlong; return *this; } @@ -27992,8 +28313,7 @@ class MapInnerAliasBoundedStringHelperLongLong MapInnerAliasBoundedStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longlong = - std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); + m_var_map_inneraliasboundedstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedstringhelper_longlong); return *this; } @@ -28041,8 +28361,7 @@ class MapInnerAliasBoundedStringHelperLongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_longlong * @return Constant reference to member var_map_inneraliasboundedstringhelper_longlong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longlong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longlong() const { return m_var_map_inneraliasboundedstringhelper_longlong; } @@ -28051,12 +28370,13 @@ class MapInnerAliasBoundedStringHelperLongLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_longlong * @return Reference to member var_map_inneraliasboundedstringhelper_longlong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longlong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longlong() { return m_var_map_inneraliasboundedstringhelper_longlong; } + + private: std::map m_var_map_inneraliasboundedstringhelper_longlong; @@ -28091,7 +28411,7 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULongLong( const MapInnerAliasBoundedStringHelperULongLong& x) { - m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; + m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28102,8 +28422,7 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedStringHelperULongLong( MapInnerAliasBoundedStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_ulonglong = - std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); + m_var_map_inneraliasboundedstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); } /*! @@ -28114,7 +28433,7 @@ class MapInnerAliasBoundedStringHelperULongLong const MapInnerAliasBoundedStringHelperULongLong& x) { - m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; + m_var_map_inneraliasboundedstringhelper_ulonglong = x.m_var_map_inneraliasboundedstringhelper_ulonglong; return *this; } @@ -28127,8 +28446,7 @@ class MapInnerAliasBoundedStringHelperULongLong MapInnerAliasBoundedStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_ulonglong = - std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); + m_var_map_inneraliasboundedstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedstringhelper_ulonglong); return *this; } @@ -28139,8 +28457,7 @@ class MapInnerAliasBoundedStringHelperULongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperULongLong& x) const { - return (m_var_map_inneraliasboundedstringhelper_ulonglong == - x.m_var_map_inneraliasboundedstringhelper_ulonglong); + return (m_var_map_inneraliasboundedstringhelper_ulonglong == x.m_var_map_inneraliasboundedstringhelper_ulonglong); } /*! @@ -28158,8 +28475,7 @@ class MapInnerAliasBoundedStringHelperULongLong * @param _var_map_inneraliasboundedstringhelper_ulonglong New value to be copied in member var_map_inneraliasboundedstringhelper_ulonglong */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_ulonglong( - const std::map& _var_map_inneraliasboundedstringhelper_ulonglong) + const std::map& _var_map_inneraliasboundedstringhelper_ulonglong) { m_var_map_inneraliasboundedstringhelper_ulonglong = _var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28178,8 +28494,7 @@ class MapInnerAliasBoundedStringHelperULongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_ulonglong * @return Constant reference to member var_map_inneraliasboundedstringhelper_ulonglong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulonglong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_ulonglong() const { return m_var_map_inneraliasboundedstringhelper_ulonglong; } @@ -28188,12 +28503,13 @@ class MapInnerAliasBoundedStringHelperULongLong * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_ulonglong * @return Reference to member var_map_inneraliasboundedstringhelper_ulonglong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulonglong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_ulonglong() { return m_var_map_inneraliasboundedstringhelper_ulonglong; } + + private: std::map m_var_map_inneraliasboundedstringhelper_ulonglong; @@ -28228,7 +28544,7 @@ class MapInnerAliasBoundedStringHelperFloat eProsima_user_DllExport MapInnerAliasBoundedStringHelperFloat( const MapInnerAliasBoundedStringHelperFloat& x) { - m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; + m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; } @@ -28250,7 +28566,7 @@ class MapInnerAliasBoundedStringHelperFloat const MapInnerAliasBoundedStringHelperFloat& x) { - m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; + m_var_map_inneraliasboundedstringhelper_float = x.m_var_map_inneraliasboundedstringhelper_float; return *this; } @@ -28311,8 +28627,7 @@ class MapInnerAliasBoundedStringHelperFloat * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_float * @return Constant reference to member var_map_inneraliasboundedstringhelper_float */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_float() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_float() const { return m_var_map_inneraliasboundedstringhelper_float; } @@ -28321,12 +28636,13 @@ class MapInnerAliasBoundedStringHelperFloat * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_float * @return Reference to member var_map_inneraliasboundedstringhelper_float */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_float() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_float() { return m_var_map_inneraliasboundedstringhelper_float; } + + private: std::map m_var_map_inneraliasboundedstringhelper_float; @@ -28361,7 +28677,7 @@ class MapInnerAliasBoundedStringHelperDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperDouble( const MapInnerAliasBoundedStringHelperDouble& x) { - m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; + m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; } @@ -28383,7 +28699,7 @@ class MapInnerAliasBoundedStringHelperDouble const MapInnerAliasBoundedStringHelperDouble& x) { - m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; + m_var_map_inneraliasboundedstringhelper_double = x.m_var_map_inneraliasboundedstringhelper_double; return *this; } @@ -28444,8 +28760,7 @@ class MapInnerAliasBoundedStringHelperDouble * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_double * @return Constant reference to member var_map_inneraliasboundedstringhelper_double */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_double() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_double() const { return m_var_map_inneraliasboundedstringhelper_double; } @@ -28454,12 +28769,13 @@ class MapInnerAliasBoundedStringHelperDouble * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_double * @return Reference to member var_map_inneraliasboundedstringhelper_double */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_double() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_double() { return m_var_map_inneraliasboundedstringhelper_double; } + + private: std::map m_var_map_inneraliasboundedstringhelper_double; @@ -28494,7 +28810,7 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongDouble( const MapInnerAliasBoundedStringHelperLongDouble& x) { - m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; + m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; } @@ -28505,8 +28821,7 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedStringHelperLongDouble( MapInnerAliasBoundedStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longdouble = - std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); } /*! @@ -28517,7 +28832,7 @@ class MapInnerAliasBoundedStringHelperLongDouble const MapInnerAliasBoundedStringHelperLongDouble& x) { - m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; + m_var_map_inneraliasboundedstringhelper_longdouble = x.m_var_map_inneraliasboundedstringhelper_longdouble; return *this; } @@ -28530,8 +28845,7 @@ class MapInnerAliasBoundedStringHelperLongDouble MapInnerAliasBoundedStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_longdouble = - std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedstringhelper_longdouble); return *this; } @@ -28542,8 +28856,7 @@ class MapInnerAliasBoundedStringHelperLongDouble eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperLongDouble& x) const { - return (m_var_map_inneraliasboundedstringhelper_longdouble == - x.m_var_map_inneraliasboundedstringhelper_longdouble); + return (m_var_map_inneraliasboundedstringhelper_longdouble == x.m_var_map_inneraliasboundedstringhelper_longdouble); } /*! @@ -28561,8 +28874,7 @@ class MapInnerAliasBoundedStringHelperLongDouble * @param _var_map_inneraliasboundedstringhelper_longdouble New value to be copied in member var_map_inneraliasboundedstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_longdouble( - const std::map& _var_map_inneraliasboundedstringhelper_longdouble) + const std::map& _var_map_inneraliasboundedstringhelper_longdouble) { m_var_map_inneraliasboundedstringhelper_longdouble = _var_map_inneraliasboundedstringhelper_longdouble; } @@ -28572,19 +28884,16 @@ class MapInnerAliasBoundedStringHelperLongDouble * @param _var_map_inneraliasboundedstringhelper_longdouble New value to be moved in member var_map_inneraliasboundedstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_longdouble( - std::map&& _var_map_inneraliasboundedstringhelper_longdouble) + std::map&& _var_map_inneraliasboundedstringhelper_longdouble) { - m_var_map_inneraliasboundedstringhelper_longdouble = - std::move(_var_map_inneraliasboundedstringhelper_longdouble); + m_var_map_inneraliasboundedstringhelper_longdouble = std::move(_var_map_inneraliasboundedstringhelper_longdouble); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_longdouble * @return Constant reference to member var_map_inneraliasboundedstringhelper_longdouble */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longdouble() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_longdouble() const { return m_var_map_inneraliasboundedstringhelper_longdouble; } @@ -28593,12 +28902,13 @@ class MapInnerAliasBoundedStringHelperLongDouble * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_longdouble * @return Reference to member var_map_inneraliasboundedstringhelper_longdouble */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longdouble() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_longdouble() { return m_var_map_inneraliasboundedstringhelper_longdouble; } + + private: std::map m_var_map_inneraliasboundedstringhelper_longdouble; @@ -28633,7 +28943,7 @@ class MapInnerAliasBoundedStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedStringHelperBoolean( const MapInnerAliasBoundedStringHelperBoolean& x) { - m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; + m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; } @@ -28655,7 +28965,7 @@ class MapInnerAliasBoundedStringHelperBoolean const MapInnerAliasBoundedStringHelperBoolean& x) { - m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; + m_var_map_inneraliasboundedstringhelper_boolean = x.m_var_map_inneraliasboundedstringhelper_boolean; return *this; } @@ -28716,8 +29026,7 @@ class MapInnerAliasBoundedStringHelperBoolean * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_boolean * @return Constant reference to member var_map_inneraliasboundedstringhelper_boolean */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_boolean() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_boolean() const { return m_var_map_inneraliasboundedstringhelper_boolean; } @@ -28726,12 +29035,13 @@ class MapInnerAliasBoundedStringHelperBoolean * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_boolean * @return Reference to member var_map_inneraliasboundedstringhelper_boolean */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_boolean() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_boolean() { return m_var_map_inneraliasboundedstringhelper_boolean; } + + private: std::map m_var_map_inneraliasboundedstringhelper_boolean; @@ -28766,7 +29076,7 @@ class MapInnerAliasBoundedStringHelperOctet eProsima_user_DllExport MapInnerAliasBoundedStringHelperOctet( const MapInnerAliasBoundedStringHelperOctet& x) { - m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; + m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; } @@ -28788,7 +29098,7 @@ class MapInnerAliasBoundedStringHelperOctet const MapInnerAliasBoundedStringHelperOctet& x) { - m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; + m_var_map_inneraliasboundedstringhelper_octet = x.m_var_map_inneraliasboundedstringhelper_octet; return *this; } @@ -28849,8 +29159,7 @@ class MapInnerAliasBoundedStringHelperOctet * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_octet * @return Constant reference to member var_map_inneraliasboundedstringhelper_octet */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_octet() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_octet() const { return m_var_map_inneraliasboundedstringhelper_octet; } @@ -28859,12 +29168,13 @@ class MapInnerAliasBoundedStringHelperOctet * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_octet * @return Reference to member var_map_inneraliasboundedstringhelper_octet */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_octet() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_octet() { return m_var_map_inneraliasboundedstringhelper_octet; } + + private: std::map m_var_map_inneraliasboundedstringhelper_octet; @@ -28899,7 +29209,7 @@ class MapInnerAliasBoundedStringHelperChar eProsima_user_DllExport MapInnerAliasBoundedStringHelperChar( const MapInnerAliasBoundedStringHelperChar& x) { - m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; + m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; } @@ -28921,7 +29231,7 @@ class MapInnerAliasBoundedStringHelperChar const MapInnerAliasBoundedStringHelperChar& x) { - m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; + m_var_map_inneraliasboundedstringhelper_char = x.m_var_map_inneraliasboundedstringhelper_char; return *this; } @@ -28982,8 +29292,7 @@ class MapInnerAliasBoundedStringHelperChar * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_char * @return Constant reference to member var_map_inneraliasboundedstringhelper_char */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_char() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_char() const { return m_var_map_inneraliasboundedstringhelper_char; } @@ -28992,12 +29301,13 @@ class MapInnerAliasBoundedStringHelperChar * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_char * @return Reference to member var_map_inneraliasboundedstringhelper_char */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_char() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_char() { return m_var_map_inneraliasboundedstringhelper_char; } + + private: std::map m_var_map_inneraliasboundedstringhelper_char; @@ -29032,7 +29342,7 @@ class MapInnerAliasBoundedStringHelperWChar eProsima_user_DllExport MapInnerAliasBoundedStringHelperWChar( const MapInnerAliasBoundedStringHelperWChar& x) { - m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; + m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; } @@ -29054,7 +29364,7 @@ class MapInnerAliasBoundedStringHelperWChar const MapInnerAliasBoundedStringHelperWChar& x) { - m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; + m_var_map_inneraliasboundedstringhelper_wchar = x.m_var_map_inneraliasboundedstringhelper_wchar; return *this; } @@ -29115,8 +29425,7 @@ class MapInnerAliasBoundedStringHelperWChar * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_wchar * @return Constant reference to member var_map_inneraliasboundedstringhelper_wchar */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wchar() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wchar() const { return m_var_map_inneraliasboundedstringhelper_wchar; } @@ -29125,12 +29434,13 @@ class MapInnerAliasBoundedStringHelperWChar * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_wchar * @return Reference to member var_map_inneraliasboundedstringhelper_wchar */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wchar() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wchar() { return m_var_map_inneraliasboundedstringhelper_wchar; } + + private: std::map m_var_map_inneraliasboundedstringhelper_wchar; @@ -29165,7 +29475,7 @@ class MapInnerAliasBoundedStringHelperString eProsima_user_DllExport MapInnerAliasBoundedStringHelperString( const MapInnerAliasBoundedStringHelperString& x) { - m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; + m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; } @@ -29187,7 +29497,7 @@ class MapInnerAliasBoundedStringHelperString const MapInnerAliasBoundedStringHelperString& x) { - m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; + m_var_map_inneraliasboundedstringhelper_string = x.m_var_map_inneraliasboundedstringhelper_string; return *this; } @@ -29229,8 +29539,7 @@ class MapInnerAliasBoundedStringHelperString * @param _var_map_inneraliasboundedstringhelper_string New value to be copied in member var_map_inneraliasboundedstringhelper_string */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_string( - const std::map& _var_map_inneraliasboundedstringhelper_string) + const std::map& _var_map_inneraliasboundedstringhelper_string) { m_var_map_inneraliasboundedstringhelper_string = _var_map_inneraliasboundedstringhelper_string; } @@ -29249,8 +29558,7 @@ class MapInnerAliasBoundedStringHelperString * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_string * @return Constant reference to member var_map_inneraliasboundedstringhelper_string */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_string() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_string() const { return m_var_map_inneraliasboundedstringhelper_string; } @@ -29259,12 +29567,13 @@ class MapInnerAliasBoundedStringHelperString * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_string * @return Reference to member var_map_inneraliasboundedstringhelper_string */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_string() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_string() { return m_var_map_inneraliasboundedstringhelper_string; } + + private: std::map m_var_map_inneraliasboundedstringhelper_string; @@ -29299,7 +29608,7 @@ class MapInnerAliasBoundedStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedStringHelperWString( const MapInnerAliasBoundedStringHelperWString& x) { - m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; + m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; } @@ -29321,7 +29630,7 @@ class MapInnerAliasBoundedStringHelperWString const MapInnerAliasBoundedStringHelperWString& x) { - m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; + m_var_map_inneraliasboundedstringhelper_wstring = x.m_var_map_inneraliasboundedstringhelper_wstring; return *this; } @@ -29363,8 +29672,7 @@ class MapInnerAliasBoundedStringHelperWString * @param _var_map_inneraliasboundedstringhelper_wstring New value to be copied in member var_map_inneraliasboundedstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_wstring( - const std::map& _var_map_inneraliasboundedstringhelper_wstring) + const std::map& _var_map_inneraliasboundedstringhelper_wstring) { m_var_map_inneraliasboundedstringhelper_wstring = _var_map_inneraliasboundedstringhelper_wstring; } @@ -29383,8 +29691,7 @@ class MapInnerAliasBoundedStringHelperWString * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_wstring * @return Constant reference to member var_map_inneraliasboundedstringhelper_wstring */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wstring() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_wstring() const { return m_var_map_inneraliasboundedstringhelper_wstring; } @@ -29393,12 +29700,13 @@ class MapInnerAliasBoundedStringHelperWString * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_wstring * @return Reference to member var_map_inneraliasboundedstringhelper_wstring */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wstring() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_wstring() { return m_var_map_inneraliasboundedstringhelper_wstring; } + + private: std::map m_var_map_inneraliasboundedstringhelper_wstring; @@ -29433,8 +29741,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper( const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } @@ -29445,8 +29752,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper( MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! @@ -29457,8 +29763,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; return *this; } @@ -29471,8 +29776,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); return *this; } @@ -29483,8 +29787,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! @@ -29502,11 +29805,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } /*! @@ -29514,20 +29815,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() - const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } @@ -29536,16 +29833,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedstringhelper; }; /*! @@ -29577,8 +29874,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper( const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } @@ -29589,8 +29885,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper( MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! @@ -29601,8 +29896,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; return *this; } @@ -29615,8 +29909,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); return *this; } @@ -29627,8 +29920,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! @@ -29646,11 +29938,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } /*! @@ -29658,20 +29948,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() - const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } @@ -29680,16 +29966,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasboundedwstringhelper; }; /*! @@ -29721,8 +30007,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerEnumHelper( const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; } @@ -29733,8 +30018,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerEnumHelper( MapInnerAliasBoundedStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! @@ -29745,8 +30029,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedstringhelper_innerenumhelper; return *this; } @@ -29759,8 +30042,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper MapInnerAliasBoundedStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); return *this; } @@ -29771,8 +30053,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerEnumHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerenumhelper == - x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); + return (m_var_map_inneraliasboundedstringhelper_innerenumhelper == x.m_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! @@ -29790,11 +30071,9 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedstringhelper_innerenumhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerenumhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerenumhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - _var_map_inneraliasboundedstringhelper_innerenumhelper; + m_var_map_inneraliasboundedstringhelper_innerenumhelper = _var_map_inneraliasboundedstringhelper_innerenumhelper; } /*! @@ -29802,19 +30081,16 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedstringhelper_innerenumhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerenumhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerenumhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedstringhelper_innerenumhelper = - std::move(_var_map_inneraliasboundedstringhelper_innerenumhelper); + m_var_map_inneraliasboundedstringhelper_innerenumhelper = std::move(_var_map_inneraliasboundedstringhelper_innerenumhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerenumhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerenumhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() const { return m_var_map_inneraliasboundedstringhelper_innerenumhelper; } @@ -29823,16 +30099,16 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerenumhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerenumhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerenumhelper() { return m_var_map_inneraliasboundedstringhelper_innerenumhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_innerenumhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerenumhelper; }; /*! @@ -29864,8 +30140,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitMaskHelper( const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } @@ -29876,8 +30151,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitMaskHelper( MapInnerAliasBoundedStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! @@ -29888,8 +30162,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; return *this; } @@ -29902,8 +30175,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper MapInnerAliasBoundedStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); return *this; } @@ -29914,8 +30186,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerBitMaskHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper == - x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + return (m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper == x.m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! @@ -29933,11 +30204,9 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedstringhelper_innerbitmaskhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitmaskhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - _var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = _var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } /*! @@ -29945,19 +30214,16 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedstringhelper_innerbitmaskhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitmaskhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = - std::move(_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper = std::move(_var_map_inneraliasboundedstringhelper_innerbitmaskhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() const { return m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } @@ -29966,16 +30232,16 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitmaskhelper() { return m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerbitmaskhelper; }; /*! @@ -30007,8 +30273,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasHelper( const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; } @@ -30019,8 +30284,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasHelper( MapInnerAliasBoundedStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! @@ -30031,8 +30295,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedstringhelper_inneraliashelper; return *this; } @@ -30045,8 +30308,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper MapInnerAliasBoundedStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); return *this; } @@ -30057,8 +30319,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliashelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliashelper == x.m_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! @@ -30076,11 +30337,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedstringhelper_inneraliashelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliashelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliashelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - _var_map_inneraliasboundedstringhelper_inneraliashelper; + m_var_map_inneraliasboundedstringhelper_inneraliashelper = _var_map_inneraliasboundedstringhelper_inneraliashelper; } /*! @@ -30088,19 +30347,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedstringhelper_inneraliashelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliashelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliashelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedstringhelper_inneraliashelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliashelper); + m_var_map_inneraliasboundedstringhelper_inneraliashelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliashelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliashelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliashelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliashelper; } @@ -30109,16 +30365,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliashelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliashelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliashelper() { return m_var_map_inneraliasboundedstringhelper_inneraliashelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliashelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliashelper; }; /*! @@ -30150,8 +30406,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasArrayHelper( const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } @@ -30162,8 +30417,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasArrayHelper( MapInnerAliasBoundedStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! @@ -30174,8 +30428,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; return *this; } @@ -30188,8 +30441,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper MapInnerAliasBoundedStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); return *this; } @@ -30200,8 +30452,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasArrayHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! @@ -30219,11 +30470,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasarrayhelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } /*! @@ -30231,19 +30480,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasarrayhelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } @@ -30252,16 +30498,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasarrayhelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasarrayhelper; }; /*! @@ -30293,8 +30539,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper( const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } @@ -30305,8 +30550,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper( MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! @@ -30317,8 +30561,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; return *this; } @@ -30331,8 +30574,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); return *this; } @@ -30343,8 +30585,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper == x.m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! @@ -30362,11 +30603,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedstringhelper_inneraliassequencehelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliassequencehelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - _var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = _var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } /*! @@ -30374,19 +30613,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedstringhelper_inneraliassequencehelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliassequencehelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliassequencehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } @@ -30395,16 +30631,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliassequencehelper() { return m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliassequencehelper; }; /*! @@ -30436,8 +30672,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasMapHelper( const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } @@ -30448,8 +30683,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerAliasMapHelper( MapInnerAliasBoundedStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! @@ -30460,8 +30694,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; return *this; } @@ -30474,8 +30707,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper MapInnerAliasBoundedStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); return *this; } @@ -30486,8 +30718,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerAliasMapHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper == - x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + return (m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper == x.m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! @@ -30505,11 +30736,9 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasmaphelper New value to be copied in member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasmaphelper( - const std::map& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) + const std::map& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - _var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = _var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } /*! @@ -30517,19 +30746,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedstringhelper_inneraliasmaphelper New value to be moved in member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_inneraliasmaphelper( - std::map&& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) + std::map&& _var_map_inneraliasboundedstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = - std::move(_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper = std::move(_var_map_inneraliasboundedstringhelper_inneraliasmaphelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() const { return m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } @@ -30538,16 +30764,16 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper * @return Reference to member var_map_inneraliasboundedstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_inneraliasmaphelper() { return m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; + std::map m_var_map_inneraliasboundedstringhelper_inneraliasmaphelper; }; /*! @@ -30579,8 +30805,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerUnionHelper( const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; } @@ -30591,8 +30816,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerUnionHelper( MapInnerAliasBoundedStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! @@ -30603,8 +30827,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedstringhelper_innerunionhelper; return *this; } @@ -30617,8 +30840,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper MapInnerAliasBoundedStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); return *this; } @@ -30629,8 +30851,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerUnionHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerunionhelper == - x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); + return (m_var_map_inneraliasboundedstringhelper_innerunionhelper == x.m_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! @@ -30648,11 +30869,9 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedstringhelper_innerunionhelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerunionhelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerunionhelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - _var_map_inneraliasboundedstringhelper_innerunionhelper; + m_var_map_inneraliasboundedstringhelper_innerunionhelper = _var_map_inneraliasboundedstringhelper_innerunionhelper; } /*! @@ -30660,19 +30879,16 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedstringhelper_innerunionhelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerunionhelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerunionhelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedstringhelper_innerunionhelper = - std::move(_var_map_inneraliasboundedstringhelper_innerunionhelper); + m_var_map_inneraliasboundedstringhelper_innerunionhelper = std::move(_var_map_inneraliasboundedstringhelper_innerunionhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerunionhelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerunionhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() const { return m_var_map_inneraliasboundedstringhelper_innerunionhelper; } @@ -30681,16 +30897,16 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerunionhelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerunionhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerunionhelper() { return m_var_map_inneraliasboundedstringhelper_innerunionhelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_innerunionhelper; + std::map m_var_map_inneraliasboundedstringhelper_innerunionhelper; }; /*! @@ -30722,8 +30938,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerStructureHelper( const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } @@ -30734,8 +30949,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerStructureHelper( MapInnerAliasBoundedStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! @@ -30746,8 +30960,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper; return *this; } @@ -30760,8 +30973,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper MapInnerAliasBoundedStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); return *this; } @@ -30772,8 +30984,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerStructureHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerstructurehelper == - x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); + return (m_var_map_inneraliasboundedstringhelper_innerstructurehelper == x.m_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! @@ -30791,11 +31002,9 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedstringhelper_innerstructurehelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerstructurehelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerstructurehelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - _var_map_inneraliasboundedstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = _var_map_inneraliasboundedstringhelper_innerstructurehelper; } /*! @@ -30803,19 +31012,16 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedstringhelper_innerstructurehelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerstructurehelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerstructurehelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedstringhelper_innerstructurehelper = - std::move(_var_map_inneraliasboundedstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedstringhelper_innerstructurehelper = std::move(_var_map_inneraliasboundedstringhelper_innerstructurehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() const { return m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } @@ -30824,16 +31030,16 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerstructurehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerstructurehelper() { return m_var_map_inneraliasboundedstringhelper_innerstructurehelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_innerstructurehelper; + std::map m_var_map_inneraliasboundedstringhelper_innerstructurehelper; }; /*! @@ -30865,8 +31071,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitsetHelper( const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } @@ -30877,8 +31082,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedStringHelperInnerBitsetHelper( MapInnerAliasBoundedStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! @@ -30889,8 +31093,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper; return *this; } @@ -30903,8 +31106,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper MapInnerAliasBoundedStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); return *this; } @@ -30915,8 +31117,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedStringHelperInnerBitsetHelper& x) const { - return (m_var_map_inneraliasboundedstringhelper_innerbitsethelper == - x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); + return (m_var_map_inneraliasboundedstringhelper_innerbitsethelper == x.m_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! @@ -30934,11 +31135,9 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedstringhelper_innerbitsethelper New value to be copied in member var_map_inneraliasboundedstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitsethelper( - const std::map& _var_map_inneraliasboundedstringhelper_innerbitsethelper) + const std::map& _var_map_inneraliasboundedstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - _var_map_inneraliasboundedstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = _var_map_inneraliasboundedstringhelper_innerbitsethelper; } /*! @@ -30946,19 +31145,16 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedstringhelper_innerbitsethelper New value to be moved in member var_map_inneraliasboundedstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedstringhelper_innerbitsethelper( - std::map&& _var_map_inneraliasboundedstringhelper_innerbitsethelper) + std::map&& _var_map_inneraliasboundedstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedstringhelper_innerbitsethelper = - std::move(_var_map_inneraliasboundedstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedstringhelper_innerbitsethelper = std::move(_var_map_inneraliasboundedstringhelper_innerbitsethelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper * @return Constant reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() const { return m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } @@ -30967,16 +31163,16 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelper * @brief This function returns a reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper * @return Reference to member var_map_inneraliasboundedstringhelper_innerbitsethelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedstringhelper_innerbitsethelper() { return m_var_map_inneraliasboundedstringhelper_innerbitsethelper; } + + private: - std::map m_var_map_inneraliasboundedstringhelper_innerbitsethelper; + std::map m_var_map_inneraliasboundedstringhelper_innerbitsethelper; }; /*! @@ -31008,7 +31204,7 @@ class MapInnerAliasBoundedWStringHelperShort eProsima_user_DllExport MapInnerAliasBoundedWStringHelperShort( const MapInnerAliasBoundedWStringHelperShort& x) { - m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; + m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; } @@ -31030,7 +31226,7 @@ class MapInnerAliasBoundedWStringHelperShort const MapInnerAliasBoundedWStringHelperShort& x) { - m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; + m_var_map_inneraliasboundedwstringhelper_short = x.m_var_map_inneraliasboundedwstringhelper_short; return *this; } @@ -31091,8 +31287,7 @@ class MapInnerAliasBoundedWStringHelperShort * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_short * @return Constant reference to member var_map_inneraliasboundedwstringhelper_short */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_short() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_short() const { return m_var_map_inneraliasboundedwstringhelper_short; } @@ -31101,12 +31296,13 @@ class MapInnerAliasBoundedWStringHelperShort * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_short * @return Reference to member var_map_inneraliasboundedwstringhelper_short */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_short() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_short() { return m_var_map_inneraliasboundedwstringhelper_short; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_short; @@ -31141,7 +31337,7 @@ class MapInnerAliasBoundedWStringHelperUShort eProsima_user_DllExport MapInnerAliasBoundedWStringHelperUShort( const MapInnerAliasBoundedWStringHelperUShort& x) { - m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; + m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; } @@ -31163,7 +31359,7 @@ class MapInnerAliasBoundedWStringHelperUShort const MapInnerAliasBoundedWStringHelperUShort& x) { - m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; + m_var_map_inneraliasboundedwstringhelper_ushort = x.m_var_map_inneraliasboundedwstringhelper_ushort; return *this; } @@ -31205,8 +31401,7 @@ class MapInnerAliasBoundedWStringHelperUShort * @param _var_map_inneraliasboundedwstringhelper_ushort New value to be copied in member var_map_inneraliasboundedwstringhelper_ushort */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ushort( - const std::map& _var_map_inneraliasboundedwstringhelper_ushort) + const std::map& _var_map_inneraliasboundedwstringhelper_ushort) { m_var_map_inneraliasboundedwstringhelper_ushort = _var_map_inneraliasboundedwstringhelper_ushort; } @@ -31225,8 +31420,7 @@ class MapInnerAliasBoundedWStringHelperUShort * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ushort * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ushort */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ushort() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ushort() const { return m_var_map_inneraliasboundedwstringhelper_ushort; } @@ -31235,12 +31429,13 @@ class MapInnerAliasBoundedWStringHelperUShort * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ushort * @return Reference to member var_map_inneraliasboundedwstringhelper_ushort */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ushort() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ushort() { return m_var_map_inneraliasboundedwstringhelper_ushort; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_ushort; @@ -31275,7 +31470,7 @@ class MapInnerAliasBoundedWStringHelperLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLong( const MapInnerAliasBoundedWStringHelperLong& x) { - m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; + m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; } @@ -31297,7 +31492,7 @@ class MapInnerAliasBoundedWStringHelperLong const MapInnerAliasBoundedWStringHelperLong& x) { - m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; + m_var_map_inneraliasboundedwstringhelper_long = x.m_var_map_inneraliasboundedwstringhelper_long; return *this; } @@ -31358,8 +31553,7 @@ class MapInnerAliasBoundedWStringHelperLong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_long * @return Constant reference to member var_map_inneraliasboundedwstringhelper_long */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_long() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_long() const { return m_var_map_inneraliasboundedwstringhelper_long; } @@ -31368,12 +31562,13 @@ class MapInnerAliasBoundedWStringHelperLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_long * @return Reference to member var_map_inneraliasboundedwstringhelper_long */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_long() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_long() { return m_var_map_inneraliasboundedwstringhelper_long; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_long; @@ -31408,7 +31603,7 @@ class MapInnerAliasBoundedWStringHelperULong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULong( const MapInnerAliasBoundedWStringHelperULong& x) { - m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; + m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; } @@ -31430,7 +31625,7 @@ class MapInnerAliasBoundedWStringHelperULong const MapInnerAliasBoundedWStringHelperULong& x) { - m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; + m_var_map_inneraliasboundedwstringhelper_ulong = x.m_var_map_inneraliasboundedwstringhelper_ulong; return *this; } @@ -31491,8 +31686,7 @@ class MapInnerAliasBoundedWStringHelperULong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ulong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ulong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulong() const { return m_var_map_inneraliasboundedwstringhelper_ulong; } @@ -31501,12 +31695,13 @@ class MapInnerAliasBoundedWStringHelperULong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ulong * @return Reference to member var_map_inneraliasboundedwstringhelper_ulong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulong() { return m_var_map_inneraliasboundedwstringhelper_ulong; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_ulong; @@ -31541,7 +31736,7 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongLong( const MapInnerAliasBoundedWStringHelperLongLong& x) { - m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; + m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; } @@ -31552,8 +31747,7 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongLong( MapInnerAliasBoundedWStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longlong = - std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); + m_var_map_inneraliasboundedwstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); } /*! @@ -31564,7 +31758,7 @@ class MapInnerAliasBoundedWStringHelperLongLong const MapInnerAliasBoundedWStringHelperLongLong& x) { - m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; + m_var_map_inneraliasboundedwstringhelper_longlong = x.m_var_map_inneraliasboundedwstringhelper_longlong; return *this; } @@ -31577,8 +31771,7 @@ class MapInnerAliasBoundedWStringHelperLongLong MapInnerAliasBoundedWStringHelperLongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longlong = - std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); + m_var_map_inneraliasboundedwstringhelper_longlong = std::move(x.m_var_map_inneraliasboundedwstringhelper_longlong); return *this; } @@ -31589,8 +31782,7 @@ class MapInnerAliasBoundedWStringHelperLongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperLongLong& x) const { - return (m_var_map_inneraliasboundedwstringhelper_longlong == - x.m_var_map_inneraliasboundedwstringhelper_longlong); + return (m_var_map_inneraliasboundedwstringhelper_longlong == x.m_var_map_inneraliasboundedwstringhelper_longlong); } /*! @@ -31608,8 +31800,7 @@ class MapInnerAliasBoundedWStringHelperLongLong * @param _var_map_inneraliasboundedwstringhelper_longlong New value to be copied in member var_map_inneraliasboundedwstringhelper_longlong */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longlong( - const std::map& _var_map_inneraliasboundedwstringhelper_longlong) + const std::map& _var_map_inneraliasboundedwstringhelper_longlong) { m_var_map_inneraliasboundedwstringhelper_longlong = _var_map_inneraliasboundedwstringhelper_longlong; } @@ -31628,8 +31819,7 @@ class MapInnerAliasBoundedWStringHelperLongLong * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_longlong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_longlong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longlong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longlong() const { return m_var_map_inneraliasboundedwstringhelper_longlong; } @@ -31638,12 +31828,13 @@ class MapInnerAliasBoundedWStringHelperLongLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_longlong * @return Reference to member var_map_inneraliasboundedwstringhelper_longlong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longlong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longlong() { return m_var_map_inneraliasboundedwstringhelper_longlong; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_longlong; @@ -31678,7 +31869,7 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULongLong( const MapInnerAliasBoundedWStringHelperULongLong& x) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; + m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31689,8 +31880,7 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport MapInnerAliasBoundedWStringHelperULongLong( MapInnerAliasBoundedWStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_ulonglong = - std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! @@ -31701,7 +31891,7 @@ class MapInnerAliasBoundedWStringHelperULongLong const MapInnerAliasBoundedWStringHelperULongLong& x) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; + m_var_map_inneraliasboundedwstringhelper_ulonglong = x.m_var_map_inneraliasboundedwstringhelper_ulonglong; return *this; } @@ -31714,8 +31904,7 @@ class MapInnerAliasBoundedWStringHelperULongLong MapInnerAliasBoundedWStringHelperULongLong&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_ulonglong = - std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(x.m_var_map_inneraliasboundedwstringhelper_ulonglong); return *this; } @@ -31726,8 +31915,7 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperULongLong& x) const { - return (m_var_map_inneraliasboundedwstringhelper_ulonglong == - x.m_var_map_inneraliasboundedwstringhelper_ulonglong); + return (m_var_map_inneraliasboundedwstringhelper_ulonglong == x.m_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! @@ -31745,8 +31933,7 @@ class MapInnerAliasBoundedWStringHelperULongLong * @param _var_map_inneraliasboundedwstringhelper_ulonglong New value to be copied in member var_map_inneraliasboundedwstringhelper_ulonglong */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ulonglong( - const std::map& _var_map_inneraliasboundedwstringhelper_ulonglong) + const std::map& _var_map_inneraliasboundedwstringhelper_ulonglong) { m_var_map_inneraliasboundedwstringhelper_ulonglong = _var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31758,16 +31945,14 @@ class MapInnerAliasBoundedWStringHelperULongLong eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_ulonglong( std::map&& _var_map_inneraliasboundedwstringhelper_ulonglong) { - m_var_map_inneraliasboundedwstringhelper_ulonglong = - std::move(_var_map_inneraliasboundedwstringhelper_ulonglong); + m_var_map_inneraliasboundedwstringhelper_ulonglong = std::move(_var_map_inneraliasboundedwstringhelper_ulonglong); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_ulonglong * @return Constant reference to member var_map_inneraliasboundedwstringhelper_ulonglong */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulonglong() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_ulonglong() const { return m_var_map_inneraliasboundedwstringhelper_ulonglong; } @@ -31776,12 +31961,13 @@ class MapInnerAliasBoundedWStringHelperULongLong * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_ulonglong * @return Reference to member var_map_inneraliasboundedwstringhelper_ulonglong */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulonglong() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_ulonglong() { return m_var_map_inneraliasboundedwstringhelper_ulonglong; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_ulonglong; @@ -31816,7 +32002,7 @@ class MapInnerAliasBoundedWStringHelperFloat eProsima_user_DllExport MapInnerAliasBoundedWStringHelperFloat( const MapInnerAliasBoundedWStringHelperFloat& x) { - m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; + m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; } @@ -31838,7 +32024,7 @@ class MapInnerAliasBoundedWStringHelperFloat const MapInnerAliasBoundedWStringHelperFloat& x) { - m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; + m_var_map_inneraliasboundedwstringhelper_float = x.m_var_map_inneraliasboundedwstringhelper_float; return *this; } @@ -31899,8 +32085,7 @@ class MapInnerAliasBoundedWStringHelperFloat * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_float * @return Constant reference to member var_map_inneraliasboundedwstringhelper_float */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_float() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_float() const { return m_var_map_inneraliasboundedwstringhelper_float; } @@ -31909,12 +32094,13 @@ class MapInnerAliasBoundedWStringHelperFloat * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_float * @return Reference to member var_map_inneraliasboundedwstringhelper_float */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_float() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_float() { return m_var_map_inneraliasboundedwstringhelper_float; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_float; @@ -31949,7 +32135,7 @@ class MapInnerAliasBoundedWStringHelperDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperDouble( const MapInnerAliasBoundedWStringHelperDouble& x) { - m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; + m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; } @@ -31971,7 +32157,7 @@ class MapInnerAliasBoundedWStringHelperDouble const MapInnerAliasBoundedWStringHelperDouble& x) { - m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; + m_var_map_inneraliasboundedwstringhelper_double = x.m_var_map_inneraliasboundedwstringhelper_double; return *this; } @@ -32032,8 +32218,7 @@ class MapInnerAliasBoundedWStringHelperDouble * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_double * @return Constant reference to member var_map_inneraliasboundedwstringhelper_double */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_double() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_double() const { return m_var_map_inneraliasboundedwstringhelper_double; } @@ -32042,12 +32227,13 @@ class MapInnerAliasBoundedWStringHelperDouble * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_double * @return Reference to member var_map_inneraliasboundedwstringhelper_double */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_double() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_double() { return m_var_map_inneraliasboundedwstringhelper_double; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_double; @@ -32082,7 +32268,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongDouble( const MapInnerAliasBoundedWStringHelperLongDouble& x) { - m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; + m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32093,8 +32279,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport MapInnerAliasBoundedWStringHelperLongDouble( MapInnerAliasBoundedWStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longdouble = - std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); } /*! @@ -32105,7 +32290,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble const MapInnerAliasBoundedWStringHelperLongDouble& x) { - m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; + m_var_map_inneraliasboundedwstringhelper_longdouble = x.m_var_map_inneraliasboundedwstringhelper_longdouble; return *this; } @@ -32118,8 +32303,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble MapInnerAliasBoundedWStringHelperLongDouble&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_longdouble = - std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(x.m_var_map_inneraliasboundedwstringhelper_longdouble); return *this; } @@ -32130,8 +32314,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperLongDouble& x) const { - return (m_var_map_inneraliasboundedwstringhelper_longdouble == - x.m_var_map_inneraliasboundedwstringhelper_longdouble); + return (m_var_map_inneraliasboundedwstringhelper_longdouble == x.m_var_map_inneraliasboundedwstringhelper_longdouble); } /*! @@ -32149,8 +32332,7 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @param _var_map_inneraliasboundedwstringhelper_longdouble New value to be copied in member var_map_inneraliasboundedwstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longdouble( - const std::map& _var_map_inneraliasboundedwstringhelper_longdouble) + const std::map& _var_map_inneraliasboundedwstringhelper_longdouble) { m_var_map_inneraliasboundedwstringhelper_longdouble = _var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32160,19 +32342,16 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @param _var_map_inneraliasboundedwstringhelper_longdouble New value to be moved in member var_map_inneraliasboundedwstringhelper_longdouble */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_longdouble( - std::map&& _var_map_inneraliasboundedwstringhelper_longdouble) + std::map&& _var_map_inneraliasboundedwstringhelper_longdouble) { - m_var_map_inneraliasboundedwstringhelper_longdouble = - std::move(_var_map_inneraliasboundedwstringhelper_longdouble); + m_var_map_inneraliasboundedwstringhelper_longdouble = std::move(_var_map_inneraliasboundedwstringhelper_longdouble); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_longdouble * @return Constant reference to member var_map_inneraliasboundedwstringhelper_longdouble */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longdouble() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_longdouble() const { return m_var_map_inneraliasboundedwstringhelper_longdouble; } @@ -32181,12 +32360,13 @@ class MapInnerAliasBoundedWStringHelperLongDouble * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_longdouble * @return Reference to member var_map_inneraliasboundedwstringhelper_longdouble */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longdouble() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_longdouble() { return m_var_map_inneraliasboundedwstringhelper_longdouble; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_longdouble; @@ -32221,7 +32401,7 @@ class MapInnerAliasBoundedWStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedWStringHelperBoolean( const MapInnerAliasBoundedWStringHelperBoolean& x) { - m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; + m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; } @@ -32232,8 +32412,7 @@ class MapInnerAliasBoundedWStringHelperBoolean eProsima_user_DllExport MapInnerAliasBoundedWStringHelperBoolean( MapInnerAliasBoundedWStringHelperBoolean&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_boolean = - std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); + m_var_map_inneraliasboundedwstringhelper_boolean = std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); } /*! @@ -32244,7 +32423,7 @@ class MapInnerAliasBoundedWStringHelperBoolean const MapInnerAliasBoundedWStringHelperBoolean& x) { - m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; + m_var_map_inneraliasboundedwstringhelper_boolean = x.m_var_map_inneraliasboundedwstringhelper_boolean; return *this; } @@ -32257,8 +32436,7 @@ class MapInnerAliasBoundedWStringHelperBoolean MapInnerAliasBoundedWStringHelperBoolean&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_boolean = - std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); + m_var_map_inneraliasboundedwstringhelper_boolean = std::move(x.m_var_map_inneraliasboundedwstringhelper_boolean); return *this; } @@ -32306,8 +32484,7 @@ class MapInnerAliasBoundedWStringHelperBoolean * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_boolean * @return Constant reference to member var_map_inneraliasboundedwstringhelper_boolean */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_boolean() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_boolean() const { return m_var_map_inneraliasboundedwstringhelper_boolean; } @@ -32316,12 +32493,13 @@ class MapInnerAliasBoundedWStringHelperBoolean * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_boolean * @return Reference to member var_map_inneraliasboundedwstringhelper_boolean */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_boolean() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_boolean() { return m_var_map_inneraliasboundedwstringhelper_boolean; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_boolean; @@ -32356,7 +32534,7 @@ class MapInnerAliasBoundedWStringHelperOctet eProsima_user_DllExport MapInnerAliasBoundedWStringHelperOctet( const MapInnerAliasBoundedWStringHelperOctet& x) { - m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; + m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; } @@ -32378,7 +32556,7 @@ class MapInnerAliasBoundedWStringHelperOctet const MapInnerAliasBoundedWStringHelperOctet& x) { - m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; + m_var_map_inneraliasboundedwstringhelper_octet = x.m_var_map_inneraliasboundedwstringhelper_octet; return *this; } @@ -32439,8 +32617,7 @@ class MapInnerAliasBoundedWStringHelperOctet * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_octet * @return Constant reference to member var_map_inneraliasboundedwstringhelper_octet */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_octet() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_octet() const { return m_var_map_inneraliasboundedwstringhelper_octet; } @@ -32449,12 +32626,13 @@ class MapInnerAliasBoundedWStringHelperOctet * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_octet * @return Reference to member var_map_inneraliasboundedwstringhelper_octet */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_octet() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_octet() { return m_var_map_inneraliasboundedwstringhelper_octet; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_octet; @@ -32489,7 +32667,7 @@ class MapInnerAliasBoundedWStringHelperChar eProsima_user_DllExport MapInnerAliasBoundedWStringHelperChar( const MapInnerAliasBoundedWStringHelperChar& x) { - m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; + m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; } @@ -32511,7 +32689,7 @@ class MapInnerAliasBoundedWStringHelperChar const MapInnerAliasBoundedWStringHelperChar& x) { - m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; + m_var_map_inneraliasboundedwstringhelper_char = x.m_var_map_inneraliasboundedwstringhelper_char; return *this; } @@ -32572,8 +32750,7 @@ class MapInnerAliasBoundedWStringHelperChar * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_char * @return Constant reference to member var_map_inneraliasboundedwstringhelper_char */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_char() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_char() const { return m_var_map_inneraliasboundedwstringhelper_char; } @@ -32582,12 +32759,13 @@ class MapInnerAliasBoundedWStringHelperChar * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_char * @return Reference to member var_map_inneraliasboundedwstringhelper_char */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_char() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_char() { return m_var_map_inneraliasboundedwstringhelper_char; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_char; @@ -32622,7 +32800,7 @@ class MapInnerAliasBoundedWStringHelperWChar eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWChar( const MapInnerAliasBoundedWStringHelperWChar& x) { - m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; + m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; } @@ -32644,7 +32822,7 @@ class MapInnerAliasBoundedWStringHelperWChar const MapInnerAliasBoundedWStringHelperWChar& x) { - m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; + m_var_map_inneraliasboundedwstringhelper_wchar = x.m_var_map_inneraliasboundedwstringhelper_wchar; return *this; } @@ -32705,8 +32883,7 @@ class MapInnerAliasBoundedWStringHelperWChar * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_wchar * @return Constant reference to member var_map_inneraliasboundedwstringhelper_wchar */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wchar() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wchar() const { return m_var_map_inneraliasboundedwstringhelper_wchar; } @@ -32715,12 +32892,13 @@ class MapInnerAliasBoundedWStringHelperWChar * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_wchar * @return Reference to member var_map_inneraliasboundedwstringhelper_wchar */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wchar() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wchar() { return m_var_map_inneraliasboundedwstringhelper_wchar; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_wchar; @@ -32755,7 +32933,7 @@ class MapInnerAliasBoundedWStringHelperString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperString( const MapInnerAliasBoundedWStringHelperString& x) { - m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; + m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; } @@ -32777,7 +32955,7 @@ class MapInnerAliasBoundedWStringHelperString const MapInnerAliasBoundedWStringHelperString& x) { - m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; + m_var_map_inneraliasboundedwstringhelper_string = x.m_var_map_inneraliasboundedwstringhelper_string; return *this; } @@ -32819,8 +32997,7 @@ class MapInnerAliasBoundedWStringHelperString * @param _var_map_inneraliasboundedwstringhelper_string New value to be copied in member var_map_inneraliasboundedwstringhelper_string */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_string( - const std::map& _var_map_inneraliasboundedwstringhelper_string) + const std::map& _var_map_inneraliasboundedwstringhelper_string) { m_var_map_inneraliasboundedwstringhelper_string = _var_map_inneraliasboundedwstringhelper_string; } @@ -32839,8 +33016,7 @@ class MapInnerAliasBoundedWStringHelperString * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_string * @return Constant reference to member var_map_inneraliasboundedwstringhelper_string */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_string() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_string() const { return m_var_map_inneraliasboundedwstringhelper_string; } @@ -32849,12 +33025,13 @@ class MapInnerAliasBoundedWStringHelperString * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_string * @return Reference to member var_map_inneraliasboundedwstringhelper_string */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_string() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_string() { return m_var_map_inneraliasboundedwstringhelper_string; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_string; @@ -32889,7 +33066,7 @@ class MapInnerAliasBoundedWStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWString( const MapInnerAliasBoundedWStringHelperWString& x) { - m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; + m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; } @@ -32900,8 +33077,7 @@ class MapInnerAliasBoundedWStringHelperWString eProsima_user_DllExport MapInnerAliasBoundedWStringHelperWString( MapInnerAliasBoundedWStringHelperWString&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_wstring = - std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); + m_var_map_inneraliasboundedwstringhelper_wstring = std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); } /*! @@ -32912,7 +33088,7 @@ class MapInnerAliasBoundedWStringHelperWString const MapInnerAliasBoundedWStringHelperWString& x) { - m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; + m_var_map_inneraliasboundedwstringhelper_wstring = x.m_var_map_inneraliasboundedwstringhelper_wstring; return *this; } @@ -32925,8 +33101,7 @@ class MapInnerAliasBoundedWStringHelperWString MapInnerAliasBoundedWStringHelperWString&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_wstring = - std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); + m_var_map_inneraliasboundedwstringhelper_wstring = std::move(x.m_var_map_inneraliasboundedwstringhelper_wstring); return *this; } @@ -32955,8 +33130,7 @@ class MapInnerAliasBoundedWStringHelperWString * @param _var_map_inneraliasboundedwstringhelper_wstring New value to be copied in member var_map_inneraliasboundedwstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_wstring( - const std::map& _var_map_inneraliasboundedwstringhelper_wstring) + const std::map& _var_map_inneraliasboundedwstringhelper_wstring) { m_var_map_inneraliasboundedwstringhelper_wstring = _var_map_inneraliasboundedwstringhelper_wstring; } @@ -32966,8 +33140,7 @@ class MapInnerAliasBoundedWStringHelperWString * @param _var_map_inneraliasboundedwstringhelper_wstring New value to be moved in member var_map_inneraliasboundedwstringhelper_wstring */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_wstring( - std::map&& _var_map_inneraliasboundedwstringhelper_wstring) + std::map&& _var_map_inneraliasboundedwstringhelper_wstring) { m_var_map_inneraliasboundedwstringhelper_wstring = std::move(_var_map_inneraliasboundedwstringhelper_wstring); } @@ -32976,8 +33149,7 @@ class MapInnerAliasBoundedWStringHelperWString * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_wstring * @return Constant reference to member var_map_inneraliasboundedwstringhelper_wstring */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wstring() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_wstring() const { return m_var_map_inneraliasboundedwstringhelper_wstring; } @@ -32986,12 +33158,13 @@ class MapInnerAliasBoundedWStringHelperWString * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_wstring * @return Reference to member var_map_inneraliasboundedwstringhelper_wstring */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wstring() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_wstring() { return m_var_map_inneraliasboundedwstringhelper_wstring; } + + private: std::map m_var_map_inneraliasboundedwstringhelper_wstring; @@ -33026,8 +33199,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } @@ -33038,8 +33210,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper( MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! @@ -33050,8 +33221,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; return *this; } @@ -33064,8 +33234,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); return *this; } @@ -33076,8 +33245,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! @@ -33095,11 +33263,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } /*! @@ -33107,20 +33273,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() - const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } @@ -33129,16 +33291,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedstringhelper; }; /*! @@ -33170,8 +33332,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } @@ -33182,8 +33343,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper( MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! @@ -33194,8 +33354,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; return *this; } @@ -33208,8 +33367,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); return *this; } @@ -33220,8 +33378,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! @@ -33239,11 +33396,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } /*! @@ -33251,20 +33406,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() - const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } @@ -33273,16 +33424,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasboundedwstringhelper; }; /*! @@ -33314,8 +33465,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerEnumHelper( const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } @@ -33326,8 +33476,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerEnumHelper( MapInnerAliasBoundedWStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! @@ -33338,8 +33487,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper; return *this; } @@ -33352,8 +33500,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper MapInnerAliasBoundedWStringHelperInnerEnumHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); return *this; } @@ -33364,8 +33511,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerEnumHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerenumhelper == - x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerenumhelper == x.m_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! @@ -33383,11 +33529,9 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedwstringhelper_innerenumhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerenumhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerenumhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - _var_map_inneraliasboundedwstringhelper_innerenumhelper; + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = _var_map_inneraliasboundedwstringhelper_innerenumhelper; } /*! @@ -33395,19 +33539,16 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @param _var_map_inneraliasboundedwstringhelper_innerenumhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerenumhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerenumhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerenumhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerenumhelper) { - m_var_map_inneraliasboundedwstringhelper_innerenumhelper = - std::move(_var_map_inneraliasboundedwstringhelper_innerenumhelper); + m_var_map_inneraliasboundedwstringhelper_innerenumhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerenumhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } @@ -33416,16 +33557,16 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerenumhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerenumhelper() { return m_var_map_inneraliasboundedwstringhelper_innerenumhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_innerenumhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerenumhelper; }; /*! @@ -33457,8 +33598,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitMaskHelper( const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } @@ -33469,8 +33609,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitMaskHelper( MapInnerAliasBoundedWStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! @@ -33481,8 +33620,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; return *this; } @@ -33495,8 +33633,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper MapInnerAliasBoundedWStringHelperInnerBitMaskHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); return *this; } @@ -33507,8 +33644,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerBitMaskHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper == - x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper == x.m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! @@ -33526,11 +33662,9 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitmaskhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } /*! @@ -33538,19 +33672,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitmaskhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerbitmaskhelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = - std::move(_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); + m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } @@ -33559,16 +33690,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerbitmaskhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitmaskhelper() { return m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerbitmaskhelper; }; /*! @@ -33600,8 +33731,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasHelper( const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } @@ -33612,8 +33742,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasHelper( MapInnerAliasBoundedWStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! @@ -33624,8 +33753,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper; return *this; } @@ -33638,8 +33766,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper MapInnerAliasBoundedWStringHelperInnerAliasHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); return *this; } @@ -33650,8 +33777,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliashelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliashelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! @@ -33669,11 +33795,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliashelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliashelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliashelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - _var_map_inneraliasboundedwstringhelper_inneraliashelper; + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = _var_map_inneraliasboundedwstringhelper_inneraliashelper; } /*! @@ -33681,19 +33805,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliashelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliashelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliashelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliashelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliashelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliashelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliashelper); + m_var_map_inneraliasboundedwstringhelper_inneraliashelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliashelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } @@ -33702,16 +33823,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliashelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliashelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliashelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliashelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliashelper; }; /*! @@ -33743,8 +33864,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper( const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } @@ -33755,8 +33875,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper( MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! @@ -33767,8 +33886,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; return *this; } @@ -33781,8 +33899,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); return *this; } @@ -33793,8 +33910,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! @@ -33812,11 +33928,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } /*! @@ -33824,19 +33938,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } @@ -33845,16 +33956,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasarrayhelper; }; /*! @@ -33886,8 +33997,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper( const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } @@ -33898,8 +34008,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper( MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! @@ -33910,8 +34019,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; return *this; } @@ -33924,8 +34032,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); return *this; } @@ -33936,8 +34043,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! @@ -33955,11 +34061,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliassequencehelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } /*! @@ -33967,19 +34071,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliassequencehelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliassequencehelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); + m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } @@ -33988,16 +34089,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliassequencehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliassequencehelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliassequencehelper; }; /*! @@ -34029,8 +34130,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasMapHelper( const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } @@ -34041,8 +34141,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerAliasMapHelper( MapInnerAliasBoundedWStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! @@ -34053,8 +34152,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; return *this; } @@ -34067,8 +34165,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper MapInnerAliasBoundedWStringHelperInnerAliasMapHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); return *this; } @@ -34079,8 +34176,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerAliasMapHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper == - x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + return (m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper == x.m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! @@ -34098,11 +34194,9 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper New value to be copied in member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasmaphelper( - const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) + const std::map& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } /*! @@ -34110,19 +34204,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @param _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper New value to be moved in member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_inneraliasmaphelper( - std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) + std::map&& _var_map_inneraliasboundedwstringhelper_inneraliasmaphelper) { - m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = - std::move(_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); + m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper = std::move(_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() const { return m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } @@ -34131,16 +34222,16 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper * @return Reference to member var_map_inneraliasboundedwstringhelper_inneraliasmaphelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_inneraliasmaphelper() { return m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; + std::map m_var_map_inneraliasboundedwstringhelper_inneraliasmaphelper; }; /*! @@ -34172,8 +34263,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerUnionHelper( const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } @@ -34184,8 +34274,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerUnionHelper( MapInnerAliasBoundedWStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! @@ -34196,8 +34285,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper; return *this; } @@ -34210,8 +34298,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper MapInnerAliasBoundedWStringHelperInnerUnionHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); return *this; } @@ -34222,8 +34309,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerUnionHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerunionhelper == - x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); + return (m_var_map_inneraliasboundedwstringhelper_innerunionhelper == x.m_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! @@ -34241,11 +34327,9 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedwstringhelper_innerunionhelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerunionhelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerunionhelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - _var_map_inneraliasboundedwstringhelper_innerunionhelper; + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = _var_map_inneraliasboundedwstringhelper_innerunionhelper; } /*! @@ -34253,19 +34337,16 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @param _var_map_inneraliasboundedwstringhelper_innerunionhelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerunionhelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerunionhelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerunionhelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerunionhelper) { - m_var_map_inneraliasboundedwstringhelper_innerunionhelper = - std::move(_var_map_inneraliasboundedwstringhelper_innerunionhelper); + m_var_map_inneraliasboundedwstringhelper_innerunionhelper = std::move(_var_map_inneraliasboundedwstringhelper_innerunionhelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() const { return m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } @@ -34274,16 +34355,16 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerunionhelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerunionhelper() { return m_var_map_inneraliasboundedwstringhelper_innerunionhelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_innerunionhelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerunionhelper; }; /*! @@ -34315,8 +34396,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerStructureHelper( const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } @@ -34327,8 +34407,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerStructureHelper( MapInnerAliasBoundedWStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! @@ -34339,8 +34418,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; return *this; } @@ -34353,8 +34431,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper MapInnerAliasBoundedWStringHelperInnerStructureHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); return *this; } @@ -34365,8 +34442,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerStructureHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerstructurehelper == - x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + return (m_var_map_inneraliasboundedwstringhelper_innerstructurehelper == x.m_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! @@ -34384,11 +34460,9 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedwstringhelper_innerstructurehelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerstructurehelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - _var_map_inneraliasboundedwstringhelper_innerstructurehelper; + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = _var_map_inneraliasboundedwstringhelper_innerstructurehelper; } /*! @@ -34396,19 +34470,16 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @param _var_map_inneraliasboundedwstringhelper_innerstructurehelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerstructurehelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerstructurehelper) { - m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = - std::move(_var_map_inneraliasboundedwstringhelper_innerstructurehelper); + m_var_map_inneraliasboundedwstringhelper_innerstructurehelper = std::move(_var_map_inneraliasboundedwstringhelper_innerstructurehelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() const { return m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } @@ -34417,16 +34488,16 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerstructurehelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerstructurehelper() { return m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerstructurehelper; }; /*! @@ -34458,8 +34529,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitsetHelper( const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } @@ -34470,8 +34540,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport MapInnerAliasBoundedWStringHelperInnerBitsetHelper( MapInnerAliasBoundedWStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! @@ -34482,8 +34551,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; return *this; } @@ -34496,8 +34564,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper MapInnerAliasBoundedWStringHelperInnerBitsetHelper&& x) noexcept { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); return *this; } @@ -34508,8 +34575,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper eProsima_user_DllExport bool operator ==( const MapInnerAliasBoundedWStringHelperInnerBitsetHelper& x) const { - return (m_var_map_inneraliasboundedwstringhelper_innerbitsethelper == - x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + return (m_var_map_inneraliasboundedwstringhelper_innerbitsethelper == x.m_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! @@ -34527,11 +34593,9 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitsethelper New value to be copied in member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitsethelper( - const std::map& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) + const std::map& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - _var_map_inneraliasboundedwstringhelper_innerbitsethelper; + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = _var_map_inneraliasboundedwstringhelper_innerbitsethelper; } /*! @@ -34539,19 +34603,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @param _var_map_inneraliasboundedwstringhelper_innerbitsethelper New value to be moved in member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ eProsima_user_DllExport void var_map_inneraliasboundedwstringhelper_innerbitsethelper( - std::map&& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) + std::map&& _var_map_inneraliasboundedwstringhelper_innerbitsethelper) { - m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = - std::move(_var_map_inneraliasboundedwstringhelper_innerbitsethelper); + m_var_map_inneraliasboundedwstringhelper_innerbitsethelper = std::move(_var_map_inneraliasboundedwstringhelper_innerbitsethelper); } /*! * @brief This function returns a constant reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper * @return Constant reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ - eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() const + eProsima_user_DllExport const std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() const { return m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } @@ -34560,16 +34621,16 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelper * @brief This function returns a reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper * @return Reference to member var_map_inneraliasboundedwstringhelper_innerbitsethelper */ - eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() + eProsima_user_DllExport std::map& var_map_inneraliasboundedwstringhelper_innerbitsethelper() { return m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; } + + private: - std::map m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; + std::map m_var_map_inneraliasboundedwstringhelper_innerbitsethelper; }; /*! @@ -34601,11 +34662,11 @@ class BoundedSmallMap eProsima_user_DllExport BoundedSmallMap( const BoundedSmallMap& x) { - m_var_small_map = x.m_var_small_map; + m_var_small_map = x.m_var_small_map; - m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; + m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; - m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; + m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; } @@ -34629,11 +34690,11 @@ class BoundedSmallMap const BoundedSmallMap& x) { - m_var_small_map = x.m_var_small_map; + m_var_small_map = x.m_var_small_map; - m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; + m_var_unbounded_string_long_bounded_small_map = x.m_var_unbounded_string_long_bounded_small_map; - m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; + m_var_long_unbounded_string_bounded_small_map = x.m_var_long_unbounded_string_bounded_small_map; return *this; } @@ -34660,8 +34721,8 @@ class BoundedSmallMap const BoundedSmallMap& x) const { return (m_var_small_map == x.m_var_small_map && - m_var_unbounded_string_long_bounded_small_map == x.m_var_unbounded_string_long_bounded_small_map && - m_var_long_unbounded_string_bounded_small_map == x.m_var_long_unbounded_string_bounded_small_map); + m_var_unbounded_string_long_bounded_small_map == x.m_var_unbounded_string_long_bounded_small_map && + m_var_long_unbounded_string_bounded_small_map == x.m_var_long_unbounded_string_bounded_small_map); } /*! @@ -34712,6 +34773,7 @@ class BoundedSmallMap return m_var_small_map; } + /*! * @brief This function copies the value in member var_unbounded_string_long_bounded_small_map * @param _var_unbounded_string_long_bounded_small_map New value to be copied in member var_unbounded_string_long_bounded_small_map @@ -34750,6 +34812,7 @@ class BoundedSmallMap return m_var_unbounded_string_long_bounded_small_map; } + /*! * @brief This function copies the value in member var_long_unbounded_string_bounded_small_map * @param _var_long_unbounded_string_bounded_small_map New value to be copied in member var_long_unbounded_string_bounded_small_map @@ -34788,6 +34851,8 @@ class BoundedSmallMap return m_var_long_unbounded_string_bounded_small_map; } + + private: std::map m_var_small_map; @@ -34824,11 +34889,11 @@ class BoundedLargeMap eProsima_user_DllExport BoundedLargeMap( const BoundedLargeMap& x) { - m_var_large_map = x.m_var_large_map; + m_var_large_map = x.m_var_large_map; - m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; + m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; - m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; + m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; } @@ -34852,11 +34917,11 @@ class BoundedLargeMap const BoundedLargeMap& x) { - m_var_large_map = x.m_var_large_map; + m_var_large_map = x.m_var_large_map; - m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; + m_var_unbounded_string_long_bounded_large_map = x.m_var_unbounded_string_long_bounded_large_map; - m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; + m_var_long_unbounded_string_bounded_large_map = x.m_var_long_unbounded_string_bounded_large_map; return *this; } @@ -34883,8 +34948,8 @@ class BoundedLargeMap const BoundedLargeMap& x) const { return (m_var_large_map == x.m_var_large_map && - m_var_unbounded_string_long_bounded_large_map == x.m_var_unbounded_string_long_bounded_large_map && - m_var_long_unbounded_string_bounded_large_map == x.m_var_long_unbounded_string_bounded_large_map); + m_var_unbounded_string_long_bounded_large_map == x.m_var_unbounded_string_long_bounded_large_map && + m_var_long_unbounded_string_bounded_large_map == x.m_var_long_unbounded_string_bounded_large_map); } /*! @@ -34935,6 +35000,7 @@ class BoundedLargeMap return m_var_large_map; } + /*! * @brief This function copies the value in member var_unbounded_string_long_bounded_large_map * @param _var_unbounded_string_long_bounded_large_map New value to be copied in member var_unbounded_string_long_bounded_large_map @@ -34973,6 +35039,7 @@ class BoundedLargeMap return m_var_unbounded_string_long_bounded_large_map; } + /*! * @brief This function copies the value in member var_long_unbounded_string_bounded_large_map * @param _var_long_unbounded_string_bounded_large_map New value to be copied in member var_long_unbounded_string_bounded_large_map @@ -35011,6 +35078,8 @@ class BoundedLargeMap return m_var_long_unbounded_string_bounded_large_map; } + + private: std::map m_var_large_map; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp index 71e706f6..db82899c 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/mapsPubSubTypes.hpp @@ -18106,8 +18106,7 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds:: - TopicDataType +class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType { public: @@ -18188,8 +18187,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType : * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds:: - TopicDataType +class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType { public: @@ -20214,8 +20212,7 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds:: - TopicDataType +class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType { public: @@ -20296,8 +20293,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType : * @brief This class represents the TopicDataType of the type MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelper defined by the user in the IDL file. * @ingroup maps */ -class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds:: - TopicDataType +class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds::dds::TopicDataType { public: diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp index 6f61b81f..bf02e26e 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/member_id.hpp @@ -78,13 +78,13 @@ class FixId eProsima_user_DllExport FixId( const FixId& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -109,13 +109,13 @@ class FixId const FixId& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -143,9 +143,9 @@ class FixId const FixId& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -186,6 +186,7 @@ class FixId return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -214,6 +215,7 @@ class FixId return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -242,6 +244,7 @@ class FixId return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -270,6 +273,8 @@ class FixId return m_ll; } + + private: uint8_t m_o{0}; @@ -307,13 +312,13 @@ class FixHexId eProsima_user_DllExport FixHexId( const FixHexId& x) { - m_ho = x.m_ho; + m_ho = x.m_ho; - m_hs = x.m_hs; + m_hs = x.m_hs; - m_hl = x.m_hl; + m_hl = x.m_hl; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -338,13 +343,13 @@ class FixHexId const FixHexId& x) { - m_ho = x.m_ho; + m_ho = x.m_ho; - m_hs = x.m_hs; + m_hs = x.m_hs; - m_hl = x.m_hl; + m_hl = x.m_hl; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -372,9 +377,9 @@ class FixHexId const FixHexId& x) const { return (m_ho == x.m_ho && - m_hs == x.m_hs && - m_hl == x.m_hl && - m_ll == x.m_ll); + m_hs == x.m_hs && + m_hl == x.m_hl && + m_ll == x.m_ll); } /*! @@ -415,6 +420,7 @@ class FixHexId return m_ho; } + /*! * @brief This function sets a value in member hs * @param _hs New value for member hs @@ -443,6 +449,7 @@ class FixHexId return m_hs; } + /*! * @brief This function sets a value in member hl * @param _hl New value for member hl @@ -471,6 +478,7 @@ class FixHexId return m_hl; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -499,6 +507,8 @@ class FixHexId return m_ll; } + + private: uint8_t m_ho{0}; @@ -536,13 +546,13 @@ class FixHashidDefault eProsima_user_DllExport FixHashidDefault( const FixHashidDefault& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -567,13 +577,13 @@ class FixHashidDefault const FixHashidDefault& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -601,9 +611,9 @@ class FixHashidDefault const FixHashidDefault& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -644,6 +654,7 @@ class FixHashidDefault return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -672,6 +683,7 @@ class FixHashidDefault return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -700,6 +712,7 @@ class FixHashidDefault return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -728,6 +741,8 @@ class FixHashidDefault return m_ll; } + + private: uint8_t m_o{0}; @@ -765,13 +780,13 @@ class FixHashid eProsima_user_DllExport FixHashid( const FixHashid& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -796,13 +811,13 @@ class FixHashid const FixHashid& x) { - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -830,9 +845,9 @@ class FixHashid const FixHashid& x) const { return (m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -873,6 +888,7 @@ class FixHashid return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -901,6 +917,7 @@ class FixHashid return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -929,6 +946,7 @@ class FixHashid return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -957,6 +975,8 @@ class FixHashid return m_ll; } + + private: uint8_t m_o{0}; @@ -994,15 +1014,15 @@ class FixMix eProsima_user_DllExport FixMix( const FixMix& x) { - m_o = x.m_o; + m_o = x.m_o; - m_ho = x.m_ho; + m_ho = x.m_ho; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1028,15 +1048,15 @@ class FixMix const FixMix& x) { - m_o = x.m_o; + m_o = x.m_o; - m_ho = x.m_ho; + m_ho = x.m_ho; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1065,10 +1085,10 @@ class FixMix const FixMix& x) const { return (m_o == x.m_o && - m_ho == x.m_ho && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_ho == x.m_ho && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1109,6 +1129,7 @@ class FixMix return m_o; } + /*! * @brief This function sets a value in member ho * @param _ho New value for member ho @@ -1137,6 +1158,7 @@ class FixMix return m_ho; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1165,6 +1187,7 @@ class FixMix return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1193,6 +1216,7 @@ class FixMix return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1221,6 +1245,8 @@ class FixMix return m_ll; } + + private: uint8_t m_o{0}; @@ -1259,15 +1285,15 @@ class AutoidDefault eProsima_user_DllExport AutoidDefault( const AutoidDefault& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1293,15 +1319,15 @@ class AutoidDefault const AutoidDefault& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1330,10 +1356,10 @@ class AutoidDefault const AutoidDefault& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1374,6 +1400,7 @@ class AutoidDefault return m_c; } + /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1402,6 +1429,7 @@ class AutoidDefault return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1430,6 +1458,7 @@ class AutoidDefault return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1458,6 +1487,7 @@ class AutoidDefault return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1486,6 +1516,8 @@ class AutoidDefault return m_ll; } + + private: char m_c{0}; @@ -1524,15 +1556,15 @@ class AutoidSequential eProsima_user_DllExport AutoidSequential( const AutoidSequential& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1558,15 +1590,15 @@ class AutoidSequential const AutoidSequential& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1595,10 +1627,10 @@ class AutoidSequential const AutoidSequential& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1639,6 +1671,7 @@ class AutoidSequential return m_c; } + /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1667,6 +1700,7 @@ class AutoidSequential return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1695,6 +1729,7 @@ class AutoidSequential return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1723,6 +1758,7 @@ class AutoidSequential return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -1751,6 +1787,8 @@ class AutoidSequential return m_ll; } + + private: char m_c{0}; @@ -1789,15 +1827,15 @@ class AutoidHash eProsima_user_DllExport AutoidHash( const AutoidHash& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; } @@ -1823,15 +1861,15 @@ class AutoidHash const AutoidHash& x) { - m_c = x.m_c; + m_c = x.m_c; - m_o = x.m_o; + m_o = x.m_o; - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; - m_ll = x.m_ll; + m_ll = x.m_ll; return *this; } @@ -1860,10 +1898,10 @@ class AutoidHash const AutoidHash& x) const { return (m_c == x.m_c && - m_o == x.m_o && - m_s == x.m_s && - m_l == x.m_l && - m_ll == x.m_ll); + m_o == x.m_o && + m_s == x.m_s && + m_l == x.m_l && + m_ll == x.m_ll); } /*! @@ -1904,6 +1942,7 @@ class AutoidHash return m_c; } + /*! * @brief This function sets a value in member o * @param _o New value for member o @@ -1932,6 +1971,7 @@ class AutoidHash return m_o; } + /*! * @brief This function sets a value in member s * @param _s New value for member s @@ -1960,6 +2000,7 @@ class AutoidHash return m_s; } + /*! * @brief This function sets a value in member l * @param _l New value for member l @@ -1988,6 +2029,7 @@ class AutoidHash return m_l; } + /*! * @brief This function sets a value in member ll * @param _ll New value for member ll @@ -2016,6 +2058,8 @@ class AutoidHash return m_ll; } + + private: char m_c{0}; @@ -2056,15 +2100,15 @@ class DerivedAutoidDefault : public AutoidDefault const DerivedAutoidDefault& x) : AutoidDefault(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2093,15 +2137,15 @@ class DerivedAutoidDefault : public AutoidDefault { AutoidDefault::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2131,14 +2175,14 @@ class DerivedAutoidDefault : public AutoidDefault const DerivedAutoidDefault& x) const { if (AutoidDefault::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2179,6 +2223,7 @@ class DerivedAutoidDefault : public AutoidDefault return m_cd; } + /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2207,6 +2252,7 @@ class DerivedAutoidDefault : public AutoidDefault return m_od; } + /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2235,6 +2281,7 @@ class DerivedAutoidDefault : public AutoidDefault return m_sd; } + /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2263,6 +2310,7 @@ class DerivedAutoidDefault : public AutoidDefault return m_ld; } + /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -2291,6 +2339,8 @@ class DerivedAutoidDefault : public AutoidDefault return m_lld; } + + private: char m_cd{0}; @@ -2382,9 +2432,9 @@ class DerivedEmptyAutoidSequential : public AutoidSequential const DerivedEmptyAutoidSequential& x) const { if (AutoidSequential::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2399,6 +2449,8 @@ class DerivedEmptyAutoidSequential : public AutoidSequential return !(*this == x); } + + private: @@ -2434,15 +2486,15 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential const DerivedAutoidSequential& x) : DerivedEmptyAutoidSequential(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2471,15 +2523,15 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential { DerivedEmptyAutoidSequential::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2509,14 +2561,14 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential const DerivedAutoidSequential& x) const { if (DerivedEmptyAutoidSequential::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2557,6 +2609,7 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_cd; } + /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2585,6 +2638,7 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_od; } + /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2613,6 +2667,7 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_sd; } + /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2641,6 +2696,7 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_ld; } + /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -2669,6 +2725,8 @@ class DerivedAutoidSequential : public DerivedEmptyAutoidSequential return m_lld; } + + private: char m_cd{0}; @@ -2709,15 +2767,15 @@ class DerivedAutoidHash : public AutoidHash const DerivedAutoidHash& x) : AutoidHash(x) { - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; } @@ -2746,15 +2804,15 @@ class DerivedAutoidHash : public AutoidHash { AutoidHash::operator =(x); - m_cd = x.m_cd; + m_cd = x.m_cd; - m_od = x.m_od; + m_od = x.m_od; - m_sd = x.m_sd; + m_sd = x.m_sd; - m_ld = x.m_ld; + m_ld = x.m_ld; - m_lld = x.m_lld; + m_lld = x.m_lld; return *this; } @@ -2784,14 +2842,14 @@ class DerivedAutoidHash : public AutoidHash const DerivedAutoidHash& x) const { if (AutoidHash::operator !=(x)) - { - return false; - } + { + return false; + } return (m_cd == x.m_cd && - m_od == x.m_od && - m_sd == x.m_sd && - m_ld == x.m_ld && - m_lld == x.m_lld); + m_od == x.m_od && + m_sd == x.m_sd && + m_ld == x.m_ld && + m_lld == x.m_lld); } /*! @@ -2832,6 +2890,7 @@ class DerivedAutoidHash : public AutoidHash return m_cd; } + /*! * @brief This function sets a value in member od * @param _od New value for member od @@ -2860,6 +2919,7 @@ class DerivedAutoidHash : public AutoidHash return m_od; } + /*! * @brief This function sets a value in member sd * @param _sd New value for member sd @@ -2888,6 +2948,7 @@ class DerivedAutoidHash : public AutoidHash return m_sd; } + /*! * @brief This function sets a value in member ld * @param _ld New value for member ld @@ -2916,6 +2977,7 @@ class DerivedAutoidHash : public AutoidHash return m_ld; } + /*! * @brief This function sets a value in member lld * @param _lld New value for member lld @@ -2944,6 +3006,8 @@ class DerivedAutoidHash : public AutoidHash return m_lld; } + + private: char m_cd{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp index 574faa67..1f071522 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/mutable.hpp @@ -81,7 +81,7 @@ class MutableShortStruct eProsima_user_DllExport MutableShortStruct( const MutableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -103,7 +103,7 @@ class MutableShortStruct const MutableShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -168,6 +168,8 @@ class MutableShortStruct return m_var_short; } + + private: int16_t m_var_short{0}; @@ -202,7 +204,7 @@ class MutableUShortStruct eProsima_user_DllExport MutableUShortStruct( const MutableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -224,7 +226,7 @@ class MutableUShortStruct const MutableUShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -289,6 +291,8 @@ class MutableUShortStruct return m_var_ushort; } + + private: uint16_t m_var_ushort{0}; @@ -323,7 +327,7 @@ class MutableLongStruct eProsima_user_DllExport MutableLongStruct( const MutableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -345,7 +349,7 @@ class MutableLongStruct const MutableLongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -410,6 +414,8 @@ class MutableLongStruct return m_var_long; } + + private: int32_t m_var_long{0}; @@ -444,7 +450,7 @@ class MutableULongStruct eProsima_user_DllExport MutableULongStruct( const MutableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -466,7 +472,7 @@ class MutableULongStruct const MutableULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -531,6 +537,8 @@ class MutableULongStruct return m_var_ulong; } + + private: uint32_t m_var_ulong{0}; @@ -565,7 +573,7 @@ class MutableLongLongStruct eProsima_user_DllExport MutableLongLongStruct( const MutableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -587,7 +595,7 @@ class MutableLongLongStruct const MutableLongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -652,6 +660,8 @@ class MutableLongLongStruct return m_var_longlong; } + + private: int64_t m_var_longlong{0}; @@ -686,7 +696,7 @@ class MutableULongLongStruct eProsima_user_DllExport MutableULongLongStruct( const MutableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -708,7 +718,7 @@ class MutableULongLongStruct const MutableULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -773,6 +783,8 @@ class MutableULongLongStruct return m_var_ulonglong; } + + private: uint64_t m_var_ulonglong{0}; @@ -807,7 +819,7 @@ class MutableFloatStruct eProsima_user_DllExport MutableFloatStruct( const MutableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -829,7 +841,7 @@ class MutableFloatStruct const MutableFloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -894,6 +906,8 @@ class MutableFloatStruct return m_var_float; } + + private: float m_var_float{0.0}; @@ -928,7 +942,7 @@ class MutableDoubleStruct eProsima_user_DllExport MutableDoubleStruct( const MutableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -950,7 +964,7 @@ class MutableDoubleStruct const MutableDoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1015,6 +1029,8 @@ class MutableDoubleStruct return m_var_double; } + + private: double m_var_double{0.0}; @@ -1049,7 +1065,7 @@ class MutableLongDoubleStruct eProsima_user_DllExport MutableLongDoubleStruct( const MutableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1071,7 +1087,7 @@ class MutableLongDoubleStruct const MutableLongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1136,6 +1152,8 @@ class MutableLongDoubleStruct return m_var_longdouble; } + + private: long double m_var_longdouble{0.0}; @@ -1170,7 +1188,7 @@ class MutableBooleanStruct eProsima_user_DllExport MutableBooleanStruct( const MutableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1192,7 +1210,7 @@ class MutableBooleanStruct const MutableBooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1257,6 +1275,8 @@ class MutableBooleanStruct return m_var_boolean; } + + private: bool m_var_boolean{false}; @@ -1291,7 +1311,7 @@ class MutableOctetStruct eProsima_user_DllExport MutableOctetStruct( const MutableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1313,7 +1333,7 @@ class MutableOctetStruct const MutableOctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1378,6 +1398,8 @@ class MutableOctetStruct return m_var_octet; } + + private: uint8_t m_var_octet{0}; @@ -1412,7 +1434,7 @@ class MutableCharStruct eProsima_user_DllExport MutableCharStruct( const MutableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1434,7 +1456,7 @@ class MutableCharStruct const MutableCharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1499,6 +1521,8 @@ class MutableCharStruct return m_var_char8; } + + private: char m_var_char8{0}; @@ -1533,7 +1557,7 @@ class MutableWCharStruct eProsima_user_DllExport MutableWCharStruct( const MutableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1555,7 +1579,7 @@ class MutableWCharStruct const MutableWCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1620,6 +1644,8 @@ class MutableWCharStruct return m_var_char16; } + + private: wchar_t m_var_char16{0}; @@ -1654,7 +1680,7 @@ class MutableUnionStruct eProsima_user_DllExport MutableUnionStruct( const MutableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -1676,7 +1702,7 @@ class MutableUnionStruct const MutableUnionStruct& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -1751,6 +1777,8 @@ class MutableUnionStruct return m_var_union; } + + private: InnerUnionHelper m_var_union; @@ -1845,6 +1873,8 @@ class MutableEmptyStruct return !(*this == x); } + + private: @@ -1880,7 +1910,7 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct const MutableEmptyInheritanceStruct& x) : MutableEmptyStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -1905,7 +1935,7 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct { MutableEmptyStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -1931,9 +1961,9 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct const MutableEmptyInheritanceStruct& x) const { if (MutableEmptyStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -1985,6 +2015,8 @@ class MutableEmptyInheritanceStruct : public MutableEmptyStruct return m_var_str; } + + private: std::string m_var_str; @@ -2021,7 +2053,7 @@ class MutableInheritanceStruct : public MutableShortStruct const MutableInheritanceStruct& x) : MutableShortStruct(x) { - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; } @@ -2046,7 +2078,7 @@ class MutableInheritanceStruct : public MutableShortStruct { MutableShortStruct::operator =(x); - m_var_str = x.m_var_str; + m_var_str = x.m_var_str; return *this; } @@ -2072,9 +2104,9 @@ class MutableInheritanceStruct : public MutableShortStruct const MutableInheritanceStruct& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_str == x.m_var_str); } @@ -2126,6 +2158,8 @@ class MutableInheritanceStruct : public MutableShortStruct return m_var_str; } + + private: std::string m_var_str; @@ -2213,9 +2247,9 @@ class MutableInheritanceEmptyStruct : public MutableShortStruct const MutableInheritanceEmptyStruct& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } static_cast(x); return true; } @@ -2230,6 +2264,8 @@ class MutableInheritanceEmptyStruct : public MutableShortStruct return !(*this == x); } + + private: @@ -2265,7 +2301,7 @@ class MutableExtensibilityInheritance : public MutableShortStruct const MutableExtensibilityInheritance& x) : MutableShortStruct(x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -2290,7 +2326,7 @@ class MutableExtensibilityInheritance : public MutableShortStruct { MutableShortStruct::operator =(x); - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -2316,9 +2352,9 @@ class MutableExtensibilityInheritance : public MutableShortStruct const MutableExtensibilityInheritance& x) const { if (MutableShortStruct::operator !=(x)) - { - return false; - } + { + return false; + } return (m_var_long == x.m_var_long); } @@ -2360,6 +2396,8 @@ class MutableExtensibilityInheritance : public MutableShortStruct return m_var_long; } + + private: int32_t m_var_long{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp index aaf291c0..9f068e6a 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/optional.hpp @@ -86,7 +86,7 @@ class short_optional eProsima_user_DllExport short_optional( const short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -108,7 +108,7 @@ class short_optional const short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -183,6 +183,8 @@ class short_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -217,7 +219,7 @@ class ushort_optional eProsima_user_DllExport ushort_optional( const ushort_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -239,7 +241,7 @@ class ushort_optional const ushort_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -314,6 +316,8 @@ class ushort_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -348,7 +352,7 @@ class long_optional eProsima_user_DllExport long_optional( const long_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -370,7 +374,7 @@ class long_optional const long_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -445,6 +449,8 @@ class long_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -479,7 +485,7 @@ class ulong_optional eProsima_user_DllExport ulong_optional( const ulong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -501,7 +507,7 @@ class ulong_optional const ulong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -576,6 +582,8 @@ class ulong_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -610,7 +618,7 @@ class longlong_optional eProsima_user_DllExport longlong_optional( const longlong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -632,7 +640,7 @@ class longlong_optional const longlong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -707,6 +715,8 @@ class longlong_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -741,7 +751,7 @@ class ulonglong_optional eProsima_user_DllExport ulonglong_optional( const ulonglong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -763,7 +773,7 @@ class ulonglong_optional const ulonglong_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -838,6 +848,8 @@ class ulonglong_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -872,7 +884,7 @@ class float_optional eProsima_user_DllExport float_optional( const float_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -894,7 +906,7 @@ class float_optional const float_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -969,6 +981,8 @@ class float_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1003,7 +1017,7 @@ class double_optional eProsima_user_DllExport double_optional( const double_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1025,7 +1039,7 @@ class double_optional const double_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1100,6 +1114,8 @@ class double_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1134,7 +1150,7 @@ class longdouble_optional eProsima_user_DllExport longdouble_optional( const longdouble_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1156,7 +1172,7 @@ class longdouble_optional const longdouble_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1231,6 +1247,8 @@ class longdouble_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1265,7 +1283,7 @@ class boolean_optional eProsima_user_DllExport boolean_optional( const boolean_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1287,7 +1305,7 @@ class boolean_optional const boolean_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1362,6 +1380,8 @@ class boolean_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1396,7 +1416,7 @@ class octet_optional eProsima_user_DllExport octet_optional( const octet_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1418,7 +1438,7 @@ class octet_optional const octet_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1493,6 +1513,8 @@ class octet_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1527,7 +1549,7 @@ class char_optional eProsima_user_DllExport char_optional( const char_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1549,7 +1571,7 @@ class char_optional const char_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1624,6 +1646,8 @@ class char_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1658,7 +1682,7 @@ class wchar_optional eProsima_user_DllExport wchar_optional( const wchar_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -1680,7 +1704,7 @@ class wchar_optional const wchar_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1755,6 +1779,8 @@ class wchar_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -1789,9 +1815,9 @@ class short_align_1_optional eProsima_user_DllExport short_align_1_optional( const short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -1814,9 +1840,9 @@ class short_align_1_optional const short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -1842,7 +1868,7 @@ class short_align_1_optional const short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -1883,6 +1909,7 @@ class short_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -1921,6 +1948,8 @@ class short_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -1956,9 +1985,9 @@ class short_align_2_optional eProsima_user_DllExport short_align_2_optional( const short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -1981,9 +2010,9 @@ class short_align_2_optional const short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2009,7 +2038,7 @@ class short_align_2_optional const short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2050,6 +2079,7 @@ class short_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2088,6 +2118,8 @@ class short_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -2123,9 +2155,9 @@ class short_align_4_optional eProsima_user_DllExport short_align_4_optional( const short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2148,9 +2180,9 @@ class short_align_4_optional const short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2176,7 +2208,7 @@ class short_align_4_optional const short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2217,6 +2249,7 @@ class short_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2255,6 +2288,8 @@ class short_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -2290,9 +2325,9 @@ class ushort_align_1_optional eProsima_user_DllExport ushort_align_1_optional( const ushort_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2315,9 +2350,9 @@ class ushort_align_1_optional const ushort_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2343,7 +2378,7 @@ class ushort_align_1_optional const ushort_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2384,6 +2419,7 @@ class ushort_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2422,6 +2458,8 @@ class ushort_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -2457,9 +2495,9 @@ class ushort_align_2_optional eProsima_user_DllExport ushort_align_2_optional( const ushort_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2482,9 +2520,9 @@ class ushort_align_2_optional const ushort_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2510,7 +2548,7 @@ class ushort_align_2_optional const ushort_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2551,6 +2589,7 @@ class ushort_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2589,6 +2628,8 @@ class ushort_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -2624,9 +2665,9 @@ class ushort_align_4_optional eProsima_user_DllExport ushort_align_4_optional( const ushort_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2649,9 +2690,9 @@ class ushort_align_4_optional const ushort_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2677,7 +2718,7 @@ class ushort_align_4_optional const ushort_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2718,6 +2759,7 @@ class ushort_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2756,6 +2798,8 @@ class ushort_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -2791,9 +2835,9 @@ class long_align_1_optional eProsima_user_DllExport long_align_1_optional( const long_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2816,9 +2860,9 @@ class long_align_1_optional const long_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -2844,7 +2888,7 @@ class long_align_1_optional const long_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -2885,6 +2929,7 @@ class long_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -2923,6 +2968,8 @@ class long_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -2958,9 +3005,9 @@ class long_align_2_optional eProsima_user_DllExport long_align_2_optional( const long_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -2983,9 +3030,9 @@ class long_align_2_optional const long_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3011,7 +3058,7 @@ class long_align_2_optional const long_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3052,6 +3099,7 @@ class long_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3090,6 +3138,8 @@ class long_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -3125,9 +3175,9 @@ class long_align_4_optional eProsima_user_DllExport long_align_4_optional( const long_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3150,9 +3200,9 @@ class long_align_4_optional const long_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3178,7 +3228,7 @@ class long_align_4_optional const long_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3219,6 +3269,7 @@ class long_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3257,6 +3308,8 @@ class long_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -3292,9 +3345,9 @@ class ulong_align_1_optional eProsima_user_DllExport ulong_align_1_optional( const ulong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3317,9 +3370,9 @@ class ulong_align_1_optional const ulong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3345,7 +3398,7 @@ class ulong_align_1_optional const ulong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3386,6 +3439,7 @@ class ulong_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3424,6 +3478,8 @@ class ulong_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -3459,9 +3515,9 @@ class ulong_align_2_optional eProsima_user_DllExport ulong_align_2_optional( const ulong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3484,9 +3540,9 @@ class ulong_align_2_optional const ulong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3512,7 +3568,7 @@ class ulong_align_2_optional const ulong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3553,6 +3609,7 @@ class ulong_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3591,6 +3648,8 @@ class ulong_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -3626,9 +3685,9 @@ class ulong_align_4_optional eProsima_user_DllExport ulong_align_4_optional( const ulong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3651,9 +3710,9 @@ class ulong_align_4_optional const ulong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3679,7 +3738,7 @@ class ulong_align_4_optional const ulong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3720,6 +3779,7 @@ class ulong_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3758,6 +3818,8 @@ class ulong_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -3793,9 +3855,9 @@ class longlong_align_1_optional eProsima_user_DllExport longlong_align_1_optional( const longlong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3818,9 +3880,9 @@ class longlong_align_1_optional const longlong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -3846,7 +3908,7 @@ class longlong_align_1_optional const longlong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -3887,6 +3949,7 @@ class longlong_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -3925,6 +3988,8 @@ class longlong_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -3960,9 +4025,9 @@ class longlong_align_2_optional eProsima_user_DllExport longlong_align_2_optional( const longlong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -3985,9 +4050,9 @@ class longlong_align_2_optional const longlong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4013,7 +4078,7 @@ class longlong_align_2_optional const longlong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4054,6 +4119,7 @@ class longlong_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4092,6 +4158,8 @@ class longlong_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -4127,9 +4195,9 @@ class longlong_align_4_optional eProsima_user_DllExport longlong_align_4_optional( const longlong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4152,9 +4220,9 @@ class longlong_align_4_optional const longlong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4180,7 +4248,7 @@ class longlong_align_4_optional const longlong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4221,6 +4289,7 @@ class longlong_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4259,6 +4328,8 @@ class longlong_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -4294,9 +4365,9 @@ class ulonglong_align_1_optional eProsima_user_DllExport ulonglong_align_1_optional( const ulonglong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4319,9 +4390,9 @@ class ulonglong_align_1_optional const ulonglong_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4347,7 +4418,7 @@ class ulonglong_align_1_optional const ulonglong_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4388,6 +4459,7 @@ class ulonglong_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4426,6 +4498,8 @@ class ulonglong_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -4461,9 +4535,9 @@ class ulonglong_align_2_optional eProsima_user_DllExport ulonglong_align_2_optional( const ulonglong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4486,9 +4560,9 @@ class ulonglong_align_2_optional const ulonglong_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4514,7 +4588,7 @@ class ulonglong_align_2_optional const ulonglong_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4555,6 +4629,7 @@ class ulonglong_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4593,6 +4668,8 @@ class ulonglong_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -4628,9 +4705,9 @@ class ulonglong_align_4_optional eProsima_user_DllExport ulonglong_align_4_optional( const ulonglong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4653,9 +4730,9 @@ class ulonglong_align_4_optional const ulonglong_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4681,7 +4758,7 @@ class ulonglong_align_4_optional const ulonglong_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4722,6 +4799,7 @@ class ulonglong_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4760,6 +4838,8 @@ class ulonglong_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -4795,9 +4875,9 @@ class float_align_1_optional eProsima_user_DllExport float_align_1_optional( const float_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4820,9 +4900,9 @@ class float_align_1_optional const float_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -4848,7 +4928,7 @@ class float_align_1_optional const float_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -4889,6 +4969,7 @@ class float_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -4927,6 +5008,8 @@ class float_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -4962,9 +5045,9 @@ class float_align_2_optional eProsima_user_DllExport float_align_2_optional( const float_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -4987,9 +5070,9 @@ class float_align_2_optional const float_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5015,7 +5098,7 @@ class float_align_2_optional const float_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5056,6 +5139,7 @@ class float_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5094,6 +5178,8 @@ class float_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -5129,9 +5215,9 @@ class float_align_4_optional eProsima_user_DllExport float_align_4_optional( const float_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5154,9 +5240,9 @@ class float_align_4_optional const float_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5182,7 +5268,7 @@ class float_align_4_optional const float_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5223,6 +5309,7 @@ class float_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5261,6 +5348,8 @@ class float_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -5296,9 +5385,9 @@ class double_align_1_optional eProsima_user_DllExport double_align_1_optional( const double_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5321,9 +5410,9 @@ class double_align_1_optional const double_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5349,7 +5438,7 @@ class double_align_1_optional const double_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5390,6 +5479,7 @@ class double_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5428,6 +5518,8 @@ class double_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -5463,9 +5555,9 @@ class double_align_2_optional eProsima_user_DllExport double_align_2_optional( const double_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5488,9 +5580,9 @@ class double_align_2_optional const double_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5516,7 +5608,7 @@ class double_align_2_optional const double_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5557,6 +5649,7 @@ class double_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5595,6 +5688,8 @@ class double_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -5630,9 +5725,9 @@ class double_align_4_optional eProsima_user_DllExport double_align_4_optional( const double_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5655,9 +5750,9 @@ class double_align_4_optional const double_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5683,7 +5778,7 @@ class double_align_4_optional const double_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5724,6 +5819,7 @@ class double_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5762,6 +5858,8 @@ class double_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -5797,9 +5895,9 @@ class longdouble_align_1_optional eProsima_user_DllExport longdouble_align_1_optional( const longdouble_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5822,9 +5920,9 @@ class longdouble_align_1_optional const longdouble_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -5850,7 +5948,7 @@ class longdouble_align_1_optional const longdouble_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -5891,6 +5989,7 @@ class longdouble_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -5929,6 +6028,8 @@ class longdouble_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -5964,9 +6065,9 @@ class longdouble_align_2_optional eProsima_user_DllExport longdouble_align_2_optional( const longdouble_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -5989,9 +6090,9 @@ class longdouble_align_2_optional const longdouble_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6017,7 +6118,7 @@ class longdouble_align_2_optional const longdouble_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6058,6 +6159,7 @@ class longdouble_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6096,6 +6198,8 @@ class longdouble_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -6131,9 +6235,9 @@ class longdouble_align_4_optional eProsima_user_DllExport longdouble_align_4_optional( const longdouble_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6156,9 +6260,9 @@ class longdouble_align_4_optional const longdouble_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6184,7 +6288,7 @@ class longdouble_align_4_optional const longdouble_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6225,6 +6329,7 @@ class longdouble_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6263,6 +6368,8 @@ class longdouble_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -6298,9 +6405,9 @@ class boolean_align_1_optional eProsima_user_DllExport boolean_align_1_optional( const boolean_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6323,9 +6430,9 @@ class boolean_align_1_optional const boolean_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6351,7 +6458,7 @@ class boolean_align_1_optional const boolean_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6392,6 +6499,7 @@ class boolean_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6430,6 +6538,8 @@ class boolean_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -6465,9 +6575,9 @@ class boolean_align_2_optional eProsima_user_DllExport boolean_align_2_optional( const boolean_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6490,9 +6600,9 @@ class boolean_align_2_optional const boolean_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6518,7 +6628,7 @@ class boolean_align_2_optional const boolean_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6559,6 +6669,7 @@ class boolean_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6597,6 +6708,8 @@ class boolean_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -6632,9 +6745,9 @@ class boolean_align_4_optional eProsima_user_DllExport boolean_align_4_optional( const boolean_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6657,9 +6770,9 @@ class boolean_align_4_optional const boolean_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6685,7 +6798,7 @@ class boolean_align_4_optional const boolean_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6726,6 +6839,7 @@ class boolean_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6764,6 +6878,8 @@ class boolean_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -6799,9 +6915,9 @@ class octet_align_1_optional eProsima_user_DllExport octet_align_1_optional( const octet_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6824,9 +6940,9 @@ class octet_align_1_optional const octet_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -6852,7 +6968,7 @@ class octet_align_1_optional const octet_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -6893,6 +7009,7 @@ class octet_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -6931,6 +7048,8 @@ class octet_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -6966,9 +7085,9 @@ class octet_align_2_optional eProsima_user_DllExport octet_align_2_optional( const octet_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -6991,9 +7110,9 @@ class octet_align_2_optional const octet_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7019,7 +7138,7 @@ class octet_align_2_optional const octet_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7060,6 +7179,7 @@ class octet_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7098,6 +7218,8 @@ class octet_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -7133,9 +7255,9 @@ class octet_align_4_optional eProsima_user_DllExport octet_align_4_optional( const octet_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7158,9 +7280,9 @@ class octet_align_4_optional const octet_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7186,7 +7308,7 @@ class octet_align_4_optional const octet_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7227,6 +7349,7 @@ class octet_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7265,6 +7388,8 @@ class octet_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -7300,9 +7425,9 @@ class char_align_1_optional eProsima_user_DllExport char_align_1_optional( const char_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7325,9 +7450,9 @@ class char_align_1_optional const char_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7353,7 +7478,7 @@ class char_align_1_optional const char_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7394,6 +7519,7 @@ class char_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7432,6 +7558,8 @@ class char_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -7467,9 +7595,9 @@ class char_align_2_optional eProsima_user_DllExport char_align_2_optional( const char_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7492,9 +7620,9 @@ class char_align_2_optional const char_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7520,7 +7648,7 @@ class char_align_2_optional const char_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7561,6 +7689,7 @@ class char_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7599,6 +7728,8 @@ class char_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -7634,9 +7765,9 @@ class char_align_4_optional eProsima_user_DllExport char_align_4_optional( const char_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7659,9 +7790,9 @@ class char_align_4_optional const char_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7687,7 +7818,7 @@ class char_align_4_optional const char_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7728,6 +7859,7 @@ class char_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7766,6 +7898,8 @@ class char_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -7801,9 +7935,9 @@ class wchar_align_1_optional eProsima_user_DllExport wchar_align_1_optional( const wchar_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7826,9 +7960,9 @@ class wchar_align_1_optional const wchar_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -7854,7 +7988,7 @@ class wchar_align_1_optional const wchar_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -7895,6 +8029,7 @@ class wchar_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -7933,6 +8068,8 @@ class wchar_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -7968,9 +8105,9 @@ class wchar_align_2_optional eProsima_user_DllExport wchar_align_2_optional( const wchar_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -7993,9 +8130,9 @@ class wchar_align_2_optional const wchar_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8021,7 +8158,7 @@ class wchar_align_2_optional const wchar_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8062,6 +8199,7 @@ class wchar_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8100,6 +8238,8 @@ class wchar_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -8135,9 +8275,9 @@ class wchar_align_4_optional eProsima_user_DllExport wchar_align_4_optional( const wchar_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8160,9 +8300,9 @@ class wchar_align_4_optional const wchar_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8188,7 +8328,7 @@ class wchar_align_4_optional const wchar_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8229,6 +8369,7 @@ class wchar_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8267,6 +8408,8 @@ class wchar_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -8302,7 +8445,7 @@ class sequence_short_optional eProsima_user_DllExport sequence_short_optional( const sequence_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -8324,7 +8467,7 @@ class sequence_short_optional const sequence_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8399,6 +8542,8 @@ class sequence_short_optional return m_value; } + + private: eprosima::fastcdr::optional> m_value; @@ -8433,9 +8578,9 @@ class sequence_short_align_1_optional eProsima_user_DllExport sequence_short_align_1_optional( const sequence_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8458,9 +8603,9 @@ class sequence_short_align_1_optional const sequence_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8486,7 +8631,7 @@ class sequence_short_align_1_optional const sequence_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8527,6 +8672,7 @@ class sequence_short_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8565,6 +8711,8 @@ class sequence_short_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -8600,9 +8748,9 @@ class sequence_short_align_2_optional eProsima_user_DllExport sequence_short_align_2_optional( const sequence_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8625,9 +8773,9 @@ class sequence_short_align_2_optional const sequence_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8653,7 +8801,7 @@ class sequence_short_align_2_optional const sequence_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8694,6 +8842,7 @@ class sequence_short_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8732,6 +8881,8 @@ class sequence_short_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -8767,9 +8918,9 @@ class sequence_short_align_4_optional eProsima_user_DllExport sequence_short_align_4_optional( const sequence_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -8792,9 +8943,9 @@ class sequence_short_align_4_optional const sequence_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -8820,7 +8971,7 @@ class sequence_short_align_4_optional const sequence_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -8861,6 +9012,7 @@ class sequence_short_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -8899,6 +9051,8 @@ class sequence_short_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -8934,7 +9088,7 @@ class string_unbounded_optional eProsima_user_DllExport string_unbounded_optional( const string_unbounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -8956,7 +9110,7 @@ class string_unbounded_optional const string_unbounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9031,6 +9185,8 @@ class string_unbounded_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -9065,9 +9221,9 @@ class string_unbounded_align_1_optional eProsima_user_DllExport string_unbounded_align_1_optional( const string_unbounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9090,9 +9246,9 @@ class string_unbounded_align_1_optional const string_unbounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9118,7 +9274,7 @@ class string_unbounded_align_1_optional const string_unbounded_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9159,6 +9315,7 @@ class string_unbounded_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9197,6 +9354,8 @@ class string_unbounded_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -9232,9 +9391,9 @@ class string_unbounded_align_2_optional eProsima_user_DllExport string_unbounded_align_2_optional( const string_unbounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9257,9 +9416,9 @@ class string_unbounded_align_2_optional const string_unbounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9285,7 +9444,7 @@ class string_unbounded_align_2_optional const string_unbounded_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9326,6 +9485,7 @@ class string_unbounded_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9364,6 +9524,8 @@ class string_unbounded_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -9399,9 +9561,9 @@ class string_unbounded_align_4_optional eProsima_user_DllExport string_unbounded_align_4_optional( const string_unbounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9424,9 +9586,9 @@ class string_unbounded_align_4_optional const string_unbounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9452,7 +9614,7 @@ class string_unbounded_align_4_optional const string_unbounded_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9493,6 +9655,7 @@ class string_unbounded_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9531,6 +9694,8 @@ class string_unbounded_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -9566,7 +9731,7 @@ class string_bounded_optional eProsima_user_DllExport string_bounded_optional( const string_bounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -9588,7 +9753,7 @@ class string_bounded_optional const string_bounded_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9663,6 +9828,8 @@ class string_bounded_optional return m_value; } + + private: eprosima::fastcdr::optional> m_value; @@ -9697,9 +9864,9 @@ class string_bounded_align_1_optional eProsima_user_DllExport string_bounded_align_1_optional( const string_bounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9722,9 +9889,9 @@ class string_bounded_align_1_optional const string_bounded_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9750,7 +9917,7 @@ class string_bounded_align_1_optional const string_bounded_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9791,6 +9958,7 @@ class string_bounded_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9829,6 +9997,8 @@ class string_bounded_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -9864,9 +10034,9 @@ class string_bounded_align_2_optional eProsima_user_DllExport string_bounded_align_2_optional( const string_bounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -9889,9 +10059,9 @@ class string_bounded_align_2_optional const string_bounded_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -9917,7 +10087,7 @@ class string_bounded_align_2_optional const string_bounded_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -9958,6 +10128,7 @@ class string_bounded_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -9996,6 +10167,8 @@ class string_bounded_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -10031,9 +10204,9 @@ class string_bounded_align_4_optional eProsima_user_DllExport string_bounded_align_4_optional( const string_bounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10056,9 +10229,9 @@ class string_bounded_align_4_optional const string_bounded_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10084,7 +10257,7 @@ class string_bounded_align_4_optional const string_bounded_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10125,6 +10298,7 @@ class string_bounded_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10163,6 +10337,8 @@ class string_bounded_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -10198,7 +10374,7 @@ class map_short_optional eProsima_user_DllExport map_short_optional( const map_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -10220,7 +10396,7 @@ class map_short_optional const map_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10295,6 +10471,8 @@ class map_short_optional return m_value; } + + private: eprosima::fastcdr::optional> m_value; @@ -10329,9 +10507,9 @@ class map_short_align_1_optional eProsima_user_DllExport map_short_align_1_optional( const map_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10354,9 +10532,9 @@ class map_short_align_1_optional const map_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10382,7 +10560,7 @@ class map_short_align_1_optional const map_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10423,6 +10601,7 @@ class map_short_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10461,6 +10640,8 @@ class map_short_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -10496,9 +10677,9 @@ class map_short_align_2_optional eProsima_user_DllExport map_short_align_2_optional( const map_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10521,9 +10702,9 @@ class map_short_align_2_optional const map_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10549,7 +10730,7 @@ class map_short_align_2_optional const map_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10590,6 +10771,7 @@ class map_short_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10628,6 +10810,8 @@ class map_short_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -10663,9 +10847,9 @@ class map_short_align_4_optional eProsima_user_DllExport map_short_align_4_optional( const map_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10688,9 +10872,9 @@ class map_short_align_4_optional const map_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10716,7 +10900,7 @@ class map_short_align_4_optional const map_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -10757,6 +10941,7 @@ class map_short_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -10795,6 +10980,8 @@ class map_short_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -10830,7 +11017,7 @@ class array_short_optional eProsima_user_DllExport array_short_optional( const array_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -10852,7 +11039,7 @@ class array_short_optional const array_short_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -10927,6 +11114,8 @@ class array_short_optional return m_value; } + + private: eprosima::fastcdr::optional> m_value; @@ -10961,9 +11150,9 @@ class array_short_align_1_optional eProsima_user_DllExport array_short_align_1_optional( const array_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -10986,9 +11175,9 @@ class array_short_align_1_optional const array_short_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11014,7 +11203,7 @@ class array_short_align_1_optional const array_short_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11055,6 +11244,7 @@ class array_short_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11093,6 +11283,8 @@ class array_short_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -11128,9 +11320,9 @@ class array_short_align_2_optional eProsima_user_DllExport array_short_align_2_optional( const array_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11153,9 +11345,9 @@ class array_short_align_2_optional const array_short_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11181,7 +11373,7 @@ class array_short_align_2_optional const array_short_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11222,6 +11414,7 @@ class array_short_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11260,6 +11453,8 @@ class array_short_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -11295,9 +11490,9 @@ class array_short_align_4_optional eProsima_user_DllExport array_short_align_4_optional( const array_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11320,9 +11515,9 @@ class array_short_align_4_optional const array_short_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11348,7 +11543,7 @@ class array_short_align_4_optional const array_short_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11389,6 +11584,7 @@ class array_short_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11427,6 +11623,8 @@ class array_short_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -11462,7 +11660,7 @@ class struct_optional eProsima_user_DllExport struct_optional( const struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -11484,7 +11682,7 @@ class struct_optional const struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11559,6 +11757,8 @@ class struct_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -11593,9 +11793,9 @@ class struct_align_1_optional eProsima_user_DllExport struct_align_1_optional( const struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11618,9 +11818,9 @@ class struct_align_1_optional const struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11646,7 +11846,7 @@ class struct_align_1_optional const struct_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11687,6 +11887,7 @@ class struct_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11725,6 +11926,8 @@ class struct_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -11760,9 +11963,9 @@ class struct_align_2_optional eProsima_user_DllExport struct_align_2_optional( const struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11785,9 +11988,9 @@ class struct_align_2_optional const struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11813,7 +12016,7 @@ class struct_align_2_optional const struct_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -11854,6 +12057,7 @@ class struct_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -11892,6 +12096,8 @@ class struct_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -11927,9 +12133,9 @@ class struct_align_4_optional eProsima_user_DllExport struct_align_4_optional( const struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -11952,9 +12158,9 @@ class struct_align_4_optional const struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -11980,7 +12186,7 @@ class struct_align_4_optional const struct_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12021,6 +12227,7 @@ class struct_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12059,6 +12266,8 @@ class struct_align_4_optional return m_value; } + + private: uint32_t m_align{0}; @@ -12094,9 +12303,9 @@ class InnerStructOptional eProsima_user_DllExport InnerStructOptional( const InnerStructOptional& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; } @@ -12119,9 +12328,9 @@ class InnerStructOptional const InnerStructOptional& x) { - m_s = x.m_s; + m_s = x.m_s; - m_l = x.m_l; + m_l = x.m_l; return *this; } @@ -12147,7 +12356,7 @@ class InnerStructOptional const InnerStructOptional& x) const { return (m_s == x.m_s && - m_l == x.m_l); + m_l == x.m_l); } /*! @@ -12188,6 +12397,7 @@ class InnerStructOptional return m_s; } + /*! * @brief This function copies the value in member l * @param _l New value to be copied in member l @@ -12226,6 +12436,8 @@ class InnerStructOptional return m_l; } + + private: int16_t m_s{0}; @@ -12261,7 +12473,7 @@ class opt_struct_optional eProsima_user_DllExport opt_struct_optional( const opt_struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -12283,7 +12495,7 @@ class opt_struct_optional const opt_struct_optional& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12358,6 +12570,8 @@ class opt_struct_optional return m_value; } + + private: eprosima::fastcdr::optional m_value; @@ -12392,9 +12606,9 @@ class opt_struct_align_1_optional eProsima_user_DllExport opt_struct_align_1_optional( const opt_struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12417,9 +12631,9 @@ class opt_struct_align_1_optional const opt_struct_align_1_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12445,7 +12659,7 @@ class opt_struct_align_1_optional const opt_struct_align_1_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12486,6 +12700,7 @@ class opt_struct_align_1_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12524,6 +12739,8 @@ class opt_struct_align_1_optional return m_value; } + + private: uint8_t m_align{0}; @@ -12559,9 +12776,9 @@ class opt_struct_align_2_optional eProsima_user_DllExport opt_struct_align_2_optional( const opt_struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12584,9 +12801,9 @@ class opt_struct_align_2_optional const opt_struct_align_2_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12612,7 +12829,7 @@ class opt_struct_align_2_optional const opt_struct_align_2_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12653,6 +12870,7 @@ class opt_struct_align_2_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12691,6 +12909,8 @@ class opt_struct_align_2_optional return m_value; } + + private: uint16_t m_align{0}; @@ -12726,9 +12946,9 @@ class opt_struct_align_4_optional eProsima_user_DllExport opt_struct_align_4_optional( const opt_struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; } @@ -12751,9 +12971,9 @@ class opt_struct_align_4_optional const opt_struct_align_4_optional& x) { - m_align = x.m_align; + m_align = x.m_align; - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -12779,7 +12999,7 @@ class opt_struct_align_4_optional const opt_struct_align_4_optional& x) const { return (m_align == x.m_align && - m_value == x.m_value); + m_value == x.m_value); } /*! @@ -12820,6 +13040,7 @@ class opt_struct_align_4_optional return m_align; } + /*! * @brief This function copies the value in member value * @param _value New value to be copied in member value @@ -12858,6 +13079,8 @@ class opt_struct_align_4_optional return m_value; } + + private: uint32_t m_align{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp index 376d4ea8..041ad148 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/primitives.hpp @@ -78,7 +78,7 @@ class ShortStruct eProsima_user_DllExport ShortStruct( const ShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -100,7 +100,7 @@ class ShortStruct const ShortStruct& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -165,6 +165,8 @@ class ShortStruct return m_var_short; } + + private: int16_t m_var_short{0}; @@ -199,7 +201,7 @@ class UShortStruct eProsima_user_DllExport UShortStruct( const UShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -221,7 +223,7 @@ class UShortStruct const UShortStruct& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -286,6 +288,8 @@ class UShortStruct return m_var_ushort; } + + private: uint16_t m_var_ushort{0}; @@ -320,7 +324,7 @@ class LongStruct eProsima_user_DllExport LongStruct( const LongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -342,7 +346,7 @@ class LongStruct const LongStruct& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -407,6 +411,8 @@ class LongStruct return m_var_long; } + + private: int32_t m_var_long{0}; @@ -441,7 +447,7 @@ class ULongStruct eProsima_user_DllExport ULongStruct( const ULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -463,7 +469,7 @@ class ULongStruct const ULongStruct& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -528,6 +534,8 @@ class ULongStruct return m_var_ulong; } + + private: uint32_t m_var_ulong{0}; @@ -562,7 +570,7 @@ class LongLongStruct eProsima_user_DllExport LongLongStruct( const LongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -584,7 +592,7 @@ class LongLongStruct const LongLongStruct& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -649,6 +657,8 @@ class LongLongStruct return m_var_longlong; } + + private: int64_t m_var_longlong{0}; @@ -683,7 +693,7 @@ class ULongLongStruct eProsima_user_DllExport ULongLongStruct( const ULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -705,7 +715,7 @@ class ULongLongStruct const ULongLongStruct& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -770,6 +780,8 @@ class ULongLongStruct return m_var_ulonglong; } + + private: uint64_t m_var_ulonglong{0}; @@ -804,7 +816,7 @@ class FloatStruct eProsima_user_DllExport FloatStruct( const FloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -826,7 +838,7 @@ class FloatStruct const FloatStruct& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -891,6 +903,8 @@ class FloatStruct return m_var_float; } + + private: float m_var_float{0.0}; @@ -925,7 +939,7 @@ class DoubleStruct eProsima_user_DllExport DoubleStruct( const DoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -947,7 +961,7 @@ class DoubleStruct const DoubleStruct& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1012,6 +1026,8 @@ class DoubleStruct return m_var_double; } + + private: double m_var_double{0.0}; @@ -1046,7 +1062,7 @@ class LongDoubleStruct eProsima_user_DllExport LongDoubleStruct( const LongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1068,7 +1084,7 @@ class LongDoubleStruct const LongDoubleStruct& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1133,6 +1149,8 @@ class LongDoubleStruct return m_var_longdouble; } + + private: long double m_var_longdouble{0.0}; @@ -1167,7 +1185,7 @@ class BooleanStruct eProsima_user_DllExport BooleanStruct( const BooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1189,7 +1207,7 @@ class BooleanStruct const BooleanStruct& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1254,6 +1272,8 @@ class BooleanStruct return m_var_boolean; } + + private: bool m_var_boolean{false}; @@ -1288,7 +1308,7 @@ class OctetStruct eProsima_user_DllExport OctetStruct( const OctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1310,7 +1330,7 @@ class OctetStruct const OctetStruct& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1375,6 +1395,8 @@ class OctetStruct return m_var_octet; } + + private: uint8_t m_var_octet{0}; @@ -1409,7 +1431,7 @@ class CharStruct eProsima_user_DllExport CharStruct( const CharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1431,7 +1453,7 @@ class CharStruct const CharStruct& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1496,6 +1518,8 @@ class CharStruct return m_var_char8; } + + private: char m_var_char8{0}; @@ -1530,7 +1554,7 @@ class WCharStruct eProsima_user_DllExport WCharStruct( const WCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1552,7 +1576,7 @@ class WCharStruct const WCharStruct& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1617,6 +1641,8 @@ class WCharStruct return m_var_char16; } + + private: wchar_t m_var_char16{0}; @@ -1651,7 +1677,7 @@ class Int8Struct eProsima_user_DllExport Int8Struct( const Int8Struct& x) { - m_var_int8 = x.m_var_int8; + m_var_int8 = x.m_var_int8; } @@ -1673,7 +1699,7 @@ class Int8Struct const Int8Struct& x) { - m_var_int8 = x.m_var_int8; + m_var_int8 = x.m_var_int8; return *this; } @@ -1738,6 +1764,8 @@ class Int8Struct return m_var_int8; } + + private: int8_t m_var_int8{0}; @@ -1772,7 +1800,7 @@ class Uint8Struct eProsima_user_DllExport Uint8Struct( const Uint8Struct& x) { - m_var_uint8 = x.m_var_uint8; + m_var_uint8 = x.m_var_uint8; } @@ -1794,7 +1822,7 @@ class Uint8Struct const Uint8Struct& x) { - m_var_uint8 = x.m_var_uint8; + m_var_uint8 = x.m_var_uint8; return *this; } @@ -1859,6 +1887,8 @@ class Uint8Struct return m_var_uint8; } + + private: uint8_t m_var_uint8{0}; @@ -1893,7 +1923,7 @@ class Int16Struct eProsima_user_DllExport Int16Struct( const Int16Struct& x) { - m_var_int16 = x.m_var_int16; + m_var_int16 = x.m_var_int16; } @@ -1915,7 +1945,7 @@ class Int16Struct const Int16Struct& x) { - m_var_int16 = x.m_var_int16; + m_var_int16 = x.m_var_int16; return *this; } @@ -1980,6 +2010,8 @@ class Int16Struct return m_var_int16; } + + private: int16_t m_var_int16{0}; @@ -2014,7 +2046,7 @@ class Uint16Struct eProsima_user_DllExport Uint16Struct( const Uint16Struct& x) { - m_var_uint16 = x.m_var_uint16; + m_var_uint16 = x.m_var_uint16; } @@ -2036,7 +2068,7 @@ class Uint16Struct const Uint16Struct& x) { - m_var_uint16 = x.m_var_uint16; + m_var_uint16 = x.m_var_uint16; return *this; } @@ -2101,6 +2133,8 @@ class Uint16Struct return m_var_uint16; } + + private: uint16_t m_var_uint16{0}; @@ -2135,7 +2169,7 @@ class Int32Struct eProsima_user_DllExport Int32Struct( const Int32Struct& x) { - m_var_int32 = x.m_var_int32; + m_var_int32 = x.m_var_int32; } @@ -2157,7 +2191,7 @@ class Int32Struct const Int32Struct& x) { - m_var_int32 = x.m_var_int32; + m_var_int32 = x.m_var_int32; return *this; } @@ -2222,6 +2256,8 @@ class Int32Struct return m_var_int32; } + + private: int32_t m_var_int32{0}; @@ -2256,7 +2292,7 @@ class Uint32Struct eProsima_user_DllExport Uint32Struct( const Uint32Struct& x) { - m_var_uint32 = x.m_var_uint32; + m_var_uint32 = x.m_var_uint32; } @@ -2278,7 +2314,7 @@ class Uint32Struct const Uint32Struct& x) { - m_var_uint32 = x.m_var_uint32; + m_var_uint32 = x.m_var_uint32; return *this; } @@ -2343,6 +2379,8 @@ class Uint32Struct return m_var_uint32; } + + private: uint32_t m_var_uint32{0}; @@ -2377,7 +2415,7 @@ class Int64Struct eProsima_user_DllExport Int64Struct( const Int64Struct& x) { - m_var_int64 = x.m_var_int64; + m_var_int64 = x.m_var_int64; } @@ -2399,7 +2437,7 @@ class Int64Struct const Int64Struct& x) { - m_var_int64 = x.m_var_int64; + m_var_int64 = x.m_var_int64; return *this; } @@ -2464,6 +2502,8 @@ class Int64Struct return m_var_int64; } + + private: int64_t m_var_int64{0}; @@ -2498,7 +2538,7 @@ class Uint64Struct eProsima_user_DllExport Uint64Struct( const Uint64Struct& x) { - m_var_uint64 = x.m_var_uint64; + m_var_uint64 = x.m_var_uint64; } @@ -2520,7 +2560,7 @@ class Uint64Struct const Uint64Struct& x) { - m_var_uint64 = x.m_var_uint64; + m_var_uint64 = x.m_var_uint64; return *this; } @@ -2585,6 +2625,8 @@ class Uint64Struct return m_var_uint64; } + + private: uint64_t m_var_uint64{0}; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp index 38d044d5..90fcdcf5 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/sequences.hpp @@ -83,7 +83,7 @@ class SequenceShort eProsima_user_DllExport SequenceShort( const SequenceShort& x) { - m_var_sequence_short = x.m_var_sequence_short; + m_var_sequence_short = x.m_var_sequence_short; } @@ -105,7 +105,7 @@ class SequenceShort const SequenceShort& x) { - m_var_sequence_short = x.m_var_sequence_short; + m_var_sequence_short = x.m_var_sequence_short; return *this; } @@ -180,6 +180,8 @@ class SequenceShort return m_var_sequence_short; } + + private: std::vector m_var_sequence_short; @@ -214,7 +216,7 @@ class SequenceUShort eProsima_user_DllExport SequenceUShort( const SequenceUShort& x) { - m_var_sequence_ushort = x.m_var_sequence_ushort; + m_var_sequence_ushort = x.m_var_sequence_ushort; } @@ -236,7 +238,7 @@ class SequenceUShort const SequenceUShort& x) { - m_var_sequence_ushort = x.m_var_sequence_ushort; + m_var_sequence_ushort = x.m_var_sequence_ushort; return *this; } @@ -311,6 +313,8 @@ class SequenceUShort return m_var_sequence_ushort; } + + private: std::vector m_var_sequence_ushort; @@ -345,7 +349,7 @@ class SequenceLong eProsima_user_DllExport SequenceLong( const SequenceLong& x) { - m_var_sequence_long = x.m_var_sequence_long; + m_var_sequence_long = x.m_var_sequence_long; } @@ -367,7 +371,7 @@ class SequenceLong const SequenceLong& x) { - m_var_sequence_long = x.m_var_sequence_long; + m_var_sequence_long = x.m_var_sequence_long; return *this; } @@ -442,6 +446,8 @@ class SequenceLong return m_var_sequence_long; } + + private: std::vector m_var_sequence_long; @@ -476,7 +482,7 @@ class SequenceULong eProsima_user_DllExport SequenceULong( const SequenceULong& x) { - m_var_sequence_ulong = x.m_var_sequence_ulong; + m_var_sequence_ulong = x.m_var_sequence_ulong; } @@ -498,7 +504,7 @@ class SequenceULong const SequenceULong& x) { - m_var_sequence_ulong = x.m_var_sequence_ulong; + m_var_sequence_ulong = x.m_var_sequence_ulong; return *this; } @@ -573,6 +579,8 @@ class SequenceULong return m_var_sequence_ulong; } + + private: std::vector m_var_sequence_ulong; @@ -607,7 +615,7 @@ class SequenceLongLong eProsima_user_DllExport SequenceLongLong( const SequenceLongLong& x) { - m_var_sequence_longlong = x.m_var_sequence_longlong; + m_var_sequence_longlong = x.m_var_sequence_longlong; } @@ -629,7 +637,7 @@ class SequenceLongLong const SequenceLongLong& x) { - m_var_sequence_longlong = x.m_var_sequence_longlong; + m_var_sequence_longlong = x.m_var_sequence_longlong; return *this; } @@ -704,6 +712,8 @@ class SequenceLongLong return m_var_sequence_longlong; } + + private: std::vector m_var_sequence_longlong; @@ -738,7 +748,7 @@ class SequenceULongLong eProsima_user_DllExport SequenceULongLong( const SequenceULongLong& x) { - m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; + m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; } @@ -760,7 +770,7 @@ class SequenceULongLong const SequenceULongLong& x) { - m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; + m_var_sequence_ulonglong = x.m_var_sequence_ulonglong; return *this; } @@ -835,6 +845,8 @@ class SequenceULongLong return m_var_sequence_ulonglong; } + + private: std::vector m_var_sequence_ulonglong; @@ -869,7 +881,7 @@ class SequenceFloat eProsima_user_DllExport SequenceFloat( const SequenceFloat& x) { - m_var_sequence_float = x.m_var_sequence_float; + m_var_sequence_float = x.m_var_sequence_float; } @@ -891,7 +903,7 @@ class SequenceFloat const SequenceFloat& x) { - m_var_sequence_float = x.m_var_sequence_float; + m_var_sequence_float = x.m_var_sequence_float; return *this; } @@ -966,6 +978,8 @@ class SequenceFloat return m_var_sequence_float; } + + private: std::vector m_var_sequence_float; @@ -1000,7 +1014,7 @@ class SequenceDouble eProsima_user_DllExport SequenceDouble( const SequenceDouble& x) { - m_var_sequence_double = x.m_var_sequence_double; + m_var_sequence_double = x.m_var_sequence_double; } @@ -1022,7 +1036,7 @@ class SequenceDouble const SequenceDouble& x) { - m_var_sequence_double = x.m_var_sequence_double; + m_var_sequence_double = x.m_var_sequence_double; return *this; } @@ -1097,6 +1111,8 @@ class SequenceDouble return m_var_sequence_double; } + + private: std::vector m_var_sequence_double; @@ -1131,7 +1147,7 @@ class SequenceLongDouble eProsima_user_DllExport SequenceLongDouble( const SequenceLongDouble& x) { - m_var_sequence_longdouble = x.m_var_sequence_longdouble; + m_var_sequence_longdouble = x.m_var_sequence_longdouble; } @@ -1153,7 +1169,7 @@ class SequenceLongDouble const SequenceLongDouble& x) { - m_var_sequence_longdouble = x.m_var_sequence_longdouble; + m_var_sequence_longdouble = x.m_var_sequence_longdouble; return *this; } @@ -1228,6 +1244,8 @@ class SequenceLongDouble return m_var_sequence_longdouble; } + + private: std::vector m_var_sequence_longdouble; @@ -1262,7 +1280,7 @@ class SequenceBoolean eProsima_user_DllExport SequenceBoolean( const SequenceBoolean& x) { - m_var_sequence_boolean = x.m_var_sequence_boolean; + m_var_sequence_boolean = x.m_var_sequence_boolean; } @@ -1284,7 +1302,7 @@ class SequenceBoolean const SequenceBoolean& x) { - m_var_sequence_boolean = x.m_var_sequence_boolean; + m_var_sequence_boolean = x.m_var_sequence_boolean; return *this; } @@ -1359,6 +1377,8 @@ class SequenceBoolean return m_var_sequence_boolean; } + + private: std::vector m_var_sequence_boolean; @@ -1393,7 +1413,7 @@ class SequenceOctet eProsima_user_DllExport SequenceOctet( const SequenceOctet& x) { - m_var_sequence_octet = x.m_var_sequence_octet; + m_var_sequence_octet = x.m_var_sequence_octet; } @@ -1415,7 +1435,7 @@ class SequenceOctet const SequenceOctet& x) { - m_var_sequence_octet = x.m_var_sequence_octet; + m_var_sequence_octet = x.m_var_sequence_octet; return *this; } @@ -1490,6 +1510,8 @@ class SequenceOctet return m_var_sequence_octet; } + + private: std::vector m_var_sequence_octet; @@ -1524,7 +1546,7 @@ class SequenceChar eProsima_user_DllExport SequenceChar( const SequenceChar& x) { - m_var_sequence_char = x.m_var_sequence_char; + m_var_sequence_char = x.m_var_sequence_char; } @@ -1546,7 +1568,7 @@ class SequenceChar const SequenceChar& x) { - m_var_sequence_char = x.m_var_sequence_char; + m_var_sequence_char = x.m_var_sequence_char; return *this; } @@ -1621,6 +1643,8 @@ class SequenceChar return m_var_sequence_char; } + + private: std::vector m_var_sequence_char; @@ -1655,7 +1679,7 @@ class SequenceWChar eProsima_user_DllExport SequenceWChar( const SequenceWChar& x) { - m_var_sequence_wchar = x.m_var_sequence_wchar; + m_var_sequence_wchar = x.m_var_sequence_wchar; } @@ -1677,7 +1701,7 @@ class SequenceWChar const SequenceWChar& x) { - m_var_sequence_wchar = x.m_var_sequence_wchar; + m_var_sequence_wchar = x.m_var_sequence_wchar; return *this; } @@ -1752,6 +1776,8 @@ class SequenceWChar return m_var_sequence_wchar; } + + private: std::vector m_var_sequence_wchar; @@ -1786,7 +1812,7 @@ class SequenceString eProsima_user_DllExport SequenceString( const SequenceString& x) { - m_var_sequence_string = x.m_var_sequence_string; + m_var_sequence_string = x.m_var_sequence_string; } @@ -1808,7 +1834,7 @@ class SequenceString const SequenceString& x) { - m_var_sequence_string = x.m_var_sequence_string; + m_var_sequence_string = x.m_var_sequence_string; return *this; } @@ -1883,6 +1909,8 @@ class SequenceString return m_var_sequence_string; } + + private: std::vector m_var_sequence_string; @@ -1917,7 +1945,7 @@ class SequenceWString eProsima_user_DllExport SequenceWString( const SequenceWString& x) { - m_var_sequence_wstring = x.m_var_sequence_wstring; + m_var_sequence_wstring = x.m_var_sequence_wstring; } @@ -1939,7 +1967,7 @@ class SequenceWString const SequenceWString& x) { - m_var_sequence_wstring = x.m_var_sequence_wstring; + m_var_sequence_wstring = x.m_var_sequence_wstring; return *this; } @@ -2014,6 +2042,8 @@ class SequenceWString return m_var_sequence_wstring; } + + private: std::vector m_var_sequence_wstring; @@ -2048,7 +2078,7 @@ class SequenceStringBounded eProsima_user_DllExport SequenceStringBounded( const SequenceStringBounded& x) { - m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; + m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; } @@ -2070,7 +2100,7 @@ class SequenceStringBounded const SequenceStringBounded& x) { - m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; + m_var_sequence_bounded_string = x.m_var_sequence_bounded_string; return *this; } @@ -2145,6 +2175,8 @@ class SequenceStringBounded return m_var_sequence_bounded_string; } + + private: std::vector m_var_sequence_bounded_string; @@ -2179,7 +2211,7 @@ class SequenceWStringBounded eProsima_user_DllExport SequenceWStringBounded( const SequenceWStringBounded& x) { - m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; + m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; } @@ -2201,7 +2233,7 @@ class SequenceWStringBounded const SequenceWStringBounded& x) { - m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; + m_var_sequence_bounded_wstring = x.m_var_sequence_bounded_wstring; return *this; } @@ -2276,6 +2308,8 @@ class SequenceWStringBounded return m_var_sequence_bounded_wstring; } + + private: std::vector m_var_sequence_bounded_wstring; @@ -2310,7 +2344,7 @@ class SequenceEnum eProsima_user_DllExport SequenceEnum( const SequenceEnum& x) { - m_var_sequence_enum = x.m_var_sequence_enum; + m_var_sequence_enum = x.m_var_sequence_enum; } @@ -2332,7 +2366,7 @@ class SequenceEnum const SequenceEnum& x) { - m_var_sequence_enum = x.m_var_sequence_enum; + m_var_sequence_enum = x.m_var_sequence_enum; return *this; } @@ -2407,6 +2441,8 @@ class SequenceEnum return m_var_sequence_enum; } + + private: std::vector m_var_sequence_enum; @@ -2441,7 +2477,7 @@ class SequenceBitMask eProsima_user_DllExport SequenceBitMask( const SequenceBitMask& x) { - m_var_sequence_bitmask = x.m_var_sequence_bitmask; + m_var_sequence_bitmask = x.m_var_sequence_bitmask; } @@ -2463,7 +2499,7 @@ class SequenceBitMask const SequenceBitMask& x) { - m_var_sequence_bitmask = x.m_var_sequence_bitmask; + m_var_sequence_bitmask = x.m_var_sequence_bitmask; return *this; } @@ -2538,6 +2574,8 @@ class SequenceBitMask return m_var_sequence_bitmask; } + + private: std::vector m_var_sequence_bitmask; @@ -2572,7 +2610,7 @@ class SequenceAlias eProsima_user_DllExport SequenceAlias( const SequenceAlias& x) { - m_var_sequence_alias = x.m_var_sequence_alias; + m_var_sequence_alias = x.m_var_sequence_alias; } @@ -2594,7 +2632,7 @@ class SequenceAlias const SequenceAlias& x) { - m_var_sequence_alias = x.m_var_sequence_alias; + m_var_sequence_alias = x.m_var_sequence_alias; return *this; } @@ -2669,6 +2707,8 @@ class SequenceAlias return m_var_sequence_alias; } + + private: std::vector m_var_sequence_alias; @@ -2703,7 +2743,7 @@ class SequenceShortArray eProsima_user_DllExport SequenceShortArray( const SequenceShortArray& x) { - m_var_sequence_short_array = x.m_var_sequence_short_array; + m_var_sequence_short_array = x.m_var_sequence_short_array; } @@ -2725,7 +2765,7 @@ class SequenceShortArray const SequenceShortArray& x) { - m_var_sequence_short_array = x.m_var_sequence_short_array; + m_var_sequence_short_array = x.m_var_sequence_short_array; return *this; } @@ -2800,6 +2840,8 @@ class SequenceShortArray return m_var_sequence_short_array; } + + private: std::vector m_var_sequence_short_array; @@ -2834,7 +2876,7 @@ class SequenceSequence eProsima_user_DllExport SequenceSequence( const SequenceSequence& x) { - m_var_sequence_sequence = x.m_var_sequence_sequence; + m_var_sequence_sequence = x.m_var_sequence_sequence; } @@ -2856,7 +2898,7 @@ class SequenceSequence const SequenceSequence& x) { - m_var_sequence_sequence = x.m_var_sequence_sequence; + m_var_sequence_sequence = x.m_var_sequence_sequence; return *this; } @@ -2931,6 +2973,8 @@ class SequenceSequence return m_var_sequence_sequence; } + + private: std::vector m_var_sequence_sequence; @@ -2965,7 +3009,7 @@ class SequenceMap eProsima_user_DllExport SequenceMap( const SequenceMap& x) { - m_var_sequence_map = x.m_var_sequence_map; + m_var_sequence_map = x.m_var_sequence_map; } @@ -2987,7 +3031,7 @@ class SequenceMap const SequenceMap& x) { - m_var_sequence_map = x.m_var_sequence_map; + m_var_sequence_map = x.m_var_sequence_map; return *this; } @@ -3062,6 +3106,8 @@ class SequenceMap return m_var_sequence_map; } + + private: std::vector m_var_sequence_map; @@ -3096,7 +3142,7 @@ class SequenceUnion eProsima_user_DllExport SequenceUnion( const SequenceUnion& x) { - m_var_sequence_union = x.m_var_sequence_union; + m_var_sequence_union = x.m_var_sequence_union; } @@ -3118,7 +3164,7 @@ class SequenceUnion const SequenceUnion& x) { - m_var_sequence_union = x.m_var_sequence_union; + m_var_sequence_union = x.m_var_sequence_union; return *this; } @@ -3193,6 +3239,8 @@ class SequenceUnion return m_var_sequence_union; } + + private: std::vector m_var_sequence_union; @@ -3227,7 +3275,7 @@ class SequenceStructure eProsima_user_DllExport SequenceStructure( const SequenceStructure& x) { - m_var_sequence_structure = x.m_var_sequence_structure; + m_var_sequence_structure = x.m_var_sequence_structure; } @@ -3249,7 +3297,7 @@ class SequenceStructure const SequenceStructure& x) { - m_var_sequence_structure = x.m_var_sequence_structure; + m_var_sequence_structure = x.m_var_sequence_structure; return *this; } @@ -3324,6 +3372,8 @@ class SequenceStructure return m_var_sequence_structure; } + + private: std::vector m_var_sequence_structure; @@ -3358,7 +3408,7 @@ class SequenceBitset eProsima_user_DllExport SequenceBitset( const SequenceBitset& x) { - m_var_sequence_bitset = x.m_var_sequence_bitset; + m_var_sequence_bitset = x.m_var_sequence_bitset; } @@ -3380,7 +3430,7 @@ class SequenceBitset const SequenceBitset& x) { - m_var_sequence_bitset = x.m_var_sequence_bitset; + m_var_sequence_bitset = x.m_var_sequence_bitset; return *this; } @@ -3455,6 +3505,8 @@ class SequenceBitset return m_var_sequence_bitset; } + + private: std::vector m_var_sequence_bitset; @@ -3489,9 +3541,9 @@ class BoundedSmallSequences eProsima_user_DllExport BoundedSmallSequences( const BoundedSmallSequences& x) { - m_var_sequence_small = x.m_var_sequence_small; + m_var_sequence_small = x.m_var_sequence_small; - m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; + m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; } @@ -3514,9 +3566,9 @@ class BoundedSmallSequences const BoundedSmallSequences& x) { - m_var_sequence_small = x.m_var_sequence_small; + m_var_sequence_small = x.m_var_sequence_small; - m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; + m_var_unbounded_string_small_bounded_sequence = x.m_var_unbounded_string_small_bounded_sequence; return *this; } @@ -3542,7 +3594,7 @@ class BoundedSmallSequences const BoundedSmallSequences& x) const { return (m_var_sequence_small == x.m_var_sequence_small && - m_var_unbounded_string_small_bounded_sequence == x.m_var_unbounded_string_small_bounded_sequence); + m_var_unbounded_string_small_bounded_sequence == x.m_var_unbounded_string_small_bounded_sequence); } /*! @@ -3593,6 +3645,7 @@ class BoundedSmallSequences return m_var_sequence_small; } + /*! * @brief This function copies the value in member var_unbounded_string_small_bounded_sequence * @param _var_unbounded_string_small_bounded_sequence New value to be copied in member var_unbounded_string_small_bounded_sequence @@ -3631,6 +3684,8 @@ class BoundedSmallSequences return m_var_unbounded_string_small_bounded_sequence; } + + private: std::vector m_var_sequence_small; @@ -3666,9 +3721,9 @@ class BoundedBigSequences eProsima_user_DllExport BoundedBigSequences( const BoundedBigSequences& x) { - m_var_sequence_big = x.m_var_sequence_big; + m_var_sequence_big = x.m_var_sequence_big; - m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; + m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; } @@ -3691,9 +3746,9 @@ class BoundedBigSequences const BoundedBigSequences& x) { - m_var_sequence_big = x.m_var_sequence_big; + m_var_sequence_big = x.m_var_sequence_big; - m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; + m_var_unbounded_string_large_bounded_sequence = x.m_var_unbounded_string_large_bounded_sequence; return *this; } @@ -3719,7 +3774,7 @@ class BoundedBigSequences const BoundedBigSequences& x) const { return (m_var_sequence_big == x.m_var_sequence_big && - m_var_unbounded_string_large_bounded_sequence == x.m_var_unbounded_string_large_bounded_sequence); + m_var_unbounded_string_large_bounded_sequence == x.m_var_unbounded_string_large_bounded_sequence); } /*! @@ -3770,6 +3825,7 @@ class BoundedBigSequences return m_var_sequence_big; } + /*! * @brief This function copies the value in member var_unbounded_string_large_bounded_sequence * @param _var_unbounded_string_large_bounded_sequence New value to be copied in member var_unbounded_string_large_bounded_sequence @@ -3808,6 +3864,8 @@ class BoundedBigSequences return m_var_unbounded_string_large_bounded_sequence; } + + private: std::vector m_var_sequence_big; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp index f6fff8a9..1ea3b4c1 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/strings.hpp @@ -80,7 +80,7 @@ class StringStruct eProsima_user_DllExport StringStruct( const StringStruct& x) { - m_var_string8 = x.m_var_string8; + m_var_string8 = x.m_var_string8; } @@ -102,7 +102,7 @@ class StringStruct const StringStruct& x) { - m_var_string8 = x.m_var_string8; + m_var_string8 = x.m_var_string8; return *this; } @@ -177,6 +177,8 @@ class StringStruct return m_var_string8; } + + private: std::string m_var_string8; @@ -211,7 +213,7 @@ class WStringStruct eProsima_user_DllExport WStringStruct( const WStringStruct& x) { - m_var_string16 = x.m_var_string16; + m_var_string16 = x.m_var_string16; } @@ -233,7 +235,7 @@ class WStringStruct const WStringStruct& x) { - m_var_string16 = x.m_var_string16; + m_var_string16 = x.m_var_string16; return *this; } @@ -308,6 +310,8 @@ class WStringStruct return m_var_string16; } + + private: std::wstring m_var_string16; @@ -342,7 +346,7 @@ class SmallStringStruct eProsima_user_DllExport SmallStringStruct( const SmallStringStruct& x) { - m_var_small_string = x.m_var_small_string; + m_var_small_string = x.m_var_small_string; } @@ -364,7 +368,7 @@ class SmallStringStruct const SmallStringStruct& x) { - m_var_small_string = x.m_var_small_string; + m_var_small_string = x.m_var_small_string; return *this; } @@ -439,6 +443,8 @@ class SmallStringStruct return m_var_small_string; } + + private: eprosima::fastcdr::fixed_string<1> m_var_small_string; @@ -473,7 +479,7 @@ class SmallWStringStruct eProsima_user_DllExport SmallWStringStruct( const SmallWStringStruct& x) { - m_var_small_wstring = x.m_var_small_wstring; + m_var_small_wstring = x.m_var_small_wstring; } @@ -495,7 +501,7 @@ class SmallWStringStruct const SmallWStringStruct& x) { - m_var_small_wstring = x.m_var_small_wstring; + m_var_small_wstring = x.m_var_small_wstring; return *this; } @@ -570,6 +576,8 @@ class SmallWStringStruct return m_var_small_wstring; } + + private: std::wstring m_var_small_wstring; @@ -604,7 +612,7 @@ class LargeStringStruct eProsima_user_DllExport LargeStringStruct( const LargeStringStruct& x) { - m_var_large_string = x.m_var_large_string; + m_var_large_string = x.m_var_large_string; } @@ -626,7 +634,7 @@ class LargeStringStruct const LargeStringStruct& x) { - m_var_large_string = x.m_var_large_string; + m_var_large_string = x.m_var_large_string; return *this; } @@ -701,6 +709,8 @@ class LargeStringStruct return m_var_large_string; } + + private: eprosima::fastcdr::fixed_string<41925> m_var_large_string; @@ -735,7 +745,7 @@ class LargeWStringStruct eProsima_user_DllExport LargeWStringStruct( const LargeWStringStruct& x) { - m_var_large_wstring = x.m_var_large_wstring; + m_var_large_wstring = x.m_var_large_wstring; } @@ -757,7 +767,7 @@ class LargeWStringStruct const LargeWStringStruct& x) { - m_var_large_wstring = x.m_var_large_wstring; + m_var_large_wstring = x.m_var_large_wstring; return *this; } @@ -832,6 +842,8 @@ class LargeWStringStruct return m_var_large_wstring; } + + private: std::wstring m_var_large_wstring; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp index a75a89d6..79d50901 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/structures.hpp @@ -85,7 +85,7 @@ class StructShort eProsima_user_DllExport StructShort( const StructShort& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; } @@ -107,7 +107,7 @@ class StructShort const StructShort& x) { - m_var_short = x.m_var_short; + m_var_short = x.m_var_short; return *this; } @@ -172,6 +172,8 @@ class StructShort return m_var_short; } + + private: int16_t m_var_short{0}; @@ -206,7 +208,7 @@ class StructUnsignedShort eProsima_user_DllExport StructUnsignedShort( const StructUnsignedShort& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; } @@ -228,7 +230,7 @@ class StructUnsignedShort const StructUnsignedShort& x) { - m_var_ushort = x.m_var_ushort; + m_var_ushort = x.m_var_ushort; return *this; } @@ -293,6 +295,8 @@ class StructUnsignedShort return m_var_ushort; } + + private: uint16_t m_var_ushort{0}; @@ -327,7 +331,7 @@ class StructLong eProsima_user_DllExport StructLong( const StructLong& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; } @@ -349,7 +353,7 @@ class StructLong const StructLong& x) { - m_var_long = x.m_var_long; + m_var_long = x.m_var_long; return *this; } @@ -414,6 +418,8 @@ class StructLong return m_var_long; } + + private: int32_t m_var_long{0}; @@ -448,7 +454,7 @@ class StructUnsignedLong eProsima_user_DllExport StructUnsignedLong( const StructUnsignedLong& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; } @@ -470,7 +476,7 @@ class StructUnsignedLong const StructUnsignedLong& x) { - m_var_ulong = x.m_var_ulong; + m_var_ulong = x.m_var_ulong; return *this; } @@ -535,6 +541,8 @@ class StructUnsignedLong return m_var_ulong; } + + private: uint32_t m_var_ulong{0}; @@ -569,7 +577,7 @@ class StructLongLong eProsima_user_DllExport StructLongLong( const StructLongLong& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; } @@ -591,7 +599,7 @@ class StructLongLong const StructLongLong& x) { - m_var_longlong = x.m_var_longlong; + m_var_longlong = x.m_var_longlong; return *this; } @@ -656,6 +664,8 @@ class StructLongLong return m_var_longlong; } + + private: int64_t m_var_longlong{0}; @@ -690,7 +700,7 @@ class StructUnsignedLongLong eProsima_user_DllExport StructUnsignedLongLong( const StructUnsignedLongLong& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; } @@ -712,7 +722,7 @@ class StructUnsignedLongLong const StructUnsignedLongLong& x) { - m_var_ulonglong = x.m_var_ulonglong; + m_var_ulonglong = x.m_var_ulonglong; return *this; } @@ -777,6 +787,8 @@ class StructUnsignedLongLong return m_var_ulonglong; } + + private: uint64_t m_var_ulonglong{0}; @@ -811,7 +823,7 @@ class StructFloat eProsima_user_DllExport StructFloat( const StructFloat& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; } @@ -833,7 +845,7 @@ class StructFloat const StructFloat& x) { - m_var_float = x.m_var_float; + m_var_float = x.m_var_float; return *this; } @@ -898,6 +910,8 @@ class StructFloat return m_var_float; } + + private: float m_var_float{0.0}; @@ -932,7 +946,7 @@ class StructDouble eProsima_user_DllExport StructDouble( const StructDouble& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; } @@ -954,7 +968,7 @@ class StructDouble const StructDouble& x) { - m_var_double = x.m_var_double; + m_var_double = x.m_var_double; return *this; } @@ -1019,6 +1033,8 @@ class StructDouble return m_var_double; } + + private: double m_var_double{0.0}; @@ -1053,7 +1069,7 @@ class StructLongDouble eProsima_user_DllExport StructLongDouble( const StructLongDouble& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; } @@ -1075,7 +1091,7 @@ class StructLongDouble const StructLongDouble& x) { - m_var_longdouble = x.m_var_longdouble; + m_var_longdouble = x.m_var_longdouble; return *this; } @@ -1140,6 +1156,8 @@ class StructLongDouble return m_var_longdouble; } + + private: long double m_var_longdouble{0.0}; @@ -1174,7 +1192,7 @@ class StructBoolean eProsima_user_DllExport StructBoolean( const StructBoolean& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; } @@ -1196,7 +1214,7 @@ class StructBoolean const StructBoolean& x) { - m_var_boolean = x.m_var_boolean; + m_var_boolean = x.m_var_boolean; return *this; } @@ -1261,6 +1279,8 @@ class StructBoolean return m_var_boolean; } + + private: bool m_var_boolean{false}; @@ -1295,7 +1315,7 @@ class StructOctet eProsima_user_DllExport StructOctet( const StructOctet& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; } @@ -1317,7 +1337,7 @@ class StructOctet const StructOctet& x) { - m_var_octet = x.m_var_octet; + m_var_octet = x.m_var_octet; return *this; } @@ -1382,6 +1402,8 @@ class StructOctet return m_var_octet; } + + private: uint8_t m_var_octet{0}; @@ -1416,7 +1438,7 @@ class StructChar8 eProsima_user_DllExport StructChar8( const StructChar8& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; } @@ -1438,7 +1460,7 @@ class StructChar8 const StructChar8& x) { - m_var_char8 = x.m_var_char8; + m_var_char8 = x.m_var_char8; return *this; } @@ -1503,6 +1525,8 @@ class StructChar8 return m_var_char8; } + + private: char m_var_char8{0}; @@ -1537,7 +1561,7 @@ class StructChar16 eProsima_user_DllExport StructChar16( const StructChar16& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; } @@ -1559,7 +1583,7 @@ class StructChar16 const StructChar16& x) { - m_var_char16 = x.m_var_char16; + m_var_char16 = x.m_var_char16; return *this; } @@ -1624,6 +1648,8 @@ class StructChar16 return m_var_char16; } + + private: wchar_t m_var_char16{0}; @@ -1658,7 +1684,7 @@ class StructString eProsima_user_DllExport StructString( const StructString& x) { - m_var_string = x.m_var_string; + m_var_string = x.m_var_string; } @@ -1680,7 +1706,7 @@ class StructString const StructString& x) { - m_var_string = x.m_var_string; + m_var_string = x.m_var_string; return *this; } @@ -1755,6 +1781,8 @@ class StructString return m_var_string; } + + private: std::string m_var_string; @@ -1789,7 +1817,7 @@ class StructWString eProsima_user_DllExport StructWString( const StructWString& x) { - m_var_wstring = x.m_var_wstring; + m_var_wstring = x.m_var_wstring; } @@ -1811,7 +1839,7 @@ class StructWString const StructWString& x) { - m_var_wstring = x.m_var_wstring; + m_var_wstring = x.m_var_wstring; return *this; } @@ -1886,6 +1914,8 @@ class StructWString return m_var_wstring; } + + private: std::wstring m_var_wstring; @@ -1920,7 +1950,7 @@ class StructBoundedString eProsima_user_DllExport StructBoundedString( const StructBoundedString& x) { - m_var_bounded_string = x.m_var_bounded_string; + m_var_bounded_string = x.m_var_bounded_string; } @@ -1942,7 +1972,7 @@ class StructBoundedString const StructBoundedString& x) { - m_var_bounded_string = x.m_var_bounded_string; + m_var_bounded_string = x.m_var_bounded_string; return *this; } @@ -2017,6 +2047,8 @@ class StructBoundedString return m_var_bounded_string; } + + private: Inner_alias_bounded_string_helper m_var_bounded_string; @@ -2051,7 +2083,7 @@ class StructBoundedWString eProsima_user_DllExport StructBoundedWString( const StructBoundedWString& x) { - m_var_bounded_wstring = x.m_var_bounded_wstring; + m_var_bounded_wstring = x.m_var_bounded_wstring; } @@ -2073,7 +2105,7 @@ class StructBoundedWString const StructBoundedWString& x) { - m_var_bounded_wstring = x.m_var_bounded_wstring; + m_var_bounded_wstring = x.m_var_bounded_wstring; return *this; } @@ -2148,6 +2180,8 @@ class StructBoundedWString return m_var_bounded_wstring; } + + private: Inner_alias_bounded_wstring_helper m_var_bounded_wstring; @@ -2182,7 +2216,7 @@ class StructEnum eProsima_user_DllExport StructEnum( const StructEnum& x) { - m_var_enum = x.m_var_enum; + m_var_enum = x.m_var_enum; } @@ -2204,7 +2238,7 @@ class StructEnum const StructEnum& x) { - m_var_enum = x.m_var_enum; + m_var_enum = x.m_var_enum; return *this; } @@ -2269,6 +2303,8 @@ class StructEnum return m_var_enum; } + + private: InnerEnumHelper m_var_enum{InnerEnumHelper::ENUM_VALUE_1}; @@ -2303,7 +2339,7 @@ class StructBitMask eProsima_user_DllExport StructBitMask( const StructBitMask& x) { - m_var_bitmask = x.m_var_bitmask; + m_var_bitmask = x.m_var_bitmask; } @@ -2325,7 +2361,7 @@ class StructBitMask const StructBitMask& x) { - m_var_bitmask = x.m_var_bitmask; + m_var_bitmask = x.m_var_bitmask; return *this; } @@ -2400,6 +2436,8 @@ class StructBitMask return m_var_bitmask; } + + private: InnerBitMaskHelper m_var_bitmask{0}; @@ -2434,7 +2472,7 @@ class StructAlias eProsima_user_DllExport StructAlias( const StructAlias& x) { - m_var_alias = x.m_var_alias; + m_var_alias = x.m_var_alias; } @@ -2456,7 +2494,7 @@ class StructAlias const StructAlias& x) { - m_var_alias = x.m_var_alias; + m_var_alias = x.m_var_alias; return *this; } @@ -2521,6 +2559,8 @@ class StructAlias return m_var_alias; } + + private: InnerAliasHelper m_var_alias{0}; @@ -2555,7 +2595,7 @@ class StructShortArray eProsima_user_DllExport StructShortArray( const StructShortArray& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; } @@ -2577,7 +2617,7 @@ class StructShortArray const StructShortArray& x) { - m_var_array_short = x.m_var_array_short; + m_var_array_short = x.m_var_array_short; return *this; } @@ -2652,6 +2692,8 @@ class StructShortArray return m_var_array_short; } + + private: std::array m_var_array_short{0}; @@ -2686,7 +2728,7 @@ class StructSequence eProsima_user_DllExport StructSequence( const StructSequence& x) { - m_var_sequence = x.m_var_sequence; + m_var_sequence = x.m_var_sequence; } @@ -2708,7 +2750,7 @@ class StructSequence const StructSequence& x) { - m_var_sequence = x.m_var_sequence; + m_var_sequence = x.m_var_sequence; return *this; } @@ -2783,6 +2825,8 @@ class StructSequence return m_var_sequence; } + + private: std::vector m_var_sequence; @@ -2817,7 +2861,7 @@ class StructMap eProsima_user_DllExport StructMap( const StructMap& x) { - m_var_map = x.m_var_map; + m_var_map = x.m_var_map; } @@ -2839,7 +2883,7 @@ class StructMap const StructMap& x) { - m_var_map = x.m_var_map; + m_var_map = x.m_var_map; return *this; } @@ -2914,6 +2958,8 @@ class StructMap return m_var_map; } + + private: std::map m_var_map; @@ -2948,7 +2994,7 @@ class StructUnion eProsima_user_DllExport StructUnion( const StructUnion& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; } @@ -2970,7 +3016,7 @@ class StructUnion const StructUnion& x) { - m_var_union = x.m_var_union; + m_var_union = x.m_var_union; return *this; } @@ -3045,6 +3091,8 @@ class StructUnion return m_var_union; } + + private: InnerUnionHelper m_var_union; @@ -3079,7 +3127,7 @@ class StructStructure eProsima_user_DllExport StructStructure( const StructStructure& x) { - m_var_structure = x.m_var_structure; + m_var_structure = x.m_var_structure; } @@ -3101,7 +3149,7 @@ class StructStructure const StructStructure& x) { - m_var_structure = x.m_var_structure; + m_var_structure = x.m_var_structure; return *this; } @@ -3176,6 +3224,8 @@ class StructStructure return m_var_structure; } + + private: InnerStructureHelper m_var_structure; @@ -3210,7 +3260,7 @@ class StructBitset eProsima_user_DllExport StructBitset( const StructBitset& x) { - m_var_bitset = x.m_var_bitset; + m_var_bitset = x.m_var_bitset; } @@ -3232,7 +3282,7 @@ class StructBitset const StructBitset& x) { - m_var_bitset = x.m_var_bitset; + m_var_bitset = x.m_var_bitset; return *this; } @@ -3307,6 +3357,8 @@ class StructBitset return m_var_bitset; } + + private: InnerBitsetHelper m_var_bitset{}; @@ -3401,6 +3453,8 @@ class StructEmpty return !(*this == x); } + + private: @@ -3434,59 +3488,59 @@ class Structures eProsima_user_DllExport Structures( const Structures& x) { - m_var_StructShort = x.m_var_StructShort; + m_var_StructShort = x.m_var_StructShort; - m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; + m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; - m_var_StructLong = x.m_var_StructLong; + m_var_StructLong = x.m_var_StructLong; - m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; + m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; - m_var_StructLongLong = x.m_var_StructLongLong; + m_var_StructLongLong = x.m_var_StructLongLong; - m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; + m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; - m_var_StructFloat = x.m_var_StructFloat; + m_var_StructFloat = x.m_var_StructFloat; - m_var_StructDouble = x.m_var_StructDouble; + m_var_StructDouble = x.m_var_StructDouble; - m_var_StructLongDouble = x.m_var_StructLongDouble; + m_var_StructLongDouble = x.m_var_StructLongDouble; - m_var_StructBoolean = x.m_var_StructBoolean; + m_var_StructBoolean = x.m_var_StructBoolean; - m_var_StructOctet = x.m_var_StructOctet; + m_var_StructOctet = x.m_var_StructOctet; - m_var_StructChar8 = x.m_var_StructChar8; + m_var_StructChar8 = x.m_var_StructChar8; - m_var_StructChar16 = x.m_var_StructChar16; + m_var_StructChar16 = x.m_var_StructChar16; - m_var_StructString = x.m_var_StructString; + m_var_StructString = x.m_var_StructString; - m_var_StructWString = x.m_var_StructWString; + m_var_StructWString = x.m_var_StructWString; - m_var_StructBoundedString = x.m_var_StructBoundedString; + m_var_StructBoundedString = x.m_var_StructBoundedString; - m_var_StructBoundedWString = x.m_var_StructBoundedWString; + m_var_StructBoundedWString = x.m_var_StructBoundedWString; - m_var_StructEnum = x.m_var_StructEnum; + m_var_StructEnum = x.m_var_StructEnum; - m_var_StructBitMask = x.m_var_StructBitMask; + m_var_StructBitMask = x.m_var_StructBitMask; - m_var_StructAlias = x.m_var_StructAlias; + m_var_StructAlias = x.m_var_StructAlias; - m_var_StructShortArray = x.m_var_StructShortArray; + m_var_StructShortArray = x.m_var_StructShortArray; - m_var_StructSequence = x.m_var_StructSequence; + m_var_StructSequence = x.m_var_StructSequence; - m_var_StructMap = x.m_var_StructMap; + m_var_StructMap = x.m_var_StructMap; - m_var_StructUnion = x.m_var_StructUnion; + m_var_StructUnion = x.m_var_StructUnion; - m_var_StructStructure = x.m_var_StructStructure; + m_var_StructStructure = x.m_var_StructStructure; - m_var_StructBitset = x.m_var_StructBitset; + m_var_StructBitset = x.m_var_StructBitset; - m_var_StructEmpty = x.m_var_StructEmpty; + m_var_StructEmpty = x.m_var_StructEmpty; } @@ -3534,59 +3588,59 @@ class Structures const Structures& x) { - m_var_StructShort = x.m_var_StructShort; + m_var_StructShort = x.m_var_StructShort; - m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; + m_var_StructUnsignedShort = x.m_var_StructUnsignedShort; - m_var_StructLong = x.m_var_StructLong; + m_var_StructLong = x.m_var_StructLong; - m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; + m_var_StructUnsignedLong = x.m_var_StructUnsignedLong; - m_var_StructLongLong = x.m_var_StructLongLong; + m_var_StructLongLong = x.m_var_StructLongLong; - m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; + m_var_StructUnsignedLongLong = x.m_var_StructUnsignedLongLong; - m_var_StructFloat = x.m_var_StructFloat; + m_var_StructFloat = x.m_var_StructFloat; - m_var_StructDouble = x.m_var_StructDouble; + m_var_StructDouble = x.m_var_StructDouble; - m_var_StructLongDouble = x.m_var_StructLongDouble; + m_var_StructLongDouble = x.m_var_StructLongDouble; - m_var_StructBoolean = x.m_var_StructBoolean; + m_var_StructBoolean = x.m_var_StructBoolean; - m_var_StructOctet = x.m_var_StructOctet; + m_var_StructOctet = x.m_var_StructOctet; - m_var_StructChar8 = x.m_var_StructChar8; + m_var_StructChar8 = x.m_var_StructChar8; - m_var_StructChar16 = x.m_var_StructChar16; + m_var_StructChar16 = x.m_var_StructChar16; - m_var_StructString = x.m_var_StructString; + m_var_StructString = x.m_var_StructString; - m_var_StructWString = x.m_var_StructWString; + m_var_StructWString = x.m_var_StructWString; - m_var_StructBoundedString = x.m_var_StructBoundedString; + m_var_StructBoundedString = x.m_var_StructBoundedString; - m_var_StructBoundedWString = x.m_var_StructBoundedWString; + m_var_StructBoundedWString = x.m_var_StructBoundedWString; - m_var_StructEnum = x.m_var_StructEnum; + m_var_StructEnum = x.m_var_StructEnum; - m_var_StructBitMask = x.m_var_StructBitMask; + m_var_StructBitMask = x.m_var_StructBitMask; - m_var_StructAlias = x.m_var_StructAlias; + m_var_StructAlias = x.m_var_StructAlias; - m_var_StructShortArray = x.m_var_StructShortArray; + m_var_StructShortArray = x.m_var_StructShortArray; - m_var_StructSequence = x.m_var_StructSequence; + m_var_StructSequence = x.m_var_StructSequence; - m_var_StructMap = x.m_var_StructMap; + m_var_StructMap = x.m_var_StructMap; - m_var_StructUnion = x.m_var_StructUnion; + m_var_StructUnion = x.m_var_StructUnion; - m_var_StructStructure = x.m_var_StructStructure; + m_var_StructStructure = x.m_var_StructStructure; - m_var_StructBitset = x.m_var_StructBitset; + m_var_StructBitset = x.m_var_StructBitset; - m_var_StructEmpty = x.m_var_StructEmpty; + m_var_StructEmpty = x.m_var_StructEmpty; return *this; } @@ -3637,32 +3691,32 @@ class Structures const Structures& x) const { return (m_var_StructShort == x.m_var_StructShort && - m_var_StructUnsignedShort == x.m_var_StructUnsignedShort && - m_var_StructLong == x.m_var_StructLong && - m_var_StructUnsignedLong == x.m_var_StructUnsignedLong && - m_var_StructLongLong == x.m_var_StructLongLong && - m_var_StructUnsignedLongLong == x.m_var_StructUnsignedLongLong && - m_var_StructFloat == x.m_var_StructFloat && - m_var_StructDouble == x.m_var_StructDouble && - m_var_StructLongDouble == x.m_var_StructLongDouble && - m_var_StructBoolean == x.m_var_StructBoolean && - m_var_StructOctet == x.m_var_StructOctet && - m_var_StructChar8 == x.m_var_StructChar8 && - m_var_StructChar16 == x.m_var_StructChar16 && - m_var_StructString == x.m_var_StructString && - m_var_StructWString == x.m_var_StructWString && - m_var_StructBoundedString == x.m_var_StructBoundedString && - m_var_StructBoundedWString == x.m_var_StructBoundedWString && - m_var_StructEnum == x.m_var_StructEnum && - m_var_StructBitMask == x.m_var_StructBitMask && - m_var_StructAlias == x.m_var_StructAlias && - m_var_StructShortArray == x.m_var_StructShortArray && - m_var_StructSequence == x.m_var_StructSequence && - m_var_StructMap == x.m_var_StructMap && - m_var_StructUnion == x.m_var_StructUnion && - m_var_StructStructure == x.m_var_StructStructure && - m_var_StructBitset == x.m_var_StructBitset && - m_var_StructEmpty == x.m_var_StructEmpty); + m_var_StructUnsignedShort == x.m_var_StructUnsignedShort && + m_var_StructLong == x.m_var_StructLong && + m_var_StructUnsignedLong == x.m_var_StructUnsignedLong && + m_var_StructLongLong == x.m_var_StructLongLong && + m_var_StructUnsignedLongLong == x.m_var_StructUnsignedLongLong && + m_var_StructFloat == x.m_var_StructFloat && + m_var_StructDouble == x.m_var_StructDouble && + m_var_StructLongDouble == x.m_var_StructLongDouble && + m_var_StructBoolean == x.m_var_StructBoolean && + m_var_StructOctet == x.m_var_StructOctet && + m_var_StructChar8 == x.m_var_StructChar8 && + m_var_StructChar16 == x.m_var_StructChar16 && + m_var_StructString == x.m_var_StructString && + m_var_StructWString == x.m_var_StructWString && + m_var_StructBoundedString == x.m_var_StructBoundedString && + m_var_StructBoundedWString == x.m_var_StructBoundedWString && + m_var_StructEnum == x.m_var_StructEnum && + m_var_StructBitMask == x.m_var_StructBitMask && + m_var_StructAlias == x.m_var_StructAlias && + m_var_StructShortArray == x.m_var_StructShortArray && + m_var_StructSequence == x.m_var_StructSequence && + m_var_StructMap == x.m_var_StructMap && + m_var_StructUnion == x.m_var_StructUnion && + m_var_StructStructure == x.m_var_StructStructure && + m_var_StructBitset == x.m_var_StructBitset && + m_var_StructEmpty == x.m_var_StructEmpty); } /*! @@ -3713,6 +3767,7 @@ class Structures return m_var_StructShort; } + /*! * @brief This function copies the value in member var_StructUnsignedShort * @param _var_StructUnsignedShort New value to be copied in member var_StructUnsignedShort @@ -3751,6 +3806,7 @@ class Structures return m_var_StructUnsignedShort; } + /*! * @brief This function copies the value in member var_StructLong * @param _var_StructLong New value to be copied in member var_StructLong @@ -3789,6 +3845,7 @@ class Structures return m_var_StructLong; } + /*! * @brief This function copies the value in member var_StructUnsignedLong * @param _var_StructUnsignedLong New value to be copied in member var_StructUnsignedLong @@ -3827,6 +3884,7 @@ class Structures return m_var_StructUnsignedLong; } + /*! * @brief This function copies the value in member var_StructLongLong * @param _var_StructLongLong New value to be copied in member var_StructLongLong @@ -3865,6 +3923,7 @@ class Structures return m_var_StructLongLong; } + /*! * @brief This function copies the value in member var_StructUnsignedLongLong * @param _var_StructUnsignedLongLong New value to be copied in member var_StructUnsignedLongLong @@ -3903,6 +3962,7 @@ class Structures return m_var_StructUnsignedLongLong; } + /*! * @brief This function copies the value in member var_StructFloat * @param _var_StructFloat New value to be copied in member var_StructFloat @@ -3941,6 +4001,7 @@ class Structures return m_var_StructFloat; } + /*! * @brief This function copies the value in member var_StructDouble * @param _var_StructDouble New value to be copied in member var_StructDouble @@ -3979,6 +4040,7 @@ class Structures return m_var_StructDouble; } + /*! * @brief This function copies the value in member var_StructLongDouble * @param _var_StructLongDouble New value to be copied in member var_StructLongDouble @@ -4017,6 +4079,7 @@ class Structures return m_var_StructLongDouble; } + /*! * @brief This function copies the value in member var_StructBoolean * @param _var_StructBoolean New value to be copied in member var_StructBoolean @@ -4055,6 +4118,7 @@ class Structures return m_var_StructBoolean; } + /*! * @brief This function copies the value in member var_StructOctet * @param _var_StructOctet New value to be copied in member var_StructOctet @@ -4093,6 +4157,7 @@ class Structures return m_var_StructOctet; } + /*! * @brief This function copies the value in member var_StructChar8 * @param _var_StructChar8 New value to be copied in member var_StructChar8 @@ -4131,6 +4196,7 @@ class Structures return m_var_StructChar8; } + /*! * @brief This function copies the value in member var_StructChar16 * @param _var_StructChar16 New value to be copied in member var_StructChar16 @@ -4169,6 +4235,7 @@ class Structures return m_var_StructChar16; } + /*! * @brief This function copies the value in member var_StructString * @param _var_StructString New value to be copied in member var_StructString @@ -4207,6 +4274,7 @@ class Structures return m_var_StructString; } + /*! * @brief This function copies the value in member var_StructWString * @param _var_StructWString New value to be copied in member var_StructWString @@ -4245,6 +4313,7 @@ class Structures return m_var_StructWString; } + /*! * @brief This function copies the value in member var_StructBoundedString * @param _var_StructBoundedString New value to be copied in member var_StructBoundedString @@ -4283,6 +4352,7 @@ class Structures return m_var_StructBoundedString; } + /*! * @brief This function copies the value in member var_StructBoundedWString * @param _var_StructBoundedWString New value to be copied in member var_StructBoundedWString @@ -4321,6 +4391,7 @@ class Structures return m_var_StructBoundedWString; } + /*! * @brief This function copies the value in member var_StructEnum * @param _var_StructEnum New value to be copied in member var_StructEnum @@ -4359,6 +4430,7 @@ class Structures return m_var_StructEnum; } + /*! * @brief This function copies the value in member var_StructBitMask * @param _var_StructBitMask New value to be copied in member var_StructBitMask @@ -4397,6 +4469,7 @@ class Structures return m_var_StructBitMask; } + /*! * @brief This function copies the value in member var_StructAlias * @param _var_StructAlias New value to be copied in member var_StructAlias @@ -4435,6 +4508,7 @@ class Structures return m_var_StructAlias; } + /*! * @brief This function copies the value in member var_StructShortArray * @param _var_StructShortArray New value to be copied in member var_StructShortArray @@ -4473,6 +4547,7 @@ class Structures return m_var_StructShortArray; } + /*! * @brief This function copies the value in member var_StructSequence * @param _var_StructSequence New value to be copied in member var_StructSequence @@ -4511,6 +4586,7 @@ class Structures return m_var_StructSequence; } + /*! * @brief This function copies the value in member var_StructMap * @param _var_StructMap New value to be copied in member var_StructMap @@ -4549,6 +4625,7 @@ class Structures return m_var_StructMap; } + /*! * @brief This function copies the value in member var_StructUnion * @param _var_StructUnion New value to be copied in member var_StructUnion @@ -4587,6 +4664,7 @@ class Structures return m_var_StructUnion; } + /*! * @brief This function copies the value in member var_StructStructure * @param _var_StructStructure New value to be copied in member var_StructStructure @@ -4625,6 +4703,7 @@ class Structures return m_var_StructStructure; } + /*! * @brief This function copies the value in member var_StructBitset * @param _var_StructBitset New value to be copied in member var_StructBitset @@ -4663,6 +4742,7 @@ class Structures return m_var_StructBitset; } + /*! * @brief This function copies the value in member var_StructEmpty * @param _var_StructEmpty New value to be copied in member var_StructEmpty @@ -4701,6 +4781,8 @@ class Structures return m_var_StructEmpty; } + + private: StructShort m_var_StructShort; @@ -4763,9 +4845,9 @@ class foo eProsima_user_DllExport foo( const foo& x) { - m_a = x.m_a; + m_a = x.m_a; - m_b = x.m_b; + m_b = x.m_b; } @@ -4788,9 +4870,9 @@ class foo const foo& x) { - m_a = x.m_a; + m_a = x.m_a; - m_b = x.m_b; + m_b = x.m_b; return *this; } @@ -4816,7 +4898,7 @@ class foo const foo& x) const { return (m_a == x.m_a && - m_b == x.m_b); + m_b == x.m_b); } /*! @@ -4857,6 +4939,7 @@ class foo return m_a; } + /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -4885,6 +4968,8 @@ class foo return m_b; } + + private: int32_t m_a{0}; @@ -4924,7 +5009,7 @@ class foo eProsima_user_DllExport foo( const foo& x) { - m_d = x.m_d; + m_d = x.m_d; } @@ -4946,7 +5031,7 @@ class foo const foo& x) { - m_d = x.m_d; + m_d = x.m_d; return *this; } @@ -5011,6 +5096,8 @@ class foo return m_d; } + + private: bool m_d{false}; @@ -5047,7 +5134,7 @@ class bar eProsima_user_DllExport bar( const bar& x) { - m_e = x.m_e; + m_e = x.m_e; } @@ -5069,7 +5156,7 @@ class bar const bar& x) { - m_e = x.m_e; + m_e = x.m_e; return *this; } @@ -5134,6 +5221,8 @@ class bar return m_e; } + + private: double m_e{0.0}; @@ -5168,9 +5257,9 @@ class root1 eProsima_user_DllExport root1( const root1& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_c = x.m_c; + m_c = x.m_c; } @@ -5193,9 +5282,9 @@ class root1 const root1& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_c = x.m_c; + m_c = x.m_c; return *this; } @@ -5221,7 +5310,7 @@ class root1 const root1& x) const { return (m_foo_struct == x.m_foo_struct && - m_c == x.m_c); + m_c == x.m_c); } /*! @@ -5272,6 +5361,7 @@ class root1 return m_foo_struct; } + /*! * @brief This function sets a value in member c * @param _c New value for member c @@ -5300,6 +5390,8 @@ class root1 return m_c; } + + private: testing_1::foo m_foo_struct; @@ -5335,9 +5427,9 @@ class root2 eProsima_user_DllExport root2( const root2& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_bar_struct = x.m_bar_struct; + m_bar_struct = x.m_bar_struct; } @@ -5360,9 +5452,9 @@ class root2 const root2& x) { - m_foo_struct = x.m_foo_struct; + m_foo_struct = x.m_foo_struct; - m_bar_struct = x.m_bar_struct; + m_bar_struct = x.m_bar_struct; return *this; } @@ -5388,7 +5480,7 @@ class root2 const root2& x) const { return (m_foo_struct == x.m_foo_struct && - m_bar_struct == x.m_bar_struct); + m_bar_struct == x.m_bar_struct); } /*! @@ -5439,6 +5531,7 @@ class root2 return m_foo_struct; } + /*! * @brief This function copies the value in member bar_struct * @param _bar_struct New value to be copied in member bar_struct @@ -5477,6 +5570,8 @@ class root2 return m_bar_struct; } + + private: testing_2::foo m_foo_struct; @@ -5512,9 +5607,9 @@ class root eProsima_user_DllExport root( const root& x) { - m_var_root1 = x.m_var_root1; + m_var_root1 = x.m_var_root1; - m_var_root2 = x.m_var_root2; + m_var_root2 = x.m_var_root2; } @@ -5537,9 +5632,9 @@ class root const root& x) { - m_var_root1 = x.m_var_root1; + m_var_root1 = x.m_var_root1; - m_var_root2 = x.m_var_root2; + m_var_root2 = x.m_var_root2; return *this; } @@ -5565,7 +5660,7 @@ class root const root& x) const { return (m_var_root1 == x.m_var_root1 && - m_var_root2 == x.m_var_root2); + m_var_root2 == x.m_var_root2); } /*! @@ -5616,6 +5711,7 @@ class root return m_var_root1; } + /*! * @brief This function copies the value in member var_root2 * @param _var_root2 New value to be copied in member var_root2 @@ -5654,6 +5750,8 @@ class root return m_var_root2; } + + private: root1 m_var_root1; diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp index ee19e49b..a68af1f1 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/structuresPubSubTypes.hpp @@ -2306,171 +2306,173 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType unsigned char* key_buffer_; }; -namespace testing_1 { - -/*! - * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. - * @ingroup structures - */ -class fooPubSubType : public eprosima::fastdds::dds::TopicDataType +namespace testing_1 { -public: - typedef foo type; + /*! + * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. + * @ingroup structures + */ + class fooPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - eProsima_user_DllExport fooPubSubType(); + typedef foo type; - eProsima_user_DllExport ~fooPubSubType() override; + eProsima_user_DllExport fooPubSubType(); - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void* create_data() override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + eProsima_user_DllExport void delete_data( + void* data) override; + + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace testing_1 -namespace testing_2 { - -/*! - * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. - * @ingroup structures - */ -class fooPubSubType : public eprosima::fastdds::dds::TopicDataType +namespace testing_2 { -public: - typedef foo type; + /*! + * @brief This class represents the TopicDataType of the type foo defined by the user in the IDL file. + * @ingroup structures + */ + class fooPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - eProsima_user_DllExport fooPubSubType(); + typedef foo type; - eProsima_user_DllExport ~fooPubSubType() override; + eProsima_user_DllExport fooPubSubType(); - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport ~fooPubSubType() override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void* create_data() override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + eProsima_user_DllExport void delete_data( + void* data) override; + + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return true; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return true; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; } // namespace testing_2 /*! diff --git a/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp b/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp index c44e81f3..c67d1e83 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp +++ b/ddsenabler/test/ddsEnablerTypedTests/types/unions.hpp @@ -95,9 +95,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; } } @@ -113,9 +113,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; } } @@ -131,9 +131,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; } @@ -151,9 +151,9 @@ class Union_Short switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; } @@ -174,9 +174,9 @@ class Union_Short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; } } @@ -206,19 +206,18 @@ class Union_Short switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -274,6 +273,7 @@ class Union_Short return m_a; } + void _default() { if (member_destructor_) @@ -284,25 +284,27 @@ class Union_Short selected_member_ = 0x0FFFFFFFu; } + private: - int16_t& a_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int16_t& a_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - } + } + + return m_a; + } - return m_a; - } int32_t m__d {2147483647}; @@ -352,9 +354,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = x.m_b; - break; + case 0x00000001: + b_() = x.m_b; + break; } } @@ -370,9 +372,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = std::move(x.m_b); - break; + case 0x00000001: + b_() = std::move(x.m_b); + break; } } @@ -388,9 +390,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = x.m_b; - break; + case 0x00000001: + b_() = x.m_b; + break; } @@ -408,9 +410,9 @@ class Union_UShort switch (x.selected_member_) { - case 0x00000001: - b_() = std::move(x.m_b); - break; + case 0x00000001: + b_() = std::move(x.m_b); + break; } @@ -431,9 +433,9 @@ class Union_UShort { switch (selected_member_) { - case 0x00000001: - ret_value = (m_b == x.m_b); - break; + case 0x00000001: + ret_value = (m_b == x.m_b); + break; } } @@ -463,19 +465,18 @@ class Union_UShort switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -531,6 +532,7 @@ class Union_UShort return m_b; } + void _default() { if (member_destructor_) @@ -541,25 +543,27 @@ class Union_UShort selected_member_ = 0x0FFFFFFFu; } + private: - uint16_t& b_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint16_t& b_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_b = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_b = {0}; - } + } + + return m_b; + } - return m_b; - } int32_t m__d {2147483647}; @@ -609,9 +613,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = x.m_c; - break; + case 0x00000001: + c_() = x.m_c; + break; } } @@ -627,9 +631,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = std::move(x.m_c); - break; + case 0x00000001: + c_() = std::move(x.m_c); + break; } } @@ -645,9 +649,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = x.m_c; - break; + case 0x00000001: + c_() = x.m_c; + break; } @@ -665,9 +669,9 @@ class Union_Long switch (x.selected_member_) { - case 0x00000001: - c_() = std::move(x.m_c); - break; + case 0x00000001: + c_() = std::move(x.m_c); + break; } @@ -688,9 +692,9 @@ class Union_Long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_c == x.m_c); - break; + case 0x00000001: + ret_value = (m_c == x.m_c); + break; } } @@ -720,19 +724,18 @@ class Union_Long switch (__d) { - case 2: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -788,6 +791,7 @@ class Union_Long return m_c; } + void _default() { if (member_destructor_) @@ -798,25 +802,27 @@ class Union_Long selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& c_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& c_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_c = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_c = {0}; - } + } + + return m_c; + } - return m_c; - } int32_t m__d {2147483647}; @@ -866,9 +872,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = x.m_d; - break; + case 0x00000001: + d_() = x.m_d; + break; } } @@ -884,9 +890,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = std::move(x.m_d); - break; + case 0x00000001: + d_() = std::move(x.m_d); + break; } } @@ -902,9 +908,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = x.m_d; - break; + case 0x00000001: + d_() = x.m_d; + break; } @@ -922,9 +928,9 @@ class Union_ULong switch (x.selected_member_) { - case 0x00000001: - d_() = std::move(x.m_d); - break; + case 0x00000001: + d_() = std::move(x.m_d); + break; } @@ -945,9 +951,9 @@ class Union_ULong { switch (selected_member_) { - case 0x00000001: - ret_value = (m_d == x.m_d); - break; + case 0x00000001: + ret_value = (m_d == x.m_d); + break; } } @@ -977,19 +983,18 @@ class Union_ULong switch (__d) { - case 3: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 3: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1045,6 +1050,7 @@ class Union_ULong return m_d; } + void _default() { if (member_destructor_) @@ -1055,25 +1061,27 @@ class Union_ULong selected_member_ = 0x0FFFFFFFu; } + private: - uint32_t& d_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint32_t& d_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_d = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_d = {0}; - } + } + + return m_d; + } - return m_d; - } int32_t m__d {2147483647}; @@ -1123,9 +1131,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = x.m_e; - break; + case 0x00000001: + e_() = x.m_e; + break; } } @@ -1141,9 +1149,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = std::move(x.m_e); - break; + case 0x00000001: + e_() = std::move(x.m_e); + break; } } @@ -1159,9 +1167,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = x.m_e; - break; + case 0x00000001: + e_() = x.m_e; + break; } @@ -1179,9 +1187,9 @@ class Union_LongLong switch (x.selected_member_) { - case 0x00000001: - e_() = std::move(x.m_e); - break; + case 0x00000001: + e_() = std::move(x.m_e); + break; } @@ -1202,9 +1210,9 @@ class Union_LongLong { switch (selected_member_) { - case 0x00000001: - ret_value = (m_e == x.m_e); - break; + case 0x00000001: + ret_value = (m_e == x.m_e); + break; } } @@ -1234,19 +1242,18 @@ class Union_LongLong switch (__d) { - case 4: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 4: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1302,6 +1309,7 @@ class Union_LongLong return m_e; } + void _default() { if (member_destructor_) @@ -1312,25 +1320,27 @@ class Union_LongLong selected_member_ = 0x0FFFFFFFu; } + private: - int64_t& e_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int64_t& e_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_e = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_e = {0}; - } + } + + return m_e; + } - return m_e; - } int32_t m__d {2147483647}; @@ -1380,9 +1390,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = x.m_f; - break; + case 0x00000001: + f_() = x.m_f; + break; } } @@ -1398,9 +1408,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = std::move(x.m_f); - break; + case 0x00000001: + f_() = std::move(x.m_f); + break; } } @@ -1416,9 +1426,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = x.m_f; - break; + case 0x00000001: + f_() = x.m_f; + break; } @@ -1436,9 +1446,9 @@ class Union_ULongLOng switch (x.selected_member_) { - case 0x00000001: - f_() = std::move(x.m_f); - break; + case 0x00000001: + f_() = std::move(x.m_f); + break; } @@ -1459,9 +1469,9 @@ class Union_ULongLOng { switch (selected_member_) { - case 0x00000001: - ret_value = (m_f == x.m_f); - break; + case 0x00000001: + ret_value = (m_f == x.m_f); + break; } } @@ -1491,19 +1501,18 @@ class Union_ULongLOng switch (__d) { - case 5: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 5: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1559,6 +1568,7 @@ class Union_ULongLOng return m_f; } + void _default() { if (member_destructor_) @@ -1569,25 +1579,27 @@ class Union_ULongLOng selected_member_ = 0x0FFFFFFFu; } + private: - uint64_t& f_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint64_t& f_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_f = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_f = {0}; - } + } + + return m_f; + } - return m_f; - } int32_t m__d {2147483647}; @@ -1637,9 +1649,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = x.m_g; - break; + case 0x00000001: + g_() = x.m_g; + break; } } @@ -1655,9 +1667,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = std::move(x.m_g); - break; + case 0x00000001: + g_() = std::move(x.m_g); + break; } } @@ -1673,9 +1685,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = x.m_g; - break; + case 0x00000001: + g_() = x.m_g; + break; } @@ -1693,9 +1705,9 @@ class Union_Float switch (x.selected_member_) { - case 0x00000001: - g_() = std::move(x.m_g); - break; + case 0x00000001: + g_() = std::move(x.m_g); + break; } @@ -1716,9 +1728,9 @@ class Union_Float { switch (selected_member_) { - case 0x00000001: - ret_value = (m_g == x.m_g); - break; + case 0x00000001: + ret_value = (m_g == x.m_g); + break; } } @@ -1748,19 +1760,18 @@ class Union_Float switch (__d) { - case 6: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 6: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -1816,6 +1827,7 @@ class Union_Float return m_g; } + void _default() { if (member_destructor_) @@ -1826,25 +1838,27 @@ class Union_Float selected_member_ = 0x0FFFFFFFu; } + private: - float& g_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + float& g_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_g = {0.0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_g = {0.0}; - } + } + + return m_g; + } - return m_g; - } int32_t m__d {2147483647}; @@ -1894,9 +1908,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = x.m_h; - break; + case 0x00000001: + h_() = x.m_h; + break; } } @@ -1912,9 +1926,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = std::move(x.m_h); - break; + case 0x00000001: + h_() = std::move(x.m_h); + break; } } @@ -1930,9 +1944,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = x.m_h; - break; + case 0x00000001: + h_() = x.m_h; + break; } @@ -1950,9 +1964,9 @@ class Union_Double switch (x.selected_member_) { - case 0x00000001: - h_() = std::move(x.m_h); - break; + case 0x00000001: + h_() = std::move(x.m_h); + break; } @@ -1973,9 +1987,9 @@ class Union_Double { switch (selected_member_) { - case 0x00000001: - ret_value = (m_h == x.m_h); - break; + case 0x00000001: + ret_value = (m_h == x.m_h); + break; } } @@ -2005,19 +2019,18 @@ class Union_Double switch (__d) { - case 7: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 7: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2073,6 +2086,7 @@ class Union_Double return m_h; } + void _default() { if (member_destructor_) @@ -2083,25 +2097,27 @@ class Union_Double selected_member_ = 0x0FFFFFFFu; } + private: - double& h_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + double& h_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_h = {0.0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_h = {0.0}; - } + } + + return m_h; + } - return m_h; - } int32_t m__d {2147483647}; @@ -2151,9 +2167,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = x.m_i; - break; + case 0x00000001: + i_() = x.m_i; + break; } } @@ -2169,9 +2185,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = std::move(x.m_i); - break; + case 0x00000001: + i_() = std::move(x.m_i); + break; } } @@ -2187,9 +2203,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = x.m_i; - break; + case 0x00000001: + i_() = x.m_i; + break; } @@ -2207,9 +2223,9 @@ class Union_LongDouble switch (x.selected_member_) { - case 0x00000001: - i_() = std::move(x.m_i); - break; + case 0x00000001: + i_() = std::move(x.m_i); + break; } @@ -2230,9 +2246,9 @@ class Union_LongDouble { switch (selected_member_) { - case 0x00000001: - ret_value = (m_i == x.m_i); - break; + case 0x00000001: + ret_value = (m_i == x.m_i); + break; } } @@ -2262,19 +2278,18 @@ class Union_LongDouble switch (__d) { - case 8: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 8: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2330,6 +2345,7 @@ class Union_LongDouble return m_i; } + void _default() { if (member_destructor_) @@ -2340,25 +2356,27 @@ class Union_LongDouble selected_member_ = 0x0FFFFFFFu; } + private: - long double& i_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + long double& i_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_i = {0.0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_i = {0.0}; - } + } + + return m_i; + } - return m_i; - } int32_t m__d {2147483647}; @@ -2408,9 +2426,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = x.m_j; - break; + case 0x00000001: + j_() = x.m_j; + break; } } @@ -2426,9 +2444,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = std::move(x.m_j); - break; + case 0x00000001: + j_() = std::move(x.m_j); + break; } } @@ -2444,9 +2462,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = x.m_j; - break; + case 0x00000001: + j_() = x.m_j; + break; } @@ -2464,9 +2482,9 @@ class Union_Boolean switch (x.selected_member_) { - case 0x00000001: - j_() = std::move(x.m_j); - break; + case 0x00000001: + j_() = std::move(x.m_j); + break; } @@ -2487,9 +2505,9 @@ class Union_Boolean { switch (selected_member_) { - case 0x00000001: - ret_value = (m_j == x.m_j); - break; + case 0x00000001: + ret_value = (m_j == x.m_j); + break; } } @@ -2519,19 +2537,18 @@ class Union_Boolean switch (__d) { - case 9: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 9: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2587,6 +2604,7 @@ class Union_Boolean return m_j; } + void _default() { if (member_destructor_) @@ -2597,25 +2615,27 @@ class Union_Boolean selected_member_ = 0x0FFFFFFFu; } + private: - bool& j_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + bool& j_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_j = {false}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_j = {false}; - } + } + + return m_j; + } - return m_j; - } int32_t m__d {2147483647}; @@ -2665,9 +2685,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = x.m_k; - break; + case 0x00000001: + k_() = x.m_k; + break; } } @@ -2683,9 +2703,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = std::move(x.m_k); - break; + case 0x00000001: + k_() = std::move(x.m_k); + break; } } @@ -2701,9 +2721,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = x.m_k; - break; + case 0x00000001: + k_() = x.m_k; + break; } @@ -2721,9 +2741,9 @@ class Union_Octet switch (x.selected_member_) { - case 0x00000001: - k_() = std::move(x.m_k); - break; + case 0x00000001: + k_() = std::move(x.m_k); + break; } @@ -2744,9 +2764,9 @@ class Union_Octet { switch (selected_member_) { - case 0x00000001: - ret_value = (m_k == x.m_k); - break; + case 0x00000001: + ret_value = (m_k == x.m_k); + break; } } @@ -2776,19 +2796,18 @@ class Union_Octet switch (__d) { - case 10: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 10: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -2844,6 +2863,7 @@ class Union_Octet return m_k; } + void _default() { if (member_destructor_) @@ -2854,25 +2874,27 @@ class Union_Octet selected_member_ = 0x0FFFFFFFu; } + private: - uint8_t& k_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint8_t& k_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_k = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_k = {0}; - } + } + + return m_k; + } - return m_k; - } int32_t m__d {2147483647}; @@ -2922,9 +2944,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; } } @@ -2940,9 +2962,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; } } @@ -2958,9 +2980,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = x.m_l; - break; + case 0x00000001: + l_() = x.m_l; + break; } @@ -2978,9 +3000,9 @@ class Union_Char switch (x.selected_member_) { - case 0x00000001: - l_() = std::move(x.m_l); - break; + case 0x00000001: + l_() = std::move(x.m_l); + break; } @@ -3001,9 +3023,9 @@ class Union_Char { switch (selected_member_) { - case 0x00000001: - ret_value = (m_l == x.m_l); - break; + case 0x00000001: + ret_value = (m_l == x.m_l); + break; } } @@ -3033,19 +3055,18 @@ class Union_Char switch (__d) { - case 11: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 11: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3101,6 +3122,7 @@ class Union_Char return m_l; } + void _default() { if (member_destructor_) @@ -3111,25 +3133,27 @@ class Union_Char selected_member_ = 0x0FFFFFFFu; } + private: - char& l_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + char& l_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_l = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_l = {0}; - } + } + + return m_l; + } - return m_l; - } int32_t m__d {2147483647}; @@ -3179,9 +3203,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = x.m_m; - break; + case 0x00000001: + m_() = x.m_m; + break; } } @@ -3197,9 +3221,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = std::move(x.m_m); - break; + case 0x00000001: + m_() = std::move(x.m_m); + break; } } @@ -3215,9 +3239,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = x.m_m; - break; + case 0x00000001: + m_() = x.m_m; + break; } @@ -3235,9 +3259,9 @@ class Union_WChar switch (x.selected_member_) { - case 0x00000001: - m_() = std::move(x.m_m); - break; + case 0x00000001: + m_() = std::move(x.m_m); + break; } @@ -3258,9 +3282,9 @@ class Union_WChar { switch (selected_member_) { - case 0x00000001: - ret_value = (m_m == x.m_m); - break; + case 0x00000001: + ret_value = (m_m == x.m_m); + break; } } @@ -3290,19 +3314,18 @@ class Union_WChar switch (__d) { - case 12: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 12: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3358,6 +3381,7 @@ class Union_WChar return m_m; } + void _default() { if (member_destructor_) @@ -3368,25 +3392,27 @@ class Union_WChar selected_member_ = 0x0FFFFFFFu; } + private: - wchar_t& m_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + wchar_t& m_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_m = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_m = {0}; - } + } + + return m_m; + } - return m_m; - } int32_t m__d {2147483647}; @@ -3436,9 +3462,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = x.m_n; - break; + case 0x00000001: + n_() = x.m_n; + break; } } @@ -3454,9 +3480,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = std::move(x.m_n); - break; + case 0x00000001: + n_() = std::move(x.m_n); + break; } } @@ -3472,9 +3498,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = x.m_n; - break; + case 0x00000001: + n_() = x.m_n; + break; } @@ -3492,9 +3518,9 @@ class Union_String switch (x.selected_member_) { - case 0x00000001: - n_() = std::move(x.m_n); - break; + case 0x00000001: + n_() = std::move(x.m_n); + break; } @@ -3515,9 +3541,9 @@ class Union_String { switch (selected_member_) { - case 0x00000001: - ret_value = (m_n == x.m_n); - break; + case 0x00000001: + ret_value = (m_n == x.m_n); + break; } } @@ -3547,19 +3573,18 @@ class Union_String switch (__d) { - case 13: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 13: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3626,6 +3651,7 @@ class Union_String return m_n; } + void _default() { if (member_destructor_) @@ -3636,28 +3662,27 @@ class Union_String selected_member_ = 0x0FFFFFFFu; } + private: - std::string& n_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + std::string& n_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_n.~basic_string(); - }; - new(&m_n) std::string(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_n.~basic_string();}; + new(&m_n) std::string(); + + } + + return m_n; + } - return m_n; - } int32_t m__d {2147483647}; @@ -3707,9 +3732,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = x.m_o; - break; + case 0x00000001: + o_() = x.m_o; + break; } } @@ -3725,9 +3750,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = std::move(x.m_o); - break; + case 0x00000001: + o_() = std::move(x.m_o); + break; } } @@ -3743,9 +3768,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = x.m_o; - break; + case 0x00000001: + o_() = x.m_o; + break; } @@ -3763,9 +3788,9 @@ class Union_WString switch (x.selected_member_) { - case 0x00000001: - o_() = std::move(x.m_o); - break; + case 0x00000001: + o_() = std::move(x.m_o); + break; } @@ -3786,9 +3811,9 @@ class Union_WString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_o == x.m_o); - break; + case 0x00000001: + ret_value = (m_o == x.m_o); + break; } } @@ -3818,19 +3843,18 @@ class Union_WString switch (__d) { - case 14: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 14: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -3897,6 +3921,7 @@ class Union_WString return m_o; } + void _default() { if (member_destructor_) @@ -3907,28 +3932,27 @@ class Union_WString selected_member_ = 0x0FFFFFFFu; } + private: - std::wstring& o_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + std::wstring& o_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_o.~basic_string(); - }; - new(&m_o) std::wstring(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_o.~basic_string();}; + new(&m_o) std::wstring(); + + } + + return m_o; + } - return m_o; - } int32_t m__d {2147483647}; @@ -3978,9 +4002,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = x.m_bn; - break; + case 0x00000001: + bn_() = x.m_bn; + break; } } @@ -3996,9 +4020,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = std::move(x.m_bn); - break; + case 0x00000001: + bn_() = std::move(x.m_bn); + break; } } @@ -4014,9 +4038,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = x.m_bn; - break; + case 0x00000001: + bn_() = x.m_bn; + break; } @@ -4034,9 +4058,9 @@ class Union_BoundedString switch (x.selected_member_) { - case 0x00000001: - bn_() = std::move(x.m_bn); - break; + case 0x00000001: + bn_() = std::move(x.m_bn); + break; } @@ -4057,9 +4081,9 @@ class Union_BoundedString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_bn == x.m_bn); - break; + case 0x00000001: + ret_value = (m_bn == x.m_bn); + break; } } @@ -4089,19 +4113,18 @@ class Union_BoundedString switch (__d) { - case 13: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 13: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4168,6 +4191,7 @@ class Union_BoundedString return m_bn; } + void _default() { if (member_destructor_) @@ -4178,28 +4202,27 @@ class Union_BoundedString selected_member_ = 0x0FFFFFFFu; } + private: - Inner_alias_bounded_string_helper& bn_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + Inner_alias_bounded_string_helper& bn_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_bn.~Inner_alias_bounded_string_helper(); - }; - new(&m_bn) Inner_alias_bounded_string_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_bn.~Inner_alias_bounded_string_helper();}; + new(&m_bn) Inner_alias_bounded_string_helper(); + + } + + return m_bn; + } - return m_bn; - } int32_t m__d {2147483647}; @@ -4249,9 +4272,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = x.m_bo; - break; + case 0x00000001: + bo_() = x.m_bo; + break; } } @@ -4267,9 +4290,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = std::move(x.m_bo); - break; + case 0x00000001: + bo_() = std::move(x.m_bo); + break; } } @@ -4285,9 +4308,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = x.m_bo; - break; + case 0x00000001: + bo_() = x.m_bo; + break; } @@ -4305,9 +4328,9 @@ class Union_BoundedWString switch (x.selected_member_) { - case 0x00000001: - bo_() = std::move(x.m_bo); - break; + case 0x00000001: + bo_() = std::move(x.m_bo); + break; } @@ -4328,9 +4351,9 @@ class Union_BoundedWString { switch (selected_member_) { - case 0x00000001: - ret_value = (m_bo == x.m_bo); - break; + case 0x00000001: + ret_value = (m_bo == x.m_bo); + break; } } @@ -4360,19 +4383,18 @@ class Union_BoundedWString switch (__d) { - case 14: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 14: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4439,6 +4461,7 @@ class Union_BoundedWString return m_bo; } + void _default() { if (member_destructor_) @@ -4449,28 +4472,27 @@ class Union_BoundedWString selected_member_ = 0x0FFFFFFFu; } + private: - Inner_alias_bounded_wstring_helper& bo_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + Inner_alias_bounded_wstring_helper& bo_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_bo.~Inner_alias_bounded_wstring_helper(); - }; - new(&m_bo) Inner_alias_bounded_wstring_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_bo.~Inner_alias_bounded_wstring_helper();}; + new(&m_bo) Inner_alias_bounded_wstring_helper(); + + } + + return m_bo; + } - return m_bo; - } int32_t m__d {2147483647}; @@ -4520,9 +4542,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = x.m_p; - break; + case 0x00000001: + p_() = x.m_p; + break; } } @@ -4538,9 +4560,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = std::move(x.m_p); - break; + case 0x00000001: + p_() = std::move(x.m_p); + break; } } @@ -4556,9 +4578,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = x.m_p; - break; + case 0x00000001: + p_() = x.m_p; + break; } @@ -4576,9 +4598,9 @@ class Union_InnerEnumHelper switch (x.selected_member_) { - case 0x00000001: - p_() = std::move(x.m_p); - break; + case 0x00000001: + p_() = std::move(x.m_p); + break; } @@ -4599,9 +4621,9 @@ class Union_InnerEnumHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_p == x.m_p); - break; + case 0x00000001: + ret_value = (m_p == x.m_p); + break; } } @@ -4631,19 +4653,18 @@ class Union_InnerEnumHelper switch (__d) { - case 15: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 15: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4699,6 +4720,7 @@ class Union_InnerEnumHelper return m_p; } + void _default() { if (member_destructor_) @@ -4709,25 +4731,27 @@ class Union_InnerEnumHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerEnumHelper& p_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerEnumHelper& p_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_p = {InnerEnumHelper::ENUM_VALUE_1}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_p = {InnerEnumHelper::ENUM_VALUE_1}; - } + } + + return m_p; + } - return m_p; - } int32_t m__d {2147483647}; @@ -4777,9 +4801,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = x.m_q; - break; + case 0x00000001: + q_() = x.m_q; + break; } } @@ -4795,9 +4819,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = std::move(x.m_q); - break; + case 0x00000001: + q_() = std::move(x.m_q); + break; } } @@ -4813,9 +4837,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = x.m_q; - break; + case 0x00000001: + q_() = x.m_q; + break; } @@ -4833,9 +4857,9 @@ class Union_InnerBitMaskHelper switch (x.selected_member_) { - case 0x00000001: - q_() = std::move(x.m_q); - break; + case 0x00000001: + q_() = std::move(x.m_q); + break; } @@ -4856,9 +4880,9 @@ class Union_InnerBitMaskHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_q == x.m_q); - break; + case 0x00000001: + ret_value = (m_q == x.m_q); + break; } } @@ -4888,19 +4912,18 @@ class Union_InnerBitMaskHelper switch (__d) { - case 16: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 16: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -4967,6 +4990,7 @@ class Union_InnerBitMaskHelper return m_q; } + void _default() { if (member_destructor_) @@ -4977,28 +5001,27 @@ class Union_InnerBitMaskHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerBitMaskHelper& q_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerBitMaskHelper& q_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_q.~InnerBitMaskHelper(); - }; - new(&m_q) InnerBitMaskHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_q.~InnerBitMaskHelper();}; + new(&m_q) InnerBitMaskHelper(); + + } + + return m_q; + } - return m_q; - } int32_t m__d {2147483647}; @@ -5048,9 +5071,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = x.m_r; - break; + case 0x00000001: + r_() = x.m_r; + break; } } @@ -5066,9 +5089,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = std::move(x.m_r); - break; + case 0x00000001: + r_() = std::move(x.m_r); + break; } } @@ -5084,9 +5107,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = x.m_r; - break; + case 0x00000001: + r_() = x.m_r; + break; } @@ -5104,9 +5127,9 @@ class Union_InnerAliasHelper switch (x.selected_member_) { - case 0x00000001: - r_() = std::move(x.m_r); - break; + case 0x00000001: + r_() = std::move(x.m_r); + break; } @@ -5127,9 +5150,9 @@ class Union_InnerAliasHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_r == x.m_r); - break; + case 0x00000001: + ret_value = (m_r == x.m_r); + break; } } @@ -5159,19 +5182,18 @@ class Union_InnerAliasHelper switch (__d) { - case 17: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 17: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5227,6 +5249,7 @@ class Union_InnerAliasHelper return m_r; } + void _default() { if (member_destructor_) @@ -5237,25 +5260,27 @@ class Union_InnerAliasHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerAliasHelper& r_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerAliasHelper& r_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_r = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_r = {0}; - } + } + + return m_r; + } - return m_r; - } int32_t m__d {2147483647}; @@ -5305,9 +5330,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = x.m_s; - break; + case 0x00000001: + s_() = x.m_s; + break; } } @@ -5323,9 +5348,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = std::move(x.m_s); - break; + case 0x00000001: + s_() = std::move(x.m_s); + break; } } @@ -5341,9 +5366,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = x.m_s; - break; + case 0x00000001: + s_() = x.m_s; + break; } @@ -5361,9 +5386,9 @@ class Union_Array switch (x.selected_member_) { - case 0x00000001: - s_() = std::move(x.m_s); - break; + case 0x00000001: + s_() = std::move(x.m_s); + break; } @@ -5384,9 +5409,9 @@ class Union_Array { switch (selected_member_) { - case 0x00000001: - ret_value = (m_s == x.m_s); - break; + case 0x00000001: + ret_value = (m_s == x.m_s); + break; } } @@ -5416,19 +5441,18 @@ class Union_Array switch (__d) { - case 18: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 18: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5495,6 +5519,7 @@ class Union_Array return m_s; } + void _default() { if (member_destructor_) @@ -5505,28 +5530,27 @@ class Union_Array selected_member_ = 0x0FFFFFFFu; } + private: - Inner_alias_array_helper& s_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + Inner_alias_array_helper& s_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_s.~Inner_alias_array_helper(); - }; - new(&m_s) Inner_alias_array_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_s.~Inner_alias_array_helper();}; + new(&m_s) Inner_alias_array_helper(); + + } + + return m_s; + } - return m_s; - } int32_t m__d {2147483647}; @@ -5576,9 +5600,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = x.m_t; - break; + case 0x00000001: + t_() = x.m_t; + break; } } @@ -5594,9 +5618,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = std::move(x.m_t); - break; + case 0x00000001: + t_() = std::move(x.m_t); + break; } } @@ -5612,9 +5636,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = x.m_t; - break; + case 0x00000001: + t_() = x.m_t; + break; } @@ -5632,9 +5656,9 @@ class Union_Sequence switch (x.selected_member_) { - case 0x00000001: - t_() = std::move(x.m_t); - break; + case 0x00000001: + t_() = std::move(x.m_t); + break; } @@ -5655,9 +5679,9 @@ class Union_Sequence { switch (selected_member_) { - case 0x00000001: - ret_value = (m_t == x.m_t); - break; + case 0x00000001: + ret_value = (m_t == x.m_t); + break; } } @@ -5687,19 +5711,18 @@ class Union_Sequence switch (__d) { - case 19: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 19: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -5766,6 +5789,7 @@ class Union_Sequence return m_t; } + void _default() { if (member_destructor_) @@ -5776,28 +5800,27 @@ class Union_Sequence selected_member_ = 0x0FFFFFFFu; } + private: - std::vector& t_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + std::vector& t_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_t.~vector(); - }; - new(&m_t) std::vector(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_t.~vector();}; + new(&m_t) std::vector(); + + } + + return m_t; + } - return m_t; - } int32_t m__d {2147483647}; @@ -5847,9 +5870,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = x.m_u; - break; + case 0x00000001: + u_() = x.m_u; + break; } } @@ -5865,9 +5888,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = std::move(x.m_u); - break; + case 0x00000001: + u_() = std::move(x.m_u); + break; } } @@ -5883,9 +5906,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = x.m_u; - break; + case 0x00000001: + u_() = x.m_u; + break; } @@ -5903,9 +5926,9 @@ class Union_Map switch (x.selected_member_) { - case 0x00000001: - u_() = std::move(x.m_u); - break; + case 0x00000001: + u_() = std::move(x.m_u); + break; } @@ -5926,9 +5949,9 @@ class Union_Map { switch (selected_member_) { - case 0x00000001: - ret_value = (m_u == x.m_u); - break; + case 0x00000001: + ret_value = (m_u == x.m_u); + break; } } @@ -5958,19 +5981,18 @@ class Union_Map switch (__d) { - case 20: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 20: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6037,6 +6059,7 @@ class Union_Map return m_u; } + void _default() { if (member_destructor_) @@ -6047,28 +6070,27 @@ class Union_Map selected_member_ = 0x0FFFFFFFu; } + private: - std::map& u_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + std::map& u_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_u.~map(); - }; - new(&m_u) std::map(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_u.~map();}; + new(&m_u) std::map(); + + } + + return m_u; + } - return m_u; - } int32_t m__d {2147483647}; @@ -6118,9 +6140,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = x.m_v; - break; + case 0x00000001: + v_() = x.m_v; + break; } } @@ -6136,9 +6158,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = std::move(x.m_v); - break; + case 0x00000001: + v_() = std::move(x.m_v); + break; } } @@ -6154,9 +6176,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = x.m_v; - break; + case 0x00000001: + v_() = x.m_v; + break; } @@ -6174,9 +6196,9 @@ class Union_InnerUnionHelper switch (x.selected_member_) { - case 0x00000001: - v_() = std::move(x.m_v); - break; + case 0x00000001: + v_() = std::move(x.m_v); + break; } @@ -6197,9 +6219,9 @@ class Union_InnerUnionHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_v == x.m_v); - break; + case 0x00000001: + ret_value = (m_v == x.m_v); + break; } } @@ -6229,19 +6251,18 @@ class Union_InnerUnionHelper switch (__d) { - case 21: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 21: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6308,6 +6329,7 @@ class Union_InnerUnionHelper return m_v; } + void _default() { if (member_destructor_) @@ -6318,28 +6340,27 @@ class Union_InnerUnionHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerUnionHelper& v_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerUnionHelper& v_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_v.~InnerUnionHelper(); - }; - new(&m_v) InnerUnionHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_v.~InnerUnionHelper();}; + new(&m_v) InnerUnionHelper(); + + } + + return m_v; + } - return m_v; - } int32_t m__d {2147483647}; @@ -6389,9 +6410,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = x.m_w; - break; + case 0x00000001: + w_() = x.m_w; + break; } } @@ -6407,9 +6428,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = std::move(x.m_w); - break; + case 0x00000001: + w_() = std::move(x.m_w); + break; } } @@ -6425,9 +6446,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = x.m_w; - break; + case 0x00000001: + w_() = x.m_w; + break; } @@ -6445,9 +6466,9 @@ class Union_InnerStructureHelper switch (x.selected_member_) { - case 0x00000001: - w_() = std::move(x.m_w); - break; + case 0x00000001: + w_() = std::move(x.m_w); + break; } @@ -6468,9 +6489,9 @@ class Union_InnerStructureHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_w == x.m_w); - break; + case 0x00000001: + ret_value = (m_w == x.m_w); + break; } } @@ -6500,19 +6521,18 @@ class Union_InnerStructureHelper switch (__d) { - case 22: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 22: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6579,6 +6599,7 @@ class Union_InnerStructureHelper return m_w; } + void _default() { if (member_destructor_) @@ -6589,28 +6610,27 @@ class Union_InnerStructureHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerStructureHelper& w_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerStructureHelper& w_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_w.~InnerStructureHelper(); - }; - new(&m_w) InnerStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_w.~InnerStructureHelper();}; + new(&m_w) InnerStructureHelper(); + + } + + return m_w; + } - return m_w; - } int32_t m__d {2147483647}; @@ -6660,9 +6680,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = x.m_x; - break; + case 0x00000001: + x_() = x.m_x; + break; } } @@ -6678,9 +6698,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = std::move(x.m_x); - break; + case 0x00000001: + x_() = std::move(x.m_x); + break; } } @@ -6696,9 +6716,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = x.m_x; - break; + case 0x00000001: + x_() = x.m_x; + break; } @@ -6716,9 +6736,9 @@ class Union_InnerBitsetHelper switch (x.selected_member_) { - case 0x00000001: - x_() = std::move(x.m_x); - break; + case 0x00000001: + x_() = std::move(x.m_x); + break; } @@ -6739,9 +6759,9 @@ class Union_InnerBitsetHelper { switch (selected_member_) { - case 0x00000001: - ret_value = (m_x == x.m_x); - break; + case 0x00000001: + ret_value = (m_x == x.m_x); + break; } } @@ -6771,19 +6791,18 @@ class Union_InnerBitsetHelper switch (__d) { - case 23: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 23: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -6850,6 +6869,7 @@ class Union_InnerBitsetHelper return m_x; } + void _default() { if (member_destructor_) @@ -6860,28 +6880,27 @@ class Union_InnerBitsetHelper selected_member_ = 0x0FFFFFFFu; } + private: - InnerBitsetHelper& x_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerBitsetHelper& x_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_x.~InnerBitsetHelper(); - }; - new(&m_x) InnerBitsetHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_x.~InnerBitsetHelper();}; + new(&m_x) InnerBitsetHelper(); + + } + + return m_x; + } - return m_x; - } int32_t m__d {2147483647}; @@ -6931,13 +6950,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -6953,13 +6972,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -6975,13 +6994,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -6999,13 +7018,13 @@ class Union_Discriminator_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7026,13 +7045,13 @@ class Union_Discriminator_short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7062,26 +7081,25 @@ class Union_Discriminator_short switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7137,6 +7155,7 @@ class Union_Discriminator_short return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7178,6 +7197,7 @@ class Union_Discriminator_short return m_second; } + void _default() { if (member_destructor_) @@ -7188,43 +7208,45 @@ class Union_Discriminator_short selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } int16_t m__d {32767}; @@ -7275,13 +7297,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -7297,13 +7319,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -7319,13 +7341,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -7343,13 +7365,13 @@ class Union_Discriminator_unsigned_short switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7370,13 +7392,13 @@ class Union_Discriminator_unsigned_short { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7406,26 +7428,25 @@ class Union_Discriminator_unsigned_short switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7481,6 +7502,7 @@ class Union_Discriminator_unsigned_short return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7522,6 +7544,7 @@ class Union_Discriminator_unsigned_short return m_second; } + void _default() { if (member_destructor_) @@ -7532,43 +7555,45 @@ class Union_Discriminator_unsigned_short selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } uint16_t m__d {32767}; @@ -7619,13 +7644,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -7641,13 +7666,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -7663,13 +7688,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -7687,13 +7712,13 @@ class Union_Discriminator_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -7714,13 +7739,13 @@ class Union_Discriminator_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -7750,26 +7775,25 @@ class Union_Discriminator_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -7825,6 +7849,7 @@ class Union_Discriminator_long return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -7866,6 +7891,7 @@ class Union_Discriminator_long return m_second; } + void _default() { if (member_destructor_) @@ -7876,43 +7902,45 @@ class Union_Discriminator_long selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } int32_t m__d {2147483647}; @@ -7963,13 +7991,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -7985,13 +8013,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8007,13 +8035,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8031,13 +8059,13 @@ class Union_Discriminator_unsigned_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8058,13 +8086,13 @@ class Union_Discriminator_unsigned_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8094,26 +8122,25 @@ class Union_Discriminator_unsigned_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8169,6 +8196,7 @@ class Union_Discriminator_unsigned_long return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8210,6 +8238,7 @@ class Union_Discriminator_unsigned_long return m_second; } + void _default() { if (member_destructor_) @@ -8220,43 +8249,45 @@ class Union_Discriminator_unsigned_long selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } uint32_t m__d {2147483647}; @@ -8307,13 +8338,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -8329,13 +8360,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8351,13 +8382,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8375,13 +8406,13 @@ class Union_Discriminator_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8402,13 +8433,13 @@ class Union_Discriminator_long_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8438,26 +8469,25 @@ class Union_Discriminator_long_long switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case -2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case -2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8513,6 +8543,7 @@ class Union_Discriminator_long_long return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8554,6 +8585,7 @@ class Union_Discriminator_long_long return m_second; } + void _default() { if (member_destructor_) @@ -8564,43 +8596,45 @@ class Union_Discriminator_long_long selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } int64_t m__d {9223372036854775807}; @@ -8651,13 +8685,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -8673,13 +8707,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -8695,13 +8729,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -8719,13 +8753,13 @@ class Union_Discriminator_unsigned_long_long switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -8746,13 +8780,13 @@ class Union_Discriminator_unsigned_long_long { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -8782,26 +8816,25 @@ class Union_Discriminator_unsigned_long_long switch (__d) { - case 2: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -8857,6 +8890,7 @@ class Union_Discriminator_unsigned_long_long return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -8898,6 +8932,7 @@ class Union_Discriminator_unsigned_long_long return m_second; } + void _default() { if (member_destructor_) @@ -8908,43 +8943,45 @@ class Union_Discriminator_unsigned_long_long selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } uint64_t m__d {9223372036854775807}; @@ -8999,13 +9036,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9021,13 +9058,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9043,13 +9080,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9067,13 +9104,13 @@ class Union_Discriminator_boolean switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9094,13 +9131,13 @@ class Union_Discriminator_boolean { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9130,26 +9167,25 @@ class Union_Discriminator_boolean switch (__d) { - case true: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case true: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case false: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case false: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9205,6 +9241,7 @@ class Union_Discriminator_boolean return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9246,43 +9283,46 @@ class Union_Discriminator_boolean return m_second; } + + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } bool m__d {true}; @@ -9333,13 +9373,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9355,13 +9395,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9377,13 +9417,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9401,13 +9441,13 @@ class Union_Discriminator_octet switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9428,13 +9468,13 @@ class Union_Discriminator_octet { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9464,26 +9504,25 @@ class Union_Discriminator_octet switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9539,6 +9578,7 @@ class Union_Discriminator_octet return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9580,6 +9620,7 @@ class Union_Discriminator_octet return m_second; } + void _default() { if (member_destructor_) @@ -9590,43 +9631,45 @@ class Union_Discriminator_octet selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } uint8_t m__d {127}; @@ -9677,13 +9720,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -9699,13 +9742,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -9721,13 +9764,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -9745,13 +9788,13 @@ class Union_Discriminator_char switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -9772,13 +9815,13 @@ class Union_Discriminator_char { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -9808,26 +9851,25 @@ class Union_Discriminator_char switch (__d) { - case 'a': - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 'a': + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 'b': - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 'b': + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -9883,6 +9925,7 @@ class Union_Discriminator_char return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -9924,6 +9967,7 @@ class Union_Discriminator_char return m_second; } + void _default() { if (member_destructor_) @@ -9934,43 +9978,45 @@ class Union_Discriminator_char selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } char m__d {127}; @@ -10021,13 +10067,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -10043,13 +10089,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -10065,13 +10111,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -10089,13 +10135,13 @@ class Union_Discriminator_wchar switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -10116,13 +10162,13 @@ class Union_Discriminator_wchar { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -10152,26 +10198,25 @@ class Union_Discriminator_wchar switch (__d) { - case L'a': - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case L'a': + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case L'b': - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case L'b': + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -10227,6 +10272,7 @@ class Union_Discriminator_wchar return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -10268,6 +10314,7 @@ class Union_Discriminator_wchar return m_second; } + void _default() { if (member_destructor_) @@ -10278,43 +10325,45 @@ class Union_Discriminator_wchar selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } wchar_t m__d {32767}; @@ -10369,17 +10418,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; - case 0x00000003: - third_() = x.m_third; - break; + case 0x00000003: + third_() = x.m_third; + break; } } @@ -10395,17 +10444,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; - case 0x00000003: - third_() = std::move(x.m_third); - break; + case 0x00000003: + third_() = std::move(x.m_third); + break; } } @@ -10421,17 +10470,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; - case 0x00000003: - third_() = x.m_third; - break; + case 0x00000003: + third_() = x.m_third; + break; } @@ -10449,17 +10498,17 @@ class Union_Discriminator_enum switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; - case 0x00000003: - third_() = std::move(x.m_third); - break; + case 0x00000003: + third_() = std::move(x.m_third); + break; } @@ -10480,17 +10529,17 @@ class Union_Discriminator_enum { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; - case 0x00000003: - ret_value = (m_third == x.m_third); - break; + case 0x00000003: + ret_value = (m_third == x.m_third); + break; } } @@ -10520,33 +10569,32 @@ class Union_Discriminator_enum switch (__d) { - case InnerEnumHelper::ENUM_VALUE_1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case InnerEnumHelper::ENUM_VALUE_2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -10602,6 +10650,7 @@ class Union_Discriminator_enum return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -10643,6 +10692,7 @@ class Union_Discriminator_enum return m_second; } + /*! * @brief This function sets a value in member third * @param _third New value for member third @@ -10684,61 +10734,64 @@ class Union_Discriminator_enum return m_third; } + + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } - return m_second; - } + return m_second; + } - uint8_t& third_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + uint8_t& third_() { - member_destructor_(); - } + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_third = {0}; + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_third = {0}; - } + } + + return m_third; + } - return m_third; - } InnerEnumHelper m__d {InnerEnumHelper::ENUM_VALUE_3}; @@ -10794,13 +10847,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -10816,13 +10869,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -10838,13 +10891,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -10862,13 +10915,13 @@ class Union_Discriminator_enum_labels switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -10889,13 +10942,13 @@ class Union_Discriminator_enum_labels { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -10925,27 +10978,26 @@ class Union_Discriminator_enum_labels switch (__d) { - case InnerEnumHelper::ENUM_VALUE_3: - case InnerEnumHelper::ENUM_VALUE_1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_3: + case InnerEnumHelper::ENUM_VALUE_1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case InnerEnumHelper::ENUM_VALUE_2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case InnerEnumHelper::ENUM_VALUE_2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11001,6 +11053,7 @@ class Union_Discriminator_enum_labels return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -11042,6 +11095,7 @@ class Union_Discriminator_enum_labels return m_second; } + void _default() { if (member_destructor_) @@ -11052,43 +11106,45 @@ class Union_Discriminator_enum_labels selected_member_ = 0x0FFFFFFFu; } + private: - int16_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int16_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int16_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int16_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } InnerEnumHelper m__d {InnerEnumHelper::ENUM_VALUE_3}; @@ -11139,13 +11195,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } } @@ -11161,13 +11217,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } } @@ -11183,13 +11239,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = x.m_first; - break; + case 0x00000001: + first_() = x.m_first; + break; - case 0x00000002: - second_() = x.m_second; - break; + case 0x00000002: + second_() = x.m_second; + break; } @@ -11207,13 +11263,13 @@ class Union_Discriminator_alias switch (x.selected_member_) { - case 0x00000001: - first_() = std::move(x.m_first); - break; + case 0x00000001: + first_() = std::move(x.m_first); + break; - case 0x00000002: - second_() = std::move(x.m_second); - break; + case 0x00000002: + second_() = std::move(x.m_second); + break; } @@ -11234,13 +11290,13 @@ class Union_Discriminator_alias { switch (selected_member_) { - case 0x00000001: - ret_value = (m_first == x.m_first); - break; + case 0x00000001: + ret_value = (m_first == x.m_first); + break; - case 0x00000002: - ret_value = (m_second == x.m_second); - break; + case 0x00000002: + ret_value = (m_second == x.m_second); + break; } } @@ -11270,26 +11326,25 @@ class Union_Discriminator_alias switch (__d) { - case 1: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 2: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 2: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11345,6 +11400,7 @@ class Union_Discriminator_alias return m_first; } + /*! * @brief This function sets a value in member second * @param _second New value for member second @@ -11386,6 +11442,7 @@ class Union_Discriminator_alias return m_second; } + void _default() { if (member_destructor_) @@ -11396,43 +11453,45 @@ class Union_Discriminator_alias selected_member_ = 0x0FFFFFFFu; } + private: - int32_t& first_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + int32_t& first_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_first = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_first = {0}; - } + } - return m_first; - } + return m_first; + } - int64_t& second_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int64_t& second_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_second = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_second = {0}; - } + } + + return m_second; + } - return m_second; - } InnerAliasHelper m__d {2147483647}; @@ -11483,25 +11542,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; } } @@ -11517,25 +11576,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; } } @@ -11551,25 +11610,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; } @@ -11587,25 +11646,25 @@ class Union_Several_Fields switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; } @@ -11626,25 +11685,25 @@ class Union_Several_Fields { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; - case 0x00000004: - ret_value = (m_d == x.m_d); - break; + case 0x00000004: + ret_value = (m_d == x.m_d); + break; - case 0x00000005: - ret_value = (m_e == x.m_e); - break; + case 0x00000005: + ret_value = (m_e == x.m_e); + break; } } @@ -11674,47 +11733,46 @@ class Union_Several_Fields switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000004 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 4: - if (0x00000005 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000004 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 4: + if (0x00000005 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -11781,6 +11839,7 @@ class Union_Several_Fields return m_a; } + /*! * @brief This function copies the value in member b * @param _b New value to be copied in member b @@ -11833,6 +11892,7 @@ class Union_Several_Fields return m_b; } + /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -11885,6 +11945,7 @@ class Union_Several_Fields return m_c; } + /*! * @brief This function copies the value in member d * @param _d New value to be copied in member d @@ -11937,6 +11998,7 @@ class Union_Several_Fields return m_d; } + /*! * @brief This function copies the value in member e * @param _e New value to be copied in member e @@ -11989,6 +12051,7 @@ class Union_Several_Fields return m_e; } + void _default() { if (member_destructor_) @@ -11999,112 +12062,99 @@ class Union_Several_Fields selected_member_ = 0x0FFFFFFFu; } + private: - InnerStructureHelper& a_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerStructureHelper& a_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_a.~InnerStructureHelper(); - }; - new(&m_a) InnerStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; + new(&m_a) InnerStructureHelper(); - return m_a; - } + } - InnerEmptyStructureHelper& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_a; } - selected_member_ = 0x00000002; - member_destructor_ = [&]() + InnerEmptyStructureHelper& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - m_b.~InnerEmptyStructureHelper(); - }; - new(&m_b) InnerEmptyStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; + new(&m_b) InnerEmptyStructureHelper(); - return m_b; - } + } - Inner_alias_bounded_string_helper& c_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_b; } - selected_member_ = 0x00000003; - member_destructor_ = [&]() + Inner_alias_bounded_string_helper& c_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) { - m_c.~Inner_alias_bounded_string_helper(); - }; - new(&m_c) Inner_alias_bounded_string_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; + new(&m_c) Inner_alias_bounded_string_helper(); - return m_c; - } + } - Inner_alias_array_helper& d_() - { - if (0x00000004 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_c; } - selected_member_ = 0x00000004; - member_destructor_ = [&]() + Inner_alias_array_helper& d_() + { + if (0x00000004 != selected_member_) + { + if (member_destructor_) { - m_d.~Inner_alias_array_helper(); - }; - new(&m_d) Inner_alias_array_helper(); - - } - - return m_d; - } + member_destructor_(); + } - Inner_alias_sequence_helper& e_() - { - if (0x00000005 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + selected_member_ = 0x00000004; + member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; + new(&m_d) Inner_alias_array_helper(); + + } + + return m_d; } - selected_member_ = 0x00000005; - member_destructor_ = [&]() + Inner_alias_sequence_helper& e_() + { + if (0x00000005 != selected_member_) + { + if (member_destructor_) { - m_e.~Inner_alias_sequence_helper(); - }; - new(&m_e) Inner_alias_sequence_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000005; + member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; + new(&m_e) Inner_alias_sequence_helper(); + + } + + return m_e; + } - return m_e; - } int32_t m__d {2147483647}; @@ -12135,10 +12185,7 @@ class Union_Several_Fields_With_Default eProsima_user_DllExport Union_Several_Fields_With_Default() { selected_member_ = 0x00000006; - member_destructor_ = [&]() - { - m_f.~vector(); - }; + member_destructor_ = [&]() {m_f.~vector();}; new(&m_f) std::vector(); } @@ -12165,29 +12212,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; - case 0x00000006: - f_() = x.m_f; - break; + case 0x00000006: + f_() = x.m_f; + break; } } @@ -12203,29 +12250,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; - case 0x00000006: - f_() = std::move(x.m_f); - break; + case 0x00000006: + f_() = std::move(x.m_f); + break; } } @@ -12241,29 +12288,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; - case 0x00000004: - d_() = x.m_d; - break; + case 0x00000004: + d_() = x.m_d; + break; - case 0x00000005: - e_() = x.m_e; - break; + case 0x00000005: + e_() = x.m_e; + break; - case 0x00000006: - f_() = x.m_f; - break; + case 0x00000006: + f_() = x.m_f; + break; } @@ -12281,29 +12328,29 @@ class Union_Several_Fields_With_Default switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; - case 0x00000004: - d_() = std::move(x.m_d); - break; + case 0x00000004: + d_() = std::move(x.m_d); + break; - case 0x00000005: - e_() = std::move(x.m_e); - break; + case 0x00000005: + e_() = std::move(x.m_e); + break; - case 0x00000006: - f_() = std::move(x.m_f); - break; + case 0x00000006: + f_() = std::move(x.m_f); + break; } @@ -12324,29 +12371,29 @@ class Union_Several_Fields_With_Default { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; - case 0x00000004: - ret_value = (m_d == x.m_d); - break; + case 0x00000004: + ret_value = (m_d == x.m_d); + break; - case 0x00000005: - ret_value = (m_e == x.m_e); - break; + case 0x00000005: + ret_value = (m_e == x.m_e); + break; - case 0x00000006: - ret_value = (m_f == x.m_f); - break; + case 0x00000006: + ret_value = (m_f == x.m_f); + break; } } @@ -12376,54 +12423,53 @@ class Union_Several_Fields_With_Default switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 2: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 3: - if (0x00000004 == selected_member_) - { - valid_discriminator = true; - } - break; - - case 4: - if (0x00000005 == selected_member_) - { - valid_discriminator = true; - } - break; - - default: - if (0x00000006 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 2: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 3: + if (0x00000004 == selected_member_) + { + valid_discriminator = true; + } + break; + + case 4: + if (0x00000005 == selected_member_) + { + valid_discriminator = true; + } + break; + + default: + if (0x00000006 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -12490,6 +12536,7 @@ class Union_Several_Fields_With_Default return m_a; } + /*! * @brief This function copies the value in member b * @param _b New value to be copied in member b @@ -12542,6 +12589,7 @@ class Union_Several_Fields_With_Default return m_b; } + /*! * @brief This function copies the value in member c * @param _c New value to be copied in member c @@ -12594,6 +12642,7 @@ class Union_Several_Fields_With_Default return m_c; } + /*! * @brief This function copies the value in member d * @param _d New value to be copied in member d @@ -12646,6 +12695,7 @@ class Union_Several_Fields_With_Default return m_d; } + /*! * @brief This function copies the value in member e * @param _e New value to be copied in member e @@ -12698,6 +12748,7 @@ class Union_Several_Fields_With_Default return m_e; } + /*! * @brief This function copies the value in member f * @param _f New value to be copied in member f @@ -12750,133 +12801,118 @@ class Union_Several_Fields_With_Default return m_f; } + + private: - InnerStructureHelper& a_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + InnerStructureHelper& a_() { - member_destructor_(); - } - - selected_member_ = 0x00000001; - member_destructor_ = [&]() + if (0x00000001 != selected_member_) + { + if (member_destructor_) { - m_a.~InnerStructureHelper(); - }; - new(&m_a) InnerStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000001; + member_destructor_ = [&]() {m_a.~InnerStructureHelper();}; + new(&m_a) InnerStructureHelper(); - return m_a; - } + } - InnerEmptyStructureHelper& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_a; } - selected_member_ = 0x00000002; - member_destructor_ = [&]() + InnerEmptyStructureHelper& b_() + { + if (0x00000002 != selected_member_) + { + if (member_destructor_) { - m_b.~InnerEmptyStructureHelper(); - }; - new(&m_b) InnerEmptyStructureHelper(); + member_destructor_(); + } - } + selected_member_ = 0x00000002; + member_destructor_ = [&]() {m_b.~InnerEmptyStructureHelper();}; + new(&m_b) InnerEmptyStructureHelper(); - return m_b; - } + } - Inner_alias_bounded_string_helper& c_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_b; } - selected_member_ = 0x00000003; - member_destructor_ = [&]() + Inner_alias_bounded_string_helper& c_() + { + if (0x00000003 != selected_member_) + { + if (member_destructor_) { - m_c.~Inner_alias_bounded_string_helper(); - }; - new(&m_c) Inner_alias_bounded_string_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000003; + member_destructor_ = [&]() {m_c.~Inner_alias_bounded_string_helper();}; + new(&m_c) Inner_alias_bounded_string_helper(); - return m_c; - } + } - Inner_alias_array_helper& d_() - { - if (0x00000004 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_c; } - selected_member_ = 0x00000004; - member_destructor_ = [&]() + Inner_alias_array_helper& d_() + { + if (0x00000004 != selected_member_) + { + if (member_destructor_) { - m_d.~Inner_alias_array_helper(); - }; - new(&m_d) Inner_alias_array_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000004; + member_destructor_ = [&]() {m_d.~Inner_alias_array_helper();}; + new(&m_d) Inner_alias_array_helper(); - return m_d; - } + } - Inner_alias_sequence_helper& e_() - { - if (0x00000005 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_d; } - selected_member_ = 0x00000005; - member_destructor_ = [&]() + Inner_alias_sequence_helper& e_() + { + if (0x00000005 != selected_member_) + { + if (member_destructor_) { - m_e.~Inner_alias_sequence_helper(); - }; - new(&m_e) Inner_alias_sequence_helper(); + member_destructor_(); + } - } + selected_member_ = 0x00000005; + member_destructor_ = [&]() {m_e.~Inner_alias_sequence_helper();}; + new(&m_e) Inner_alias_sequence_helper(); - return m_e; - } + } - std::vector& f_() - { - if (0x00000006 != selected_member_) - { - if (member_destructor_) - { - member_destructor_(); + return m_e; } - selected_member_ = 0x00000006; - member_destructor_ = [&]() + std::vector& f_() + { + if (0x00000006 != selected_member_) + { + if (member_destructor_) { - m_f.~vector(); - }; - new(&m_f) std::vector(); + member_destructor_(); + } - } + selected_member_ = 0x00000006; + member_destructor_ = [&]() {m_f.~vector();}; + new(&m_f) std::vector(); + + } + + return m_f; + } - return m_f; - } int32_t m__d {2147483647}; @@ -12923,7 +12959,7 @@ class UnionShort eProsima_user_DllExport UnionShort( const UnionShort& x) { - m_var_union_short = x.m_var_union_short; + m_var_union_short = x.m_var_union_short; } @@ -12945,7 +12981,7 @@ class UnionShort const UnionShort& x) { - m_var_union_short = x.m_var_union_short; + m_var_union_short = x.m_var_union_short; return *this; } @@ -13020,6 +13056,8 @@ class UnionShort return m_var_union_short; } + + private: Union_Short m_var_union_short; @@ -13054,7 +13092,7 @@ class UnionUShort eProsima_user_DllExport UnionUShort( const UnionUShort& x) { - m_var_union_ushort = x.m_var_union_ushort; + m_var_union_ushort = x.m_var_union_ushort; } @@ -13076,7 +13114,7 @@ class UnionUShort const UnionUShort& x) { - m_var_union_ushort = x.m_var_union_ushort; + m_var_union_ushort = x.m_var_union_ushort; return *this; } @@ -13151,6 +13189,8 @@ class UnionUShort return m_var_union_ushort; } + + private: Union_UShort m_var_union_ushort; @@ -13185,7 +13225,7 @@ class UnionLong eProsima_user_DllExport UnionLong( const UnionLong& x) { - m_var_union_long = x.m_var_union_long; + m_var_union_long = x.m_var_union_long; } @@ -13207,7 +13247,7 @@ class UnionLong const UnionLong& x) { - m_var_union_long = x.m_var_union_long; + m_var_union_long = x.m_var_union_long; return *this; } @@ -13282,6 +13322,8 @@ class UnionLong return m_var_union_long; } + + private: Union_Long m_var_union_long; @@ -13316,7 +13358,7 @@ class UnionULong eProsima_user_DllExport UnionULong( const UnionULong& x) { - m_var_union_ulong = x.m_var_union_ulong; + m_var_union_ulong = x.m_var_union_ulong; } @@ -13338,7 +13380,7 @@ class UnionULong const UnionULong& x) { - m_var_union_ulong = x.m_var_union_ulong; + m_var_union_ulong = x.m_var_union_ulong; return *this; } @@ -13413,6 +13455,8 @@ class UnionULong return m_var_union_ulong; } + + private: Union_ULong m_var_union_ulong; @@ -13447,7 +13491,7 @@ class UnionLongLong eProsima_user_DllExport UnionLongLong( const UnionLongLong& x) { - m_var_union_long_long = x.m_var_union_long_long; + m_var_union_long_long = x.m_var_union_long_long; } @@ -13469,7 +13513,7 @@ class UnionLongLong const UnionLongLong& x) { - m_var_union_long_long = x.m_var_union_long_long; + m_var_union_long_long = x.m_var_union_long_long; return *this; } @@ -13544,6 +13588,8 @@ class UnionLongLong return m_var_union_long_long; } + + private: Union_LongLong m_var_union_long_long; @@ -13578,7 +13624,7 @@ class UnionULongLong eProsima_user_DllExport UnionULongLong( const UnionULongLong& x) { - m_var_union_ulong_long = x.m_var_union_ulong_long; + m_var_union_ulong_long = x.m_var_union_ulong_long; } @@ -13600,7 +13646,7 @@ class UnionULongLong const UnionULongLong& x) { - m_var_union_ulong_long = x.m_var_union_ulong_long; + m_var_union_ulong_long = x.m_var_union_ulong_long; return *this; } @@ -13675,6 +13721,8 @@ class UnionULongLong return m_var_union_ulong_long; } + + private: Union_ULongLOng m_var_union_ulong_long; @@ -13709,7 +13757,7 @@ class UnionFloat eProsima_user_DllExport UnionFloat( const UnionFloat& x) { - m_var_union_float = x.m_var_union_float; + m_var_union_float = x.m_var_union_float; } @@ -13731,7 +13779,7 @@ class UnionFloat const UnionFloat& x) { - m_var_union_float = x.m_var_union_float; + m_var_union_float = x.m_var_union_float; return *this; } @@ -13806,6 +13854,8 @@ class UnionFloat return m_var_union_float; } + + private: Union_Float m_var_union_float; @@ -13840,7 +13890,7 @@ class UnionDouble eProsima_user_DllExport UnionDouble( const UnionDouble& x) { - m_var_union_double = x.m_var_union_double; + m_var_union_double = x.m_var_union_double; } @@ -13862,7 +13912,7 @@ class UnionDouble const UnionDouble& x) { - m_var_union_double = x.m_var_union_double; + m_var_union_double = x.m_var_union_double; return *this; } @@ -13937,6 +13987,8 @@ class UnionDouble return m_var_union_double; } + + private: Union_Double m_var_union_double; @@ -13971,7 +14023,7 @@ class UnionLongDouble eProsima_user_DllExport UnionLongDouble( const UnionLongDouble& x) { - m_var_union_long_double = x.m_var_union_long_double; + m_var_union_long_double = x.m_var_union_long_double; } @@ -13993,7 +14045,7 @@ class UnionLongDouble const UnionLongDouble& x) { - m_var_union_long_double = x.m_var_union_long_double; + m_var_union_long_double = x.m_var_union_long_double; return *this; } @@ -14068,6 +14120,8 @@ class UnionLongDouble return m_var_union_long_double; } + + private: Union_LongDouble m_var_union_long_double; @@ -14102,7 +14156,7 @@ class UnionBoolean eProsima_user_DllExport UnionBoolean( const UnionBoolean& x) { - m_var_union_boolean = x.m_var_union_boolean; + m_var_union_boolean = x.m_var_union_boolean; } @@ -14124,7 +14178,7 @@ class UnionBoolean const UnionBoolean& x) { - m_var_union_boolean = x.m_var_union_boolean; + m_var_union_boolean = x.m_var_union_boolean; return *this; } @@ -14199,6 +14253,8 @@ class UnionBoolean return m_var_union_boolean; } + + private: Union_Boolean m_var_union_boolean; @@ -14233,7 +14289,7 @@ class UnionOctet eProsima_user_DllExport UnionOctet( const UnionOctet& x) { - m_var_union_octet = x.m_var_union_octet; + m_var_union_octet = x.m_var_union_octet; } @@ -14255,7 +14311,7 @@ class UnionOctet const UnionOctet& x) { - m_var_union_octet = x.m_var_union_octet; + m_var_union_octet = x.m_var_union_octet; return *this; } @@ -14330,6 +14386,8 @@ class UnionOctet return m_var_union_octet; } + + private: Union_Octet m_var_union_octet; @@ -14364,7 +14422,7 @@ class UnionChar eProsima_user_DllExport UnionChar( const UnionChar& x) { - m_var_union_char = x.m_var_union_char; + m_var_union_char = x.m_var_union_char; } @@ -14386,7 +14444,7 @@ class UnionChar const UnionChar& x) { - m_var_union_char = x.m_var_union_char; + m_var_union_char = x.m_var_union_char; return *this; } @@ -14461,6 +14519,8 @@ class UnionChar return m_var_union_char; } + + private: Union_Char m_var_union_char; @@ -14495,7 +14555,7 @@ class UnionWChar eProsima_user_DllExport UnionWChar( const UnionWChar& x) { - m_var_union_wchar = x.m_var_union_wchar; + m_var_union_wchar = x.m_var_union_wchar; } @@ -14517,7 +14577,7 @@ class UnionWChar const UnionWChar& x) { - m_var_union_wchar = x.m_var_union_wchar; + m_var_union_wchar = x.m_var_union_wchar; return *this; } @@ -14592,6 +14652,8 @@ class UnionWChar return m_var_union_wchar; } + + private: Union_WChar m_var_union_wchar; @@ -14626,7 +14688,7 @@ class UnionString eProsima_user_DllExport UnionString( const UnionString& x) { - m_var_union_string = x.m_var_union_string; + m_var_union_string = x.m_var_union_string; } @@ -14648,7 +14710,7 @@ class UnionString const UnionString& x) { - m_var_union_string = x.m_var_union_string; + m_var_union_string = x.m_var_union_string; return *this; } @@ -14723,6 +14785,8 @@ class UnionString return m_var_union_string; } + + private: Union_String m_var_union_string; @@ -14757,7 +14821,7 @@ class UnionWString eProsima_user_DllExport UnionWString( const UnionWString& x) { - m_var_union_wstring = x.m_var_union_wstring; + m_var_union_wstring = x.m_var_union_wstring; } @@ -14779,7 +14843,7 @@ class UnionWString const UnionWString& x) { - m_var_union_wstring = x.m_var_union_wstring; + m_var_union_wstring = x.m_var_union_wstring; return *this; } @@ -14854,6 +14918,8 @@ class UnionWString return m_var_union_wstring; } + + private: Union_WString m_var_union_wstring; @@ -14888,7 +14954,7 @@ class UnionBoundedString eProsima_user_DllExport UnionBoundedString( const UnionBoundedString& x) { - m_var_union_bounded_string = x.m_var_union_bounded_string; + m_var_union_bounded_string = x.m_var_union_bounded_string; } @@ -14910,7 +14976,7 @@ class UnionBoundedString const UnionBoundedString& x) { - m_var_union_bounded_string = x.m_var_union_bounded_string; + m_var_union_bounded_string = x.m_var_union_bounded_string; return *this; } @@ -14985,6 +15051,8 @@ class UnionBoundedString return m_var_union_bounded_string; } + + private: Union_BoundedString m_var_union_bounded_string; @@ -15019,7 +15087,7 @@ class UnionBoundedWString eProsima_user_DllExport UnionBoundedWString( const UnionBoundedWString& x) { - m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; + m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; } @@ -15041,7 +15109,7 @@ class UnionBoundedWString const UnionBoundedWString& x) { - m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; + m_var_union_bounded_wstring = x.m_var_union_bounded_wstring; return *this; } @@ -15116,6 +15184,8 @@ class UnionBoundedWString return m_var_union_bounded_wstring; } + + private: Union_BoundedWString m_var_union_bounded_wstring; @@ -15150,7 +15220,7 @@ class UnionInnerEnumHelper eProsima_user_DllExport UnionInnerEnumHelper( const UnionInnerEnumHelper& x) { - m_var_union_my_enum = x.m_var_union_my_enum; + m_var_union_my_enum = x.m_var_union_my_enum; } @@ -15172,7 +15242,7 @@ class UnionInnerEnumHelper const UnionInnerEnumHelper& x) { - m_var_union_my_enum = x.m_var_union_my_enum; + m_var_union_my_enum = x.m_var_union_my_enum; return *this; } @@ -15247,6 +15317,8 @@ class UnionInnerEnumHelper return m_var_union_my_enum; } + + private: Union_InnerEnumHelper m_var_union_my_enum; @@ -15281,7 +15353,7 @@ class UnionInnerBitMaskHelper eProsima_user_DllExport UnionInnerBitMaskHelper( const UnionInnerBitMaskHelper& x) { - m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; + m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; } @@ -15303,7 +15375,7 @@ class UnionInnerBitMaskHelper const UnionInnerBitMaskHelper& x) { - m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; + m_var_union_my_bit_mask = x.m_var_union_my_bit_mask; return *this; } @@ -15378,6 +15450,8 @@ class UnionInnerBitMaskHelper return m_var_union_my_bit_mask; } + + private: Union_InnerBitMaskHelper m_var_union_my_bit_mask; @@ -15412,7 +15486,7 @@ class UnionInnerAliasHelper eProsima_user_DllExport UnionInnerAliasHelper( const UnionInnerAliasHelper& x) { - m_var_union_my_alias = x.m_var_union_my_alias; + m_var_union_my_alias = x.m_var_union_my_alias; } @@ -15434,7 +15508,7 @@ class UnionInnerAliasHelper const UnionInnerAliasHelper& x) { - m_var_union_my_alias = x.m_var_union_my_alias; + m_var_union_my_alias = x.m_var_union_my_alias; return *this; } @@ -15509,6 +15583,8 @@ class UnionInnerAliasHelper return m_var_union_my_alias; } + + private: Union_InnerAliasHelper m_var_union_my_alias; @@ -15543,7 +15619,7 @@ class UnionArray eProsima_user_DllExport UnionArray( const UnionArray& x) { - m_var_union_array = x.m_var_union_array; + m_var_union_array = x.m_var_union_array; } @@ -15565,7 +15641,7 @@ class UnionArray const UnionArray& x) { - m_var_union_array = x.m_var_union_array; + m_var_union_array = x.m_var_union_array; return *this; } @@ -15640,6 +15716,8 @@ class UnionArray return m_var_union_array; } + + private: Union_Array m_var_union_array; @@ -15674,7 +15752,7 @@ class UnionSequence eProsima_user_DllExport UnionSequence( const UnionSequence& x) { - m_var_union_sequence = x.m_var_union_sequence; + m_var_union_sequence = x.m_var_union_sequence; } @@ -15696,7 +15774,7 @@ class UnionSequence const UnionSequence& x) { - m_var_union_sequence = x.m_var_union_sequence; + m_var_union_sequence = x.m_var_union_sequence; return *this; } @@ -15771,6 +15849,8 @@ class UnionSequence return m_var_union_sequence; } + + private: Union_Sequence m_var_union_sequence; @@ -15805,7 +15885,7 @@ class UnionMap eProsima_user_DllExport UnionMap( const UnionMap& x) { - m_var_union_map = x.m_var_union_map; + m_var_union_map = x.m_var_union_map; } @@ -15827,7 +15907,7 @@ class UnionMap const UnionMap& x) { - m_var_union_map = x.m_var_union_map; + m_var_union_map = x.m_var_union_map; return *this; } @@ -15902,6 +15982,8 @@ class UnionMap return m_var_union_map; } + + private: Union_Map m_var_union_map; @@ -15936,7 +16018,7 @@ class UnionInnerUnionHelper eProsima_user_DllExport UnionInnerUnionHelper( const UnionInnerUnionHelper& x) { - m_var_union_my_union = x.m_var_union_my_union; + m_var_union_my_union = x.m_var_union_my_union; } @@ -15958,7 +16040,7 @@ class UnionInnerUnionHelper const UnionInnerUnionHelper& x) { - m_var_union_my_union = x.m_var_union_my_union; + m_var_union_my_union = x.m_var_union_my_union; return *this; } @@ -16033,6 +16115,8 @@ class UnionInnerUnionHelper return m_var_union_my_union; } + + private: Union_InnerUnionHelper m_var_union_my_union; @@ -16067,7 +16151,7 @@ class UnionInnerStructureHelper eProsima_user_DllExport UnionInnerStructureHelper( const UnionInnerStructureHelper& x) { - m_var_union_my_structure = x.m_var_union_my_structure; + m_var_union_my_structure = x.m_var_union_my_structure; } @@ -16089,7 +16173,7 @@ class UnionInnerStructureHelper const UnionInnerStructureHelper& x) { - m_var_union_my_structure = x.m_var_union_my_structure; + m_var_union_my_structure = x.m_var_union_my_structure; return *this; } @@ -16164,6 +16248,8 @@ class UnionInnerStructureHelper return m_var_union_my_structure; } + + private: Union_InnerStructureHelper m_var_union_my_structure; @@ -16198,7 +16284,7 @@ class UnionInnerBitsetHelper eProsima_user_DllExport UnionInnerBitsetHelper( const UnionInnerBitsetHelper& x) { - m_var_union_my_bitset = x.m_var_union_my_bitset; + m_var_union_my_bitset = x.m_var_union_my_bitset; } @@ -16220,7 +16306,7 @@ class UnionInnerBitsetHelper const UnionInnerBitsetHelper& x) { - m_var_union_my_bitset = x.m_var_union_my_bitset; + m_var_union_my_bitset = x.m_var_union_my_bitset; return *this; } @@ -16295,6 +16381,8 @@ class UnionInnerBitsetHelper return m_var_union_my_bitset; } + + private: Union_InnerBitsetHelper m_var_union_my_bitset; @@ -16329,7 +16417,7 @@ class UnionDiscriminatorShort eProsima_user_DllExport UnionDiscriminatorShort( const UnionDiscriminatorShort& x) { - m_var_union_discriminator_short = x.m_var_union_discriminator_short; + m_var_union_discriminator_short = x.m_var_union_discriminator_short; } @@ -16351,7 +16439,7 @@ class UnionDiscriminatorShort const UnionDiscriminatorShort& x) { - m_var_union_discriminator_short = x.m_var_union_discriminator_short; + m_var_union_discriminator_short = x.m_var_union_discriminator_short; return *this; } @@ -16426,6 +16514,8 @@ class UnionDiscriminatorShort return m_var_union_discriminator_short; } + + private: Union_Discriminator_short m_var_union_discriminator_short; @@ -16460,7 +16550,7 @@ class UnionDiscriminatorUShort eProsima_user_DllExport UnionDiscriminatorUShort( const UnionDiscriminatorUShort& x) { - m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; + m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; } @@ -16482,7 +16572,7 @@ class UnionDiscriminatorUShort const UnionDiscriminatorUShort& x) { - m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; + m_var_union_discriminator_ushort = x.m_var_union_discriminator_ushort; return *this; } @@ -16557,6 +16647,8 @@ class UnionDiscriminatorUShort return m_var_union_discriminator_ushort; } + + private: Union_Discriminator_unsigned_short m_var_union_discriminator_ushort; @@ -16591,7 +16683,7 @@ class UnionDiscriminatorLong eProsima_user_DllExport UnionDiscriminatorLong( const UnionDiscriminatorLong& x) { - m_var_union_discriminator_long = x.m_var_union_discriminator_long; + m_var_union_discriminator_long = x.m_var_union_discriminator_long; } @@ -16613,7 +16705,7 @@ class UnionDiscriminatorLong const UnionDiscriminatorLong& x) { - m_var_union_discriminator_long = x.m_var_union_discriminator_long; + m_var_union_discriminator_long = x.m_var_union_discriminator_long; return *this; } @@ -16688,6 +16780,8 @@ class UnionDiscriminatorLong return m_var_union_discriminator_long; } + + private: Union_Discriminator_long m_var_union_discriminator_long; @@ -16722,7 +16816,7 @@ class UnionDiscriminatorULong eProsima_user_DllExport UnionDiscriminatorULong( const UnionDiscriminatorULong& x) { - m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; + m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; } @@ -16744,7 +16838,7 @@ class UnionDiscriminatorULong const UnionDiscriminatorULong& x) { - m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; + m_var_union_discriminator_ulong = x.m_var_union_discriminator_ulong; return *this; } @@ -16819,6 +16913,8 @@ class UnionDiscriminatorULong return m_var_union_discriminator_ulong; } + + private: Union_Discriminator_unsigned_long m_var_union_discriminator_ulong; @@ -16853,7 +16949,7 @@ class UnionDiscriminatorLongLong eProsima_user_DllExport UnionDiscriminatorLongLong( const UnionDiscriminatorLongLong& x) { - m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; + m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; } @@ -16875,7 +16971,7 @@ class UnionDiscriminatorLongLong const UnionDiscriminatorLongLong& x) { - m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; + m_var_union_discriminator_long_long = x.m_var_union_discriminator_long_long; return *this; } @@ -16950,6 +17046,8 @@ class UnionDiscriminatorLongLong return m_var_union_discriminator_long_long; } + + private: Union_Discriminator_long_long m_var_union_discriminator_long_long; @@ -16984,7 +17082,7 @@ class UnionDiscriminatorULongLong eProsima_user_DllExport UnionDiscriminatorULongLong( const UnionDiscriminatorULongLong& x) { - m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; + m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; } @@ -17006,7 +17104,7 @@ class UnionDiscriminatorULongLong const UnionDiscriminatorULongLong& x) { - m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; + m_var_union_discriminator_ulong_long = x.m_var_union_discriminator_ulong_long; return *this; } @@ -17081,6 +17179,8 @@ class UnionDiscriminatorULongLong return m_var_union_discriminator_ulong_long; } + + private: Union_Discriminator_unsigned_long_long m_var_union_discriminator_ulong_long; @@ -17115,7 +17215,7 @@ class UnionDiscriminatorBoolean eProsima_user_DllExport UnionDiscriminatorBoolean( const UnionDiscriminatorBoolean& x) { - m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; + m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; } @@ -17137,7 +17237,7 @@ class UnionDiscriminatorBoolean const UnionDiscriminatorBoolean& x) { - m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; + m_var_union_discriminator_boolean = x.m_var_union_discriminator_boolean; return *this; } @@ -17212,6 +17312,8 @@ class UnionDiscriminatorBoolean return m_var_union_discriminator_boolean; } + + private: Union_Discriminator_boolean m_var_union_discriminator_boolean; @@ -17246,7 +17348,7 @@ class UnionDiscriminatorOctet eProsima_user_DllExport UnionDiscriminatorOctet( const UnionDiscriminatorOctet& x) { - m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; + m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; } @@ -17268,7 +17370,7 @@ class UnionDiscriminatorOctet const UnionDiscriminatorOctet& x) { - m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; + m_var_union_discriminator_octet = x.m_var_union_discriminator_octet; return *this; } @@ -17343,6 +17445,8 @@ class UnionDiscriminatorOctet return m_var_union_discriminator_octet; } + + private: Union_Discriminator_octet m_var_union_discriminator_octet; @@ -17377,7 +17481,7 @@ class UnionDiscriminatorChar eProsima_user_DllExport UnionDiscriminatorChar( const UnionDiscriminatorChar& x) { - m_var_union_discriminator_char = x.m_var_union_discriminator_char; + m_var_union_discriminator_char = x.m_var_union_discriminator_char; } @@ -17399,7 +17503,7 @@ class UnionDiscriminatorChar const UnionDiscriminatorChar& x) { - m_var_union_discriminator_char = x.m_var_union_discriminator_char; + m_var_union_discriminator_char = x.m_var_union_discriminator_char; return *this; } @@ -17474,6 +17578,8 @@ class UnionDiscriminatorChar return m_var_union_discriminator_char; } + + private: Union_Discriminator_char m_var_union_discriminator_char; @@ -17508,7 +17614,7 @@ class UnionDiscriminatorWChar eProsima_user_DllExport UnionDiscriminatorWChar( const UnionDiscriminatorWChar& x) { - m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; + m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; } @@ -17530,7 +17636,7 @@ class UnionDiscriminatorWChar const UnionDiscriminatorWChar& x) { - m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; + m_var_union_discriminator_wchar = x.m_var_union_discriminator_wchar; return *this; } @@ -17605,6 +17711,8 @@ class UnionDiscriminatorWChar return m_var_union_discriminator_wchar; } + + private: Union_Discriminator_wchar m_var_union_discriminator_wchar; @@ -17639,7 +17747,7 @@ class UnionDiscriminatorEnum eProsima_user_DllExport UnionDiscriminatorEnum( const UnionDiscriminatorEnum& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; } @@ -17661,7 +17769,7 @@ class UnionDiscriminatorEnum const UnionDiscriminatorEnum& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; return *this; } @@ -17736,6 +17844,8 @@ class UnionDiscriminatorEnum return m_var_union_discriminator_enum; } + + private: Union_Discriminator_enum m_var_union_discriminator_enum; @@ -17770,7 +17880,7 @@ class UnionDiscriminatorEnumLabel eProsima_user_DllExport UnionDiscriminatorEnumLabel( const UnionDiscriminatorEnumLabel& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; } @@ -17792,7 +17902,7 @@ class UnionDiscriminatorEnumLabel const UnionDiscriminatorEnumLabel& x) { - m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; + m_var_union_discriminator_enum = x.m_var_union_discriminator_enum; return *this; } @@ -17867,6 +17977,8 @@ class UnionDiscriminatorEnumLabel return m_var_union_discriminator_enum; } + + private: Union_Discriminator_enum_labels m_var_union_discriminator_enum; @@ -17901,7 +18013,7 @@ class UnionDiscriminatorAlias eProsima_user_DllExport UnionDiscriminatorAlias( const UnionDiscriminatorAlias& x) { - m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; + m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; } @@ -17923,7 +18035,7 @@ class UnionDiscriminatorAlias const UnionDiscriminatorAlias& x) { - m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; + m_var_union_discriminator_alias = x.m_var_union_discriminator_alias; return *this; } @@ -17998,6 +18110,8 @@ class UnionDiscriminatorAlias return m_var_union_discriminator_alias; } + + private: Union_Discriminator_alias m_var_union_discriminator_alias; @@ -18032,7 +18146,7 @@ class UnionSeveralFields eProsima_user_DllExport UnionSeveralFields( const UnionSeveralFields& x) { - m_var_union_several_fields = x.m_var_union_several_fields; + m_var_union_several_fields = x.m_var_union_several_fields; } @@ -18054,7 +18168,7 @@ class UnionSeveralFields const UnionSeveralFields& x) { - m_var_union_several_fields = x.m_var_union_several_fields; + m_var_union_several_fields = x.m_var_union_several_fields; return *this; } @@ -18129,6 +18243,8 @@ class UnionSeveralFields return m_var_union_several_fields; } + + private: Union_Several_Fields m_var_union_several_fields; @@ -18163,7 +18279,7 @@ class UnionSeveralFieldsWithDefault eProsima_user_DllExport UnionSeveralFieldsWithDefault( const UnionSeveralFieldsWithDefault& x) { - m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; + m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; } @@ -18185,7 +18301,7 @@ class UnionSeveralFieldsWithDefault const UnionSeveralFieldsWithDefault& x) { - m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; + m_var_union_several_fields_with_default = x.m_var_union_several_fields_with_default; return *this; } @@ -18260,6 +18376,8 @@ class UnionSeveralFieldsWithDefault return m_var_union_several_fields_with_default; } + + private: Union_Several_Fields_With_Default m_var_union_several_fields_with_default; @@ -18306,17 +18424,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; } } @@ -18332,17 +18450,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; } } @@ -18358,17 +18476,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; - case 0x00000003: - c_() = x.m_c; - break; + case 0x00000003: + c_() = x.m_c; + break; } @@ -18386,17 +18504,17 @@ class DefaultAnnotation switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; - case 0x00000003: - c_() = std::move(x.m_c); - break; + case 0x00000003: + c_() = std::move(x.m_c); + break; } @@ -18417,17 +18535,17 @@ class DefaultAnnotation { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; - case 0x00000003: - ret_value = (m_c == x.m_c); - break; + case 0x00000003: + ret_value = (m_c == x.m_c); + break; } } @@ -18457,33 +18575,32 @@ class DefaultAnnotation switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; - default: - if (0x00000003 == selected_member_) - { - valid_discriminator = true; - } - break; + default: + if (0x00000003 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -18539,6 +18656,7 @@ class DefaultAnnotation return m_a; } + /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -18580,6 +18698,7 @@ class DefaultAnnotation return m_b; } + /*! * @brief This function sets a value in member c * @param _c New value for member c @@ -18621,61 +18740,64 @@ class DefaultAnnotation return m_c; } + + private: - uint8_t& a_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint8_t& a_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - } + } - return m_a; - } + return m_a; + } - int16_t& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int16_t& b_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_b = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_b = {0}; - } + } - return m_b; - } + return m_b; + } - int32_t& c_() - { - if (0x00000003 != selected_member_) - { - if (member_destructor_) + int32_t& c_() { - member_destructor_(); - } + if (0x00000003 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000003; - member_destructor_ = nullptr; - m_c = {0}; + selected_member_ = 0x00000003; + member_destructor_ = nullptr; + m_c = {0}; - } + } + + return m_c; + } - return m_c; - } int32_t m__d {0}; @@ -18727,13 +18849,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; } } @@ -18749,13 +18871,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; } } @@ -18771,13 +18893,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = x.m_a; - break; + case 0x00000001: + a_() = x.m_a; + break; - case 0x00000002: - b_() = x.m_b; - break; + case 0x00000002: + b_() = x.m_b; + break; } @@ -18795,13 +18917,13 @@ class DefaultAnnotationExternalValue switch (x.selected_member_) { - case 0x00000001: - a_() = std::move(x.m_a); - break; + case 0x00000001: + a_() = std::move(x.m_a); + break; - case 0x00000002: - b_() = std::move(x.m_b); - break; + case 0x00000002: + b_() = std::move(x.m_b); + break; } @@ -18822,13 +18944,13 @@ class DefaultAnnotationExternalValue { switch (selected_member_) { - case 0x00000001: - ret_value = (m_a == x.m_a); - break; + case 0x00000001: + ret_value = (m_a == x.m_a); + break; - case 0x00000002: - ret_value = (m_b == x.m_b); - break; + case 0x00000002: + ret_value = (m_b == x.m_b); + break; } } @@ -18858,26 +18980,25 @@ class DefaultAnnotationExternalValue switch (__d) { - case 0: - if (0x00000001 == selected_member_) - { - valid_discriminator = true; - } - break; + case 0: + if (0x00000001 == selected_member_) + { + valid_discriminator = true; + } + break; - case 1: - if (0x00000002 == selected_member_) - { - valid_discriminator = true; - } - break; + case 1: + if (0x00000002 == selected_member_) + { + valid_discriminator = true; + } + break; } if (!valid_discriminator) { - throw eprosima::fastcdr::exception::BadParamException( - "Discriminator doesn't correspond with the selected union member"); + throw eprosima::fastcdr::exception::BadParamException("Discriminator doesn't correspond with the selected union member"); } m__d = __d; @@ -18933,6 +19054,7 @@ class DefaultAnnotationExternalValue return m_a; } + /*! * @brief This function sets a value in member b * @param _b New value for member b @@ -18974,6 +19096,7 @@ class DefaultAnnotationExternalValue return m_b; } + void _default() { if (member_destructor_) @@ -18984,43 +19107,45 @@ class DefaultAnnotationExternalValue selected_member_ = 0x0FFFFFFFu; } + private: - uint8_t& a_() - { - if (0x00000001 != selected_member_) - { - if (member_destructor_) + uint8_t& a_() { - member_destructor_(); - } + if (0x00000001 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000001; - member_destructor_ = nullptr; - m_a = {0}; + selected_member_ = 0x00000001; + member_destructor_ = nullptr; + m_a = {0}; - } + } - return m_a; - } + return m_a; + } - int16_t& b_() - { - if (0x00000002 != selected_member_) - { - if (member_destructor_) + int16_t& b_() { - member_destructor_(); - } + if (0x00000002 != selected_member_) + { + if (member_destructor_) + { + member_destructor_(); + } - selected_member_ = 0x00000002; - member_destructor_ = nullptr; - m_b = {0}; + selected_member_ = 0x00000002; + member_destructor_ = nullptr; + m_b = {0}; - } + } + + return m_b; + } - return m_b; - } int32_t m__d {2}; diff --git a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp index 2efe2fac..ff2c281c 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollection.hpp @@ -88,11 +88,11 @@ class DynamicType eProsima_user_DllExport DynamicType( const DynamicType& x) { - m_type_name = x.m_type_name; + m_type_name = x.m_type_name; - m_type_identifier = x.m_type_identifier; + m_type_identifier = x.m_type_identifier; - m_type_object = x.m_type_object; + m_type_object = x.m_type_object; } @@ -116,11 +116,11 @@ class DynamicType const DynamicType& x) { - m_type_name = x.m_type_name; + m_type_name = x.m_type_name; - m_type_identifier = x.m_type_identifier; + m_type_identifier = x.m_type_identifier; - m_type_object = x.m_type_object; + m_type_object = x.m_type_object; return *this; } @@ -147,8 +147,8 @@ class DynamicType const DynamicType& x) const { return (m_type_name == x.m_type_name && - m_type_identifier == x.m_type_identifier && - m_type_object == x.m_type_object); + m_type_identifier == x.m_type_identifier && + m_type_object == x.m_type_object); } /*! @@ -199,6 +199,7 @@ class DynamicType return m_type_name; } + /*! * @brief This function copies the value in member type_identifier * @param _type_identifier New value to be copied in member type_identifier @@ -237,6 +238,7 @@ class DynamicType return m_type_identifier; } + /*! * @brief This function copies the value in member type_object * @param _type_object New value to be copied in member type_object @@ -275,6 +277,8 @@ class DynamicType return m_type_object; } + + private: std::string m_type_name; @@ -311,7 +315,7 @@ class DynamicTypesCollection eProsima_user_DllExport DynamicTypesCollection( const DynamicTypesCollection& x) { - m_dynamic_types = x.m_dynamic_types; + m_dynamic_types = x.m_dynamic_types; } @@ -333,7 +337,7 @@ class DynamicTypesCollection const DynamicTypesCollection& x) { - m_dynamic_types = x.m_dynamic_types; + m_dynamic_types = x.m_dynamic_types; return *this; } @@ -408,6 +412,8 @@ class DynamicTypesCollection return m_dynamic_types; } + + private: std::vector m_dynamic_types; diff --git a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp index 4077fedb..612a4984 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/types/dynamic_types_collection/DynamicTypesCollectionPubSubTypes.hpp @@ -37,173 +37,176 @@ Generated DynamicTypesCollection is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen. #endif // FASTDDS_GEN_API_VER -namespace eprosima { -namespace ddsenabler { -namespace participants { - -/*! - * @brief This class represents the TopicDataType of the type DynamicType defined by the user in the IDL file. - * @ingroup DynamicTypesCollection - */ -class DynamicTypePubSubType : public eprosima::fastdds::dds::TopicDataType +namespace eprosima { -public: + namespace ddsenabler + { + namespace participants + { - typedef DynamicType type; + /*! + * @brief This class represents the TopicDataType of the type DynamicType defined by the user in the IDL file. + * @ingroup DynamicTypesCollection + */ + class DynamicTypePubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - eProsima_user_DllExport DynamicTypePubSubType(); + typedef DynamicType type; - eProsima_user_DllExport ~DynamicTypePubSubType() override; + eProsima_user_DllExport DynamicTypePubSubType(); - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport ~DynamicTypePubSubType() override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void* create_data() override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + eProsima_user_DllExport void delete_data( + void* data) override; + + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; + }; -/*! - * @brief This class represents the TopicDataType of the type DynamicTypesCollection defined by the user in the IDL file. - * @ingroup DynamicTypesCollection - */ -class DynamicTypesCollectionPubSubType : public eprosima::fastdds::dds::TopicDataType -{ -public: + /*! + * @brief This class represents the TopicDataType of the type DynamicTypesCollection defined by the user in the IDL file. + * @ingroup DynamicTypesCollection + */ + class DynamicTypesCollectionPubSubType : public eprosima::fastdds::dds::TopicDataType + { + public: - typedef DynamicTypesCollection type; + typedef DynamicTypesCollection type; - eProsima_user_DllExport DynamicTypesCollectionPubSubType(); + eProsima_user_DllExport DynamicTypesCollectionPubSubType(); - eProsima_user_DllExport ~DynamicTypesCollectionPubSubType() override; + eProsima_user_DllExport ~DynamicTypesCollectionPubSubType() override; - eProsima_user_DllExport bool serialize( - const void* const data, - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport bool serialize( + const void* const data, + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool deserialize( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - void* data) override; + eProsima_user_DllExport bool deserialize( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + void* data) override; - eProsima_user_DllExport uint32_t calculate_serialized_size( - const void* const data, - eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; + eProsima_user_DllExport uint32_t calculate_serialized_size( + const void* const data, + eprosima::fastdds::dds::DataRepresentationId_t data_representation) override; - eProsima_user_DllExport bool compute_key( - eprosima::fastdds::rtps::SerializedPayload_t& payload, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + eprosima::fastdds::rtps::SerializedPayload_t& payload, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport bool compute_key( - const void* const data, - eprosima::fastdds::rtps::InstanceHandle_t& ihandle, - bool force_md5 = false) override; + eProsima_user_DllExport bool compute_key( + const void* const data, + eprosima::fastdds::rtps::InstanceHandle_t& ihandle, + bool force_md5 = false) override; - eProsima_user_DllExport void* create_data() override; + eProsima_user_DllExport void* create_data() override; - eProsima_user_DllExport void delete_data( - void* data) override; + eProsima_user_DllExport void delete_data( + void* data) override; - //Register TypeObject representation in Fast DDS TypeObjectRegistry - eProsima_user_DllExport void register_type_object_representation() override; + //Register TypeObject representation in Fast DDS TypeObjectRegistry + eProsima_user_DllExport void register_type_object_representation() override; #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED - eProsima_user_DllExport inline bool is_bounded() const override - { - return false; - } + eProsima_user_DllExport inline bool is_bounded() const override + { + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN - eProsima_user_DllExport inline bool is_plain( - eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override - { - static_cast(data_representation); - return false; - } + eProsima_user_DllExport inline bool is_plain( + eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override + { + static_cast(data_representation); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE - eProsima_user_DllExport inline bool construct_sample( - void* memory) const override - { - static_cast(memory); - return false; - } + eProsima_user_DllExport inline bool construct_sample( + void* memory) const override + { + static_cast(memory); + return false; + } #endif // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE -private: + private: - eprosima::fastdds::MD5 md5_; - unsigned char* key_buffer_; + eprosima::fastdds::MD5 md5_; + unsigned char* key_buffer_; -}; -} // namespace participants -} // namespace ddsenabler + }; + } // namespace participants + } // namespace ddsenabler } // namespace eprosima #endif // FAST_DDS_GENERATED__EPROSIMA_DDSENABLER_PARTICIPANTS_DYNAMICTYPESCOLLECTION_PUBSUBTYPES_HPP diff --git a/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp b/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp index 5d7eeef5..840fc12b 100644 --- a/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp +++ b/ddsenabler_participants/test/types/DDSEnablerTestTypes.hpp @@ -81,7 +81,7 @@ class DDSEnablerTestType1 eProsima_user_DllExport DDSEnablerTestType1( const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -103,7 +103,7 @@ class DDSEnablerTestType1 const DDSEnablerTestType1& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -168,6 +168,8 @@ class DDSEnablerTestType1 return m_value; } + + private: int16_t m_value{0}; @@ -202,7 +204,7 @@ class DDSEnablerTestType2 eProsima_user_DllExport DDSEnablerTestType2( const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -224,7 +226,7 @@ class DDSEnablerTestType2 const DDSEnablerTestType2& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -299,6 +301,8 @@ class DDSEnablerTestType2 return m_value; } + + private: std::string m_value; @@ -333,7 +337,7 @@ class DDSEnablerTestType3 eProsima_user_DllExport DDSEnablerTestType3( const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -355,7 +359,7 @@ class DDSEnablerTestType3 const DDSEnablerTestType3& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -430,6 +434,8 @@ class DDSEnablerTestType3 return m_value; } + + private: std::array m_value{0}; @@ -464,7 +470,7 @@ class DDSEnablerTestType4 eProsima_user_DllExport DDSEnablerTestType4( const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; } @@ -486,7 +492,7 @@ class DDSEnablerTestType4 const DDSEnablerTestType4& x) { - m_value = x.m_value; + m_value = x.m_value; return *this; } @@ -561,6 +567,8 @@ class DDSEnablerTestType4 return m_value; } + + private: DDSEnablerTestType1 m_value; From 0cbd98e731aac9a36e898178b950b2d8eaab3042 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 28 Oct 2025 15:15:10 +0100 Subject: [PATCH 72/87] Update publish example Signed-off-by: Eugenio Collado --- ddsenabler/examples/CMakeLists.txt | 2 +- ddsenabler/examples/action/CMakeLists.txt | 4 +-- ddsenabler/examples/action/Readme.md | 10 +++--- ddsenabler/examples/action/config_action.yml | 11 ------- .../persistence/topics/rt_chatter.bin | Bin 0 -> 101 bytes .../types/std_msgs__msg__dds___String_.bin | Bin 0 -> 193 bytes ddsenabler/examples/publish/CLIParser.hpp | 6 ---- ddsenabler/examples/publish/CMakeLists.txt | 30 ++++-------------- ddsenabler/examples/publish/Readme.md | 30 ++++++++++++++++++ ddsenabler/examples/publish/config.yml | 26 --------------- ddsenabler/examples/publish/main.cpp | 13 ++++++-- ddsenabler/examples/publish/samples/1 | 3 ++ ddsenabler/examples/publish/samples/2 | 3 ++ ddsenabler/examples/publish/samples/3 | 3 ++ ddsenabler/examples/publish/samples/4 | 3 ++ ddsenabler/examples/publish/samples/5 | 3 ++ ddsenabler/examples/service/CMakeLists.txt | 4 +-- ddsenabler/examples/service/Readme.md | 10 +++--- .../examples/service/config_service.yml | 11 ------- .../docs/ddsenabler/installation/linux.rst | 2 +- .../actions/action_client/compose.yml | 2 +- .../actions/action_client_cancel/compose.yml | 2 +- .../actions/action_server/compose.yml | 2 +- .../publish/discovered_type/compose.yml | 2 +- .../publish/requested_type/compose.yml | 2 +- .../reception/topics_json/compose.yml | 2 +- .../reception/topics_yaml/compose.yml | 2 +- .../services/service_client/compose.yml | 2 +- .../services/service_server/compose.yml | 2 +- 29 files changed, 87 insertions(+), 105 deletions(-) delete mode 100644 ddsenabler/examples/action/config_action.yml create mode 100644 ddsenabler/examples/persistence/topics/rt_chatter.bin create mode 100644 ddsenabler/examples/persistence/types/std_msgs__msg__dds___String_.bin create mode 100644 ddsenabler/examples/publish/Readme.md delete mode 100644 ddsenabler/examples/publish/config.yml create mode 100644 ddsenabler/examples/publish/samples/1 create mode 100644 ddsenabler/examples/publish/samples/2 create mode 100644 ddsenabler/examples/publish/samples/3 create mode 100644 ddsenabler/examples/publish/samples/4 create mode 100644 ddsenabler/examples/publish/samples/5 delete mode 100644 ddsenabler/examples/service/config_service.yml diff --git a/ddsenabler/examples/CMakeLists.txt b/ddsenabler/examples/CMakeLists.txt index 9c3f04aa..8d8fa754 100644 --- a/ddsenabler/examples/CMakeLists.txt +++ b/ddsenabler/examples/CMakeLists.txt @@ -15,7 +15,7 @@ # Install persistence directory install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/persistence - DESTINATION bin + DESTINATION examples ) # Add subdirectories for examples diff --git a/ddsenabler/examples/action/CMakeLists.txt b/ddsenabler/examples/action/CMakeLists.txt index 1d687b66..97e1d660 100644 --- a/ddsenabler/examples/action/CMakeLists.txt +++ b/ddsenabler/examples/action/CMakeLists.txt @@ -22,11 +22,11 @@ target_link_libraries(ddsenabler_example_action PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_action - RUNTIME DESTINATION bin/examples/action + RUNTIME DESTINATION examples/action ) # Install goals directory install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/goals - DESTINATION bin/examples/action + DESTINATION examples/action ) diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 36c77657..3372c601 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -10,9 +10,9 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/examples/action/ddsenabler_example_action client \ - --persistence-path ./install/ddsenabler/bin/examples/persistence/ \ - --goals-path ./install/ddsenabler/bin/examples/action/goals/ \ +./install/ddsenabler/examples/action/ddsenabler_example_action client \ + --persistence-path ./install/ddsenabler/examples/persistence/ \ + --goals-path ./install/ddsenabler/examples/action/goals/ \ --request-initial-wait 3 \ --cancel-requests false --config $PATH_TO_CONFIG_FILE @@ -20,8 +20,8 @@ Users are encouraged to implement their own functional server logic as needed in ### SERVER ```bash -./install/ddsenabler/bin/examples/action/ddsenabler_example_action server \ - --persistence-path ./install/ddsenabler/bin/examples/persistence/ +./install/ddsenabler/examples/action/ddsenabler_example_action server \ + --persistence-path ./install/ddsenabler/examples/persistence/ --config $PATH_TO_CONFIG_FILE --expected-requests N ``` diff --git a/ddsenabler/examples/action/config_action.yml b/ddsenabler/examples/action/config_action.yml deleted file mode 100644 index 17cbb176..00000000 --- a/ddsenabler/examples/action/config_action.yml +++ /dev/null @@ -1,11 +0,0 @@ -dds: - domain: 0 - -ddsenabler: - initial-publish-wait: 500 - -specs: - threads: 12 - logging: - stdout: false - verbosity: error diff --git a/ddsenabler/examples/persistence/topics/rt_chatter.bin b/ddsenabler/examples/persistence/topics/rt_chatter.bin new file mode 100644 index 0000000000000000000000000000000000000000..87325663519f4c82f8a57ab576052e0f241048e9 GIT binary patch literal 101 zcmX|$!3lsc3;_G?3_dzXe$LUd;lVgG2!d&!Xz`(&ZGqoRvrLs zn0BP1wY3$3RR|(m2yq&RM^_hI!8(yKJ70gzko5yK(*ZFET>oL_KSWGpjTtsP zEs$GwIg!$)JSSZ>y?y7$XaBlJiDAzviu --timeout 5 + --config $PATH_TO_CONFIG_FILE +``` + +### SUBSCRIBER +```bash +./install/ddsenabler/examples/publish/ddsenabler_example_publish \ + --persistence-path ./install/ddsenabler/examples/persistence/ \ + --expected-types 1 \ + --expected-topics 1 \ + --expected-data 5 + --timeout 5 + --config $PATH_TO_CONFIG_FILE +``` diff --git a/ddsenabler/examples/publish/config.yml b/ddsenabler/examples/publish/config.yml deleted file mode 100644 index 5cc4050d..00000000 --- a/ddsenabler/examples/publish/config.yml +++ /dev/null @@ -1,26 +0,0 @@ -dds: - domain: 0 - - allowlist: - - name: "topic_name" - - name: "HelloWorldTopic" - type: "HelloWorld" - - blocklist: - - name: "topic_to_block" - type: "type_to_block" - - topics: - - name: "temperature/*" - type: "temperature/types/*" - qos: - max-rx-rate: 15 - downsampling: 2 - - ignore-participant-flags: filter_same_process - transport: shm - whitelist-interfaces: - - "127.0.0.1" - -ddsenabler: - initial-publish-wait: 500 diff --git a/ddsenabler/examples/publish/main.cpp b/ddsenabler/examples/publish/main.cpp index 0a1b2bfc..e144dd75 100644 --- a/ddsenabler/examples/publish/main.cpp +++ b/ddsenabler/examples/publish/main.cpp @@ -306,9 +306,18 @@ int main( }; std::shared_ptr enabler; - if (!create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler)) + bool enabler_created = false; + if (config.config_file_path.empty()) { - std::cerr << "Failed to create DDS Enabler with the provided configuration." << std::endl; + enabler_created = create_dds_enabler(yaml::EnablerConfiguration(""), callbacks, enabler); + } + else + { + enabler_created = create_dds_enabler(config.config_file_path.c_str(), callbacks, enabler); + } + if (!enabler_created) + { + std::cerr << "Failed to create DDSEnabler instance." << std::endl; return EXIT_FAILURE; } diff --git a/ddsenabler/examples/publish/samples/1 b/ddsenabler/examples/publish/samples/1 new file mode 100644 index 00000000..2f813e6c --- /dev/null +++ b/ddsenabler/examples/publish/samples/1 @@ -0,0 +1,3 @@ +{ + "data": "Hello World: 1" +} diff --git a/ddsenabler/examples/publish/samples/2 b/ddsenabler/examples/publish/samples/2 new file mode 100644 index 00000000..35641d7f --- /dev/null +++ b/ddsenabler/examples/publish/samples/2 @@ -0,0 +1,3 @@ +{ + "data": "Hello World: 2" +} diff --git a/ddsenabler/examples/publish/samples/3 b/ddsenabler/examples/publish/samples/3 new file mode 100644 index 00000000..cae03a51 --- /dev/null +++ b/ddsenabler/examples/publish/samples/3 @@ -0,0 +1,3 @@ +{ + "data": "Hello World: 3" +} diff --git a/ddsenabler/examples/publish/samples/4 b/ddsenabler/examples/publish/samples/4 new file mode 100644 index 00000000..112b310d --- /dev/null +++ b/ddsenabler/examples/publish/samples/4 @@ -0,0 +1,3 @@ +{ + "data": "Hello World: 4" +} diff --git a/ddsenabler/examples/publish/samples/5 b/ddsenabler/examples/publish/samples/5 new file mode 100644 index 00000000..5c53f169 --- /dev/null +++ b/ddsenabler/examples/publish/samples/5 @@ -0,0 +1,3 @@ +{ + "data": "Hello World: 5" +} diff --git a/ddsenabler/examples/service/CMakeLists.txt b/ddsenabler/examples/service/CMakeLists.txt index 08cf1258..f3c0a259 100644 --- a/ddsenabler/examples/service/CMakeLists.txt +++ b/ddsenabler/examples/service/CMakeLists.txt @@ -22,11 +22,11 @@ target_link_libraries(ddsenabler_example_service PRIVATE ddsenabler utils) # Install rule install(TARGETS ddsenabler_example_service - RUNTIME DESTINATION bin/examples/service + RUNTIME DESTINATION examples/service ) # Install requests directory install( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/requests - DESTINATION bin/examples/service + DESTINATION examples/service ) diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index dc1df2eb..adcb2d02 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -10,17 +10,17 @@ Users are encouraged to implement their own functional server logic as needed in ### CLIENT ```bash -./install/ddsenabler/bin/examples/service/ddsenabler_example_service client \ - --persistence-path ./install/ddsenabler/bin/examples/persistence/ \ - --requests-path ./install/ddsenabler/bin/examples/service/requests \ +./install/ddsenabler/examples/service/ddsenabler_example_service client \ + --persistence-path ./install/ddsenabler/examples/persistence/ \ + --requests-path ./install/ddsenabler/examples/service/requests \ --request-initial-wait 3 --config $PATH_TO_CONFIG_FILE ``` ### SERVER ```bash -./install/ddsenabler/bin/examples/service/ddsenabler_example_service server \ - --persistence-path ./install/ddsenabler/bin/examples/persistence/ +./install/ddsenabler/examples/service/ddsenabler_example_service server \ + --persistence-path ./install/ddsenabler/examples/persistence/ --expected-requests N --config $PATH_TO_CONFIG_FILE ``` diff --git a/ddsenabler/examples/service/config_service.yml b/ddsenabler/examples/service/config_service.yml deleted file mode 100644 index 17cbb176..00000000 --- a/ddsenabler/examples/service/config_service.yml +++ /dev/null @@ -1,11 +0,0 @@ -dds: - domain: 0 - -ddsenabler: - initial-publish-wait: 500 - -specs: - threads: 12 - logging: - stdout: false - verbosity: error diff --git a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst index 975d8e3f..ebb7c377 100644 --- a/ddsenabler_docs/docs/ddsenabler/installation/linux.rst +++ b/ddsenabler_docs/docs/ddsenabler/installation/linux.rst @@ -290,7 +290,7 @@ To run this *eProsima DDS Enabler* example, source the installation path and exe cd source install/setup.bash export TEST_PATH=$PWD/src/DDS-Enabler/ddsenabler_test/compose/test_cases/publish/discovered_type - ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config $TEST_PATH/config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000 + ./install/ddsenabler/examples/publish/ddsenabler_example_publish --config $TEST_PATH/config.yml --timeout 10 --expected-types 1 --expected-topics 1 --publish-path $TEST_PATH/samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 5000 .. important:: diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml index dff4283f..b7f00f03 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 + command: ./install/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml index 1891177f..547263c8 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml @@ -12,7 +12,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 --cancel-requests true + command: ./install/ddsenabler/examples/action/ddsenabler_example_action client --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 --cancel-requests true fibonacci_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml index 0b155058..aac8613b 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 3 + command: ./install/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 3 fibonacci_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml b/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml index 7e4493a9..1c4fc126 100644 --- a/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml +++ b/ddsenabler_test/compose/test_cases/publish/discovered_type/compose.yml @@ -21,7 +21,7 @@ services: volumes: - ./config.yml:/config/config.yml - ./samples:/samples - command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --expected-types 1 --expected-topics 1 --publish-path /samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 2000 + command: ./install/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --expected-types 1 --expected-topics 1 --publish-path /samples --publish-topic rt/chatter --publish-period 200 --publish-initial-wait 2000 listener: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml b/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml index 8b9f9e22..a5d2002f 100644 --- a/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml +++ b/ddsenabler_test/compose/test_cases/publish/requested_type/compose.yml @@ -16,7 +16,7 @@ services: - ./config.yml:/config/config.yml - ./samples:/samples - ./persistence:/persistence - command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --publish-path /samples --publish-topic test_topic --publish-period 200 --persistence-path /persistence + command: ./install/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --timeout 5 --publish-path /samples --publish-topic test_topic --publish-period 200 --persistence-path /persistence subscriber: image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml b/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml index 557f471d..ef5d9a7e 100644 --- a/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml +++ b/ddsenabler_test/compose/test_cases/reception/topics_json/compose.yml @@ -18,7 +18,7 @@ services: - std_net volumes: - ./config.json:/config/config.json - command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.json --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 + command: ./install/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.json --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 talker: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml b/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml index 166462b0..4c527fa3 100644 --- a/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml +++ b/ddsenabler_test/compose/test_cases/reception/topics_yaml/compose.yml @@ -18,7 +18,7 @@ services: - std_net volumes: - ./config.yml:/config/config.yml - command: ./build/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 + command: ./install/ddsenabler/examples/publish/ddsenabler_example_publish --config /config/config.yml --expected-types 1 --expected-topics 1 --expected-data 3 --timeout 6 talker: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml index 346a967d..97826e61 100644 --- a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -13,7 +13,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service client --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --request-initial-wait 2 + command: ./install/ddsenabler/examples/service/ddsenabler_example_service client --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --request-initial-wait 2 add_two_ints_server: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} container_name: add_two_ints_server diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index d8126598..ac4872c6 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -11,7 +11,7 @@ services: volumes: - ./config.yml:/config/config.yml - ../persistence:/persistence - command: ./build/ddsenabler/examples/service/ddsenabler_example_service server --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --expected-requests 3 + command: ./install/ddsenabler/examples/service/ddsenabler_example_service server --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --expected-requests 3 add_two_ints_client_1: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} From fd7a664a44b1b0bc6b0a84cbaa74662070d2f1f2 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 28 Oct 2025 15:20:52 +0100 Subject: [PATCH 73/87] instanceHandle writer inside scope Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/Writer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ddsenabler_participants/src/cpp/Writer.cpp b/ddsenabler_participants/src/cpp/Writer.cpp index 1a923b83..c7a35228 100644 --- a/ddsenabler_participants/src/cpp/Writer.cpp +++ b/ddsenabler_participants/src/cpp/Writer.cpp @@ -306,10 +306,10 @@ void Writer::write_action_feedback_notification( const std::string& action_name) { nlohmann::json json_data; - std::stringstream instanceHandle; - instanceHandle << msg.instanceHandle; if (action_feedback_notification_callback_ && prepare_json_data_(msg, dyn_type, json_data)) { + std::stringstream instanceHandle; + instanceHandle << msg.instanceHandle; UUID uuid; try { From 7275b19dc8080f4b7861b27690d20303efd75ae5 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 28 Oct 2025 16:06:15 +0100 Subject: [PATCH 74/87] Renaming RpcInfo components Signed-off-by: Eugenio Collado --- ddsenabler/include/ddsenabler/DDSEnabler.hpp | 16 +-- ddsenabler/src/cpp/DDSEnabler.cpp | 24 ++-- .../ddsenabler_participants/Constants.hpp | 8 +- .../EnablerParticipant.hpp | 16 +-- .../ddsenabler_participants/Handler.hpp | 8 +- .../rpc/RpcStructs.hpp | 22 +-- .../ddsenabler_participants/rpc/RpcTypes.hpp | 4 +- .../src/cpp/EnablerParticipant.cpp | 132 ++++++++---------- ddsenabler_participants/src/cpp/Handler.cpp | 20 +-- .../src/cpp/rpc/RpcStructs.cpp | 71 ++++++---- 10 files changed, 152 insertions(+), 169 deletions(-) diff --git a/ddsenabler/include/ddsenabler/DDSEnabler.hpp b/ddsenabler/include/ddsenabler/DDSEnabler.hpp index 4f6d2d66..9bf0d875 100644 --- a/ddsenabler/include/ddsenabler/DDSEnabler.hpp +++ b/ddsenabler/include/ddsenabler/DDSEnabler.hpp @@ -118,14 +118,14 @@ class DDSEnabler * for the corresponding request and reply topics. * * @param service_name The name of the service to be announced. - * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). + * @param Protocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the service was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_service( const std::string& service_name, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_DllAPI bool announce_service( @@ -158,7 +158,7 @@ class DDSEnabler * @param service_name The target service name. * @param json The JSON-formatted request data. * @param request_id Reference to store the unique request identifier. - * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). + * @param Protocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the request was successfully sent, false otherwise. */ @@ -167,7 +167,7 @@ class DDSEnabler const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_DllAPI bool send_service_request( @@ -208,14 +208,14 @@ class DDSEnabler * Failure may occur if there is an issue requesting the data types to user's app. * * @param action_name The name of the action to be announced. - * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). + * @param Protocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the action was successfully announced, false otherwise. */ DDSENABLER_DllAPI bool announce_action( const std::string& action_name, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_DllAPI bool announce_action( @@ -331,7 +331,7 @@ class DDSEnabler * @param action_name The name of the action to send the goal to. * @param json The JSON data to be sent with the action goal. * @param goal_id Reference to store the unique identifier of the action goal. - * @param RpcProtocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). + * @param Protocol The RPC protocol to be used (overloaded function, without this parameter uses ROS2 by default). * * @return true if the action goal was successfully sent, false otherwise. */ @@ -340,7 +340,7 @@ class DDSEnabler const std::string& action_name, const std::string& json, participants::UUID& goal_id, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_DllAPI bool send_action_goal( diff --git a/ddsenabler/src/cpp/DDSEnabler.cpp b/ddsenabler/src/cpp/DDSEnabler.cpp index 56777223..3a5577d1 100644 --- a/ddsenabler/src/cpp/DDSEnabler.cpp +++ b/ddsenabler/src/cpp/DDSEnabler.cpp @@ -302,33 +302,33 @@ bool DDSEnabler::send_service_request( service_name, json, request_id, - participants::RpcProtocol::ROS2); + participants::Protocol::ROS2); } bool DDSEnabler::send_service_request( const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RpcProtocol RpcProtocol) + participants::Protocol Protocol) { return enabler_participant_->send_service_request( service_name, json, request_id, - RpcProtocol); + Protocol); } bool DDSEnabler::announce_service( const std::string& service_name, - participants::RpcProtocol RpcProtocol) + participants::Protocol Protocol) { - return enabler_participant_->announce_service(service_name, RpcProtocol); + return enabler_participant_->announce_service(service_name, Protocol); } bool DDSEnabler::announce_service( const std::string& service_name) { - return announce_service(service_name, participants::RpcProtocol::ROS2); + return announce_service(service_name, participants::Protocol::ROS2); } bool DDSEnabler::revoke_service( @@ -357,20 +357,20 @@ bool DDSEnabler::send_action_goal( action_name, json, action_id, - participants::RpcProtocol::ROS2); + participants::Protocol::ROS2); } bool DDSEnabler::send_action_goal( const std::string& action_name, const std::string& json, UUID& action_id, - participants::RpcProtocol RpcProtocol) + participants::Protocol Protocol) { return enabler_participant_->send_action_goal( action_name, json, action_id, - RpcProtocol); + Protocol); } bool DDSEnabler::send_action_get_result_request( @@ -396,14 +396,14 @@ bool DDSEnabler::cancel_action_goal( bool DDSEnabler::announce_action( const std::string& action_name) { - return announce_action(action_name, participants::RpcProtocol::ROS2); + return announce_action(action_name, participants::Protocol::ROS2); } bool DDSEnabler::announce_action( const std::string& action_name, - participants::RpcProtocol RpcProtocol) + participants::Protocol Protocol) { - return enabler_participant_->announce_action(action_name, RpcProtocol); + return enabler_participant_->announce_action(action_name, Protocol); } bool DDSEnabler::revoke_action( diff --git a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp index efb4cfed..df74515f 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Constants.hpp @@ -38,10 +38,10 @@ constexpr const char* ROS_REQUEST_SUFFIX("Request"); constexpr const char* ROS_REPLY_PREFIX("rr/"); constexpr const char* ROS_REPLY_SUFFIX("Reply"); -constexpr const char* FASTDDS_REQUEST_PREFIX(""); -constexpr const char* FASTDDS_REQUEST_SUFFIX("_Request"); -constexpr const char* FASTDDS_REPLY_PREFIX(""); -constexpr const char* FASTDDS_REPLY_SUFFIX("_Reply"); +constexpr const char* DDS_REQUEST_PREFIX(""); +constexpr const char* DDS_REQUEST_SUFFIX("_Request"); +constexpr const char* DDS_REPLY_PREFIX(""); +constexpr const char* DDS_REPLY_SUFFIX("_Reply"); // Action mangling constexpr const char* ACTION_GOAL_SUFFIX("send_goal"); diff --git a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp index 37134db4..51282e2f 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/EnablerParticipant.hpp @@ -93,7 +93,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant DDSENABLER_PARTICIPANTS_DllAPI bool announce_service( const std::string& service_name, - RpcProtocol RpcProtocol); + Protocol Protocol); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_service( @@ -104,7 +104,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& service_name, const std::string& json, uint64_t& request_id, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_PARTICIPANTS_DllAPI bool send_service_reply( @@ -113,13 +113,13 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const uint64_t request_id); DDSENABLER_PARTICIPANTS_DllAPI - RpcProtocol get_service_rpc_protocol( + Protocol get_service_protocol( const std::string& service_name); DDSENABLER_PARTICIPANTS_DllAPI bool announce_action( const std::string& action_name, - RpcProtocol RpcProtocol); + Protocol Protocol); DDSENABLER_PARTICIPANTS_DllAPI bool revoke_action( @@ -130,7 +130,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant const std::string& action_name, const std::string& json, UUID& action_id, - participants::RpcProtocol RpcProtocol); + participants::Protocol Protocol); DDSENABLER_PARTICIPANTS_DllAPI bool cancel_action_goal( @@ -190,11 +190,11 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool query_service_nts_( std::shared_ptr service, - RpcProtocol RpcProtocol); + Protocol Protocol); bool query_action_nts_( ActionDiscovered& action, - RpcProtocol RpcProtocol, + Protocol Protocol, std::unique_lock& lck); bool create_topic_writer_nts_( @@ -221,7 +221,7 @@ class EnablerParticipant : public ddspipe::participants::SchemaParticipant bool fill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, - RpcProtocol RpcProtocol); + Protocol Protocol); std::shared_ptr lookup_reader_nts_( const std::string& topic_name, diff --git a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp index 7b2b4043..92fc5324 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/Handler.hpp @@ -196,7 +196,7 @@ class Handler : public ddspipe::participants::ISchemaHandler * @param [in] action_id UUID of the action. * @param [in] request_id Request ID of the action request. * @param [in] action_type Type of the action (GOAL, RESULT, CANCEL). - * @param [in] RpcProtocol Protocol of the action, only used to create the ActionRequestInfo if action_type is GOAL. + * @param [in] Protocol Protocol of the action, only used to create the ActionRequestInfo if action_type is GOAL. * @return \c true if the action request was successfully stored, \c false otherwise. */ DDSENABLER_PARTICIPANTS_DllAPI @@ -205,7 +205,7 @@ class Handler : public ddspipe::participants::ISchemaHandler const UUID& action_id, const uint64_t request_id, const ActionType action_type, - const RpcProtocol RpcProtocol = RpcProtocol::ROS2); + const Protocol Protocol = Protocol::ROS2); /** * @brief Send the reply containing the result of an action or store it for a later reply. @@ -258,10 +258,10 @@ class Handler : public ddspipe::participants::ISchemaHandler * * @param [in] action_name Name of the action. * @param [in] action_id UUID of the action to be checked. - * @return The RPC protocol of the action, or RpcProtocol::PROTOCOL_UNKNOWN if the action is not found. + * @return The RPC protocol of the action, or Protocol::PROTOCOL_UNKNOWN if the action is not found. */ DDSENABLER_PARTICIPANTS_DllAPI - RpcProtocol get_action_rpc_protocol( + Protocol get_action_protocol( const std::string& action_name, const UUID& action_id); diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp index c7030777..c98f7e1f 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcStructs.hpp @@ -61,14 +61,14 @@ struct RpcInfo RpcInfo( const std::string& dds_topic_name); - void detect_rpc_protocol(); + void detect_protocol(); - void remove_prefix_suffix(); + void extract_rpc_info(); std::string topic_name; std::string service_name; std::string action_name; - RpcProtocol rpc_protocol; + Protocol protocol; RpcType rpc_type; ServiceType service_type; ActionType action_type; @@ -82,7 +82,7 @@ struct ActionRequestInfo const std::string& _action_name, ActionType action_type, uint64_t request_id, - RpcProtocol rpc_protocol); + Protocol protocol); void set_request( uint64_t request_id, @@ -97,10 +97,10 @@ struct ActionRequestInfo bool erase( ActionEraseReason erase_reason); - RpcProtocol get_rpc_protocol() const; + Protocol get_protocol() const; std::string action_name; - RpcProtocol rpc_protocol; + Protocol protocol; uint64_t goal_request_id = 0; uint64_t result_request_id = 0; std::chrono::system_clock::time_point goal_accepted_stamp; @@ -114,7 +114,7 @@ struct ServiceDiscovered ServiceDiscovered( const std::string& service_name, - RpcProtocol rpc_protocol); + Protocol protocol); bool add_topic( const ddspipe::core::types::DdsTopic& topic, @@ -129,10 +129,10 @@ struct ServiceDiscovered ServiceType service_type, ddspipe::core::types::DdsTopic& topic); - RpcProtocol get_rpc_protocol() const; + Protocol get_protocol() const; std::string service_name; - RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; + Protocol protocol{Protocol::PROTOCOL_UNKNOWN}; ddspipe::core::types::DdsTopic topic_request; bool request_discovered{false}; @@ -152,7 +152,7 @@ struct ActionDiscovered { ActionDiscovered( const std::string& action_name, - RpcProtocol rpc_protocol); + Protocol protocol); bool check_fully_discovered(); @@ -167,7 +167,7 @@ struct ActionDiscovered RpcAction get_action(); std::string action_name; - RpcProtocol rpc_protocol{RpcProtocol::PROTOCOL_UNKNOWN}; + Protocol protocol{Protocol::PROTOCOL_UNKNOWN}; std::weak_ptr goal; std::weak_ptr result; std::weak_ptr cancel; diff --git a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp index 646136b5..85c5153a 100644 --- a/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp +++ b/ddsenabler_participants/include/ddsenabler_participants/rpc/RpcTypes.hpp @@ -31,10 +31,10 @@ namespace participants { using UUID = std::array; -enum class RpcProtocol +enum class Protocol { ROS2 = 0, - FASTDDS, + DDS, PROTOCOL_UNKNOWN }; diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index c2fb3941..6fc19bac 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -59,16 +59,7 @@ std::shared_ptr EnablerParticipant::create_reader( { std::lock_guard lck(mtx_); auto dds_topic = dynamic_cast(topic); - std::shared_ptr rpc_info; - try - { - rpc_info = std::make_shared(dds_topic.m_topic_name); - } - catch (const std::exception& e) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); - return std::make_shared(); - } + std::shared_ptr rpc_info = std::make_shared(dds_topic.m_topic_name); if (RpcType::NONE != rpc_info->rpc_type) { @@ -206,16 +197,7 @@ bool EnablerParticipant::publish_rpc( { std::unique_lock lck(mtx_); - std::shared_ptr rpc_info; - try - { - rpc_info = std::make_shared(topic_name); - } - catch (const std::exception& e) - { - EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, e.what()); - return false; - } + std::shared_ptr rpc_info = std::make_shared(topic_name); if (ServiceType::NONE == rpc_info->service_type) { @@ -299,7 +281,7 @@ bool EnablerParticipant::publish_rpc( bool EnablerParticipant::announce_service( const std::string& service_name, - RpcProtocol RpcProtocol) + Protocol Protocol) { std::unique_lock lck(mtx_); @@ -316,8 +298,8 @@ bool EnablerParticipant::announce_service( return true; } - std::shared_ptr service = std::make_shared(service_name, RpcProtocol); - if (!query_service_nts_(service, RpcProtocol)) + std::shared_ptr service = std::make_shared(service_name, Protocol); + if (!query_service_nts_(service, Protocol)) { return false; } @@ -346,18 +328,18 @@ bool EnablerParticipant::send_service_request( const std::string& service_name, const std::string& json, uint64_t& request_id, - RpcProtocol RpcProtocol) + Protocol Protocol) { std::string prefix, suffix; - switch (RpcProtocol) + switch (Protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: prefix = ROS_REQUEST_PREFIX; suffix = ROS_REQUEST_SUFFIX; break; - case RpcProtocol::FASTDDS: - prefix = FASTDDS_REQUEST_PREFIX; - suffix = FASTDDS_REQUEST_SUFFIX; + case Protocol::DDS: + prefix = DDS_REQUEST_PREFIX; + suffix = DDS_REQUEST_SUFFIX; break; default: EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, @@ -384,17 +366,17 @@ bool EnablerParticipant::send_service_reply( const std::string& json, const uint64_t request_id) { - RpcProtocol RpcProtocol = get_service_rpc_protocol(service_name); + Protocol Protocol = get_service_protocol(service_name); std::string prefix, suffix; - switch (RpcProtocol) + switch (Protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: prefix = ROS_REPLY_PREFIX; suffix = ROS_REPLY_SUFFIX; break; - case RpcProtocol::FASTDDS: - prefix = FASTDDS_REPLY_PREFIX; - suffix = FASTDDS_REPLY_SUFFIX; + case Protocol::DDS: + prefix = DDS_REPLY_PREFIX; + suffix = DDS_REPLY_SUFFIX; break; default: EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, @@ -408,26 +390,26 @@ bool EnablerParticipant::send_service_reply( request_id); } -RpcProtocol EnablerParticipant::get_service_rpc_protocol( +Protocol EnablerParticipant::get_service_protocol( const std::string& service_name) { std::unique_lock lck(mtx_); auto it = services_.find(service_name); if (it != services_.end()) { - return it->second->get_rpc_protocol(); + return it->second->get_protocol(); } - return RpcProtocol::PROTOCOL_UNKNOWN; + return Protocol::PROTOCOL_UNKNOWN; } bool EnablerParticipant::announce_action( const std::string& action_name, - RpcProtocol RpcProtocol) + Protocol Protocol) { std::unique_lock lck(mtx_); - if (RpcProtocol != RpcProtocol::ROS2) + if (Protocol != Protocol::ROS2) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action_name << " : only ROS2 actions are currently supported."); @@ -460,8 +442,8 @@ bool EnablerParticipant::announce_action( } } - std::shared_ptr action = std::make_shared(action_name, RpcProtocol); - if (!query_action_nts_(*action, RpcProtocol, lck)) + std::shared_ptr action = std::make_shared(action_name, Protocol); + if (!query_action_nts_(*action, Protocol, lck)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action_name << " : action type request failed."); @@ -527,7 +509,7 @@ bool EnablerParticipant::send_action_goal( const std::string& action_name, const std::string& json, UUID& action_id, - RpcProtocol RpcProtocol) + Protocol Protocol) { std::string goal_json = RpcUtils::create_goal_request_msg(json, action_id); std::string goal_request_topic = action_name + ACTION_GOAL_SUFFIX; @@ -537,7 +519,7 @@ bool EnablerParticipant::send_action_goal( goal_request_topic, goal_json, goal_request_id, - RpcProtocol)) + Protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to send action goal request to action " << action_name); @@ -549,7 +531,7 @@ bool EnablerParticipant::send_action_goal( action_id, goal_request_id, ActionType::GOAL, - RpcProtocol)) + Protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_EXECUTION, "Failed to store action goal request to action " << action_name); @@ -576,7 +558,7 @@ bool EnablerParticipant::cancel_action_goal( std::string cancel_json = RpcUtils::create_cancel_request_msg(goal_id, timestamp); - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + Protocol protocol = handler_->get_action_protocol(action_name, goal_id); uint64_t cancel_request_id = 0; std::string cancel_request_topic = action_name + ACTION_CANCEL_SUFFIX; @@ -604,7 +586,7 @@ bool EnablerParticipant::send_action_get_result_request( std::string get_result_request_topic = action_name + ACTION_RESULT_SUFFIX; uint64_t get_result_request_id = 0; - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, action_id); + Protocol protocol = handler_->get_action_protocol(action_name, action_id); if (!send_service_request( get_result_request_topic, @@ -739,15 +721,15 @@ bool EnablerParticipant::send_action_feedback( return false; } - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + Protocol protocol = handler_->get_action_protocol(action_name, goal_id); std::string prefix; switch (protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: prefix = ROS_TOPIC_PREFIX; break; - case RpcProtocol::FASTDDS: + case Protocol::DDS: prefix = FASTDDS_TOPIC_PREFIX; break; default: @@ -777,15 +759,15 @@ bool EnablerParticipant::update_action_status( return false; } - RpcProtocol protocol = handler_->get_action_rpc_protocol(action_name, goal_id); + Protocol protocol = handler_->get_action_protocol(action_name, goal_id); std::string prefix; switch (protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: prefix = ROS_TOPIC_PREFIX; break; - case RpcProtocol::FASTDDS: + case Protocol::DDS: prefix = FASTDDS_TOPIC_PREFIX; break; default: @@ -824,7 +806,7 @@ bool EnablerParticipant::query_topic_nts_( bool EnablerParticipant::query_service_nts_( std::shared_ptr service, - RpcProtocol RpcProtocol) + Protocol Protocol) { if (!service_query_callback_) { @@ -848,12 +830,12 @@ bool EnablerParticipant::query_service_nts_( return false; } - return fill_service_type_nts_(service_info, service, RpcProtocol); + return fill_service_type_nts_(service_info, service, Protocol); } bool EnablerParticipant::query_action_nts_( ActionDiscovered& action, - RpcProtocol RpcProtocol, + Protocol Protocol, std::unique_lock& lck) { if (!action_query_callback_) @@ -894,11 +876,11 @@ bool EnablerParticipant::query_action_nts_( } std::shared_ptr goal_service = std::make_shared(goal_service_name, - RpcProtocol); + Protocol); if (!fill_service_type_nts_( action_info.goal, goal_service, - RpcProtocol)) + Protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : goal service type not found."); @@ -914,11 +896,11 @@ bool EnablerParticipant::query_action_nts_( action.goal = goal_service; std::shared_ptr cancel_service = std::make_shared(cancel_service_name, - RpcProtocol); + Protocol); if (!fill_service_type_nts_( action_info.cancel, cancel_service, - RpcProtocol)) + Protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : cancel service type not found."); @@ -934,11 +916,11 @@ bool EnablerParticipant::query_action_nts_( action.cancel = cancel_service; std::shared_ptr result_service = std::make_shared(result_service_name, - RpcProtocol); + Protocol); if (!fill_service_type_nts_( action_info.result, result_service, - RpcProtocol)) + Protocol)) { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << " : result service type not found."); @@ -954,12 +936,12 @@ bool EnablerParticipant::query_action_nts_( action.result = result_service; std::string prefix; - switch (RpcProtocol) + switch (Protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: prefix = ROS_TOPIC_PREFIX; break; - case RpcProtocol::FASTDDS: + case Protocol::DDS: prefix = FASTDDS_TOPIC_PREFIX; break; default: @@ -1138,22 +1120,22 @@ bool EnablerParticipant::fill_topic_struct_nts_( bool EnablerParticipant::fill_service_type_nts_( const ServiceInfo& service_info, std::shared_ptr service, - RpcProtocol RpcProtocol) + Protocol Protocol) { std::string rq_prefix, rq_suffix, rp_prefix, rp_suffix; - switch (RpcProtocol) + switch (Protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: rq_prefix = ROS_REQUEST_PREFIX; rq_suffix = ROS_REQUEST_SUFFIX; rp_prefix = ROS_REPLY_PREFIX; rp_suffix = ROS_REPLY_SUFFIX; break; - case RpcProtocol::FASTDDS: - rq_prefix = FASTDDS_REQUEST_PREFIX; - rq_suffix = FASTDDS_REQUEST_SUFFIX; - rp_prefix = FASTDDS_REPLY_PREFIX; - rp_suffix = FASTDDS_REPLY_SUFFIX; + case Protocol::DDS: + rq_prefix = DDS_REQUEST_PREFIX; + rq_suffix = DDS_REQUEST_SUFFIX; + rp_prefix = DDS_REPLY_PREFIX; + rp_suffix = DDS_REPLY_SUFFIX; break; default: EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, @@ -1213,7 +1195,7 @@ bool EnablerParticipant::service_discovered_nts_( const DdsTopic& topic) { auto [it, inserted] = services_.try_emplace(rpc_info->service_name, - std::make_shared(rpc_info->service_name, rpc_info->rpc_protocol)); + std::make_shared(rpc_info->service_name, rpc_info->protocol)); if (it->second->add_topic(topic, rpc_info->service_type)) { it->second->external_server = true; @@ -1227,7 +1209,7 @@ bool EnablerParticipant::action_discovered_nts_( const DdsTopic& topic) { auto [it, inserted] = actions_.try_emplace(rpc_info->action_name, - std::make_shared(rpc_info->action_name, rpc_info->rpc_protocol)); + std::make_shared(rpc_info->action_name, rpc_info->protocol)); if (ServiceType::NONE != rpc_info->service_type) { if (service_discovered_nts_(rpc_info, topic)) diff --git a/ddsenabler_participants/src/cpp/Handler.cpp b/ddsenabler_participants/src/cpp/Handler.cpp index 3077361a..468d7e94 100644 --- a/ddsenabler_participants/src/cpp/Handler.cpp +++ b/ddsenabler_participants/src/cpp/Handler.cpp @@ -156,15 +156,7 @@ void Handler::add_data( throw utils::InconsistencyException(STR_ENTRY << "Received sample with no payload."); } - std::shared_ptr rpc_info; - try - { - rpc_info = std::make_shared(topic.m_topic_name); - } - catch (const std::exception& e) - { - throw utils::InconsistencyException(STR_ENTRY << e.what()); - } + std::shared_ptr rpc_info = std::make_shared(topic.m_topic_name); switch (rpc_info->rpc_type) { @@ -697,7 +689,7 @@ bool Handler::store_action_request( const UUID& action_id, const uint64_t request_id, const ActionType action_type, - const RpcProtocol RpcProtocol) + const Protocol Protocol) { std::lock_guard lock(mtx_); @@ -729,7 +721,7 @@ bool Handler::store_action_request( "Cannot store action request, action does not exist and request type is not GOAL."); return false; } - action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id, RpcProtocol); + action_request_id_to_uuid_[action_id] = ActionRequestInfo(action_name, action_type, request_id, Protocol); } return true; @@ -809,7 +801,7 @@ bool Handler::is_UUID_active( return false; } -RpcProtocol Handler::get_action_rpc_protocol( +Protocol Handler::get_action_protocol( const std::string& action_name, const UUID& action_id) { @@ -817,10 +809,10 @@ RpcProtocol Handler::get_action_rpc_protocol( auto it = action_request_id_to_uuid_.find(action_id); if (it != action_request_id_to_uuid_.end() && action_name == it->second.action_name) { - return it->second.rpc_protocol; + return it->second.protocol; } - return RpcProtocol::PROTOCOL_UNKNOWN; + return Protocol::PROTOCOL_UNKNOWN; } bool Handler::get_action_request_UUID( diff --git a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp index 3dd395b2..9c095214 100644 --- a/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp +++ b/ddsenabler_participants/src/cpp/rpc/RpcStructs.cpp @@ -41,68 +41,71 @@ RpcAction::RpcAction( RpcInfo::RpcInfo( const std::string& dds_topic_name) : topic_name(dds_topic_name) - , rpc_protocol(RpcProtocol::PROTOCOL_UNKNOWN) + , protocol(Protocol::PROTOCOL_UNKNOWN) , rpc_type(RpcType::NONE) , service_type(ServiceType::NONE) , action_type(ActionType::NONE) { - detect_rpc_protocol(); + detect_protocol(); try { - remove_prefix_suffix(); + extract_rpc_info(); } catch (const std::exception& e) { - throw std::runtime_error("Error extracting RPC info from topic name '" + topic_name + "': " + e.what()); + EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, + "Error extracting RPC info from topic name " << dds_topic_name << ": " << e.what()); } } -void RpcInfo::detect_rpc_protocol() +void RpcInfo::detect_protocol() { if (topic_name.rfind(ROS_TOPIC_PREFIX, 0) == 0 || topic_name.rfind(ROS_REQUEST_PREFIX, 0) == 0 || topic_name.rfind(ROS_REPLY_PREFIX, 0) == 0) { - rpc_protocol = RpcProtocol::ROS2; + protocol = Protocol::ROS2; return; } // With the current Fast Prefixes being empty strings, this check must be the last one else if (topic_name.rfind(FASTDDS_TOPIC_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REQUEST_PREFIX, 0) == 0 || - topic_name.rfind(FASTDDS_REPLY_PREFIX, 0) == 0) + topic_name.rfind(DDS_REQUEST_PREFIX, 0) == 0 || + topic_name.rfind(DDS_REPLY_PREFIX, 0) == 0) { - rpc_protocol = RpcProtocol::FASTDDS; + protocol = Protocol::DDS; return; } - rpc_protocol = RpcProtocol::PROTOCOL_UNKNOWN; + protocol = Protocol::PROTOCOL_UNKNOWN; } -void RpcInfo::remove_prefix_suffix() +void RpcInfo::extract_rpc_info() { std::string request_prefix, request_suffix, reply_prefix, reply_suffix, topic_prefix; - switch (rpc_protocol) + switch (protocol) { - case RpcProtocol::ROS2: + case Protocol::ROS2: request_prefix = ROS_REQUEST_PREFIX; request_suffix = ROS_REQUEST_SUFFIX; reply_prefix = ROS_REPLY_PREFIX; reply_suffix = ROS_REPLY_SUFFIX; topic_prefix = ROS_TOPIC_PREFIX; break; - case RpcProtocol::FASTDDS: - request_prefix = FASTDDS_REQUEST_PREFIX; - request_suffix = FASTDDS_REQUEST_SUFFIX; - reply_prefix = FASTDDS_REPLY_PREFIX; - reply_suffix = FASTDDS_REPLY_SUFFIX; - topic_prefix = FASTDDS_TOPIC_PREFIX; + case Protocol::DDS: + request_prefix = DDS_REQUEST_PREFIX; + request_suffix = DDS_REQUEST_SUFFIX; + reply_prefix = DDS_REPLY_PREFIX; + reply_suffix = DDS_REPLY_SUFFIX; + // As there are no fastdds actions there is no need to check for feedback/status topics with prefix break; default: EPROSIMA_LOG_ERROR(DDSENABLER_RPC_UTILS, - "Invalid RPC protocol"); - throw std::runtime_error("Invalid RPC protocol"); + "Invalid protocol"); + throw std::runtime_error("Invalid protocol"); } std::string base = topic_name; + + // Check for request topics if ((base.rfind(request_prefix, 0) == 0) && (base.size() >= request_suffix.length()) && (base.substr(base.size() - request_suffix.length()) == request_suffix)) @@ -140,6 +143,8 @@ void RpcInfo::remove_prefix_suffix() rpc_type = RpcType::SERVICE; return; } + + // Check for reply topics if ((base.rfind(reply_prefix, 0) == 0) && (base.size() >= reply_suffix.length()) && (base.substr(base.size() - reply_suffix.length()) == reply_suffix)) @@ -179,6 +184,10 @@ void RpcInfo::remove_prefix_suffix() } // Check for action feedback/status topics + if (Protocol::ROS2 != protocol) // Feedback and Status topics only exist for ROS2 actions + { + return; + } base = base.substr(topic_prefix.length()); if (base.size() >= (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1) && base.substr(base.size() - (std::strlen(ACTION_FEEDBACK_SUFFIX) + 1)) == @@ -206,10 +215,10 @@ ActionRequestInfo::ActionRequestInfo( const std::string& _action_name, ActionType action_type, uint64_t request_id, - RpcProtocol rpc_protocol) + Protocol protocol) : action_name(_action_name) , goal_accepted_stamp(std::chrono::system_clock::now()) - , rpc_protocol(rpc_protocol) + , protocol(protocol) { set_request(request_id, action_type); } @@ -276,16 +285,16 @@ bool ActionRequestInfo::erase( return final_status_received && result_received; } -RpcProtocol ActionRequestInfo::get_rpc_protocol() const +Protocol ActionRequestInfo::get_protocol() const { - return rpc_protocol; + return protocol; } ServiceDiscovered::ServiceDiscovered( const std::string& service_name, - RpcProtocol rpc_protocol) + Protocol protocol) : service_name(service_name) - , rpc_protocol(rpc_protocol) + , protocol(protocol) { } @@ -383,16 +392,16 @@ bool ServiceDiscovered::get_topic( return false; } -RpcProtocol ServiceDiscovered::get_rpc_protocol() const +Protocol ServiceDiscovered::get_protocol() const { - return rpc_protocol; + return protocol; } ActionDiscovered::ActionDiscovered( const std::string& action_name, - RpcProtocol rpc_protocol) + Protocol protocol) : action_name(action_name) - , rpc_protocol(rpc_protocol) + , protocol(protocol) { } From 618123ef97c471b4756f4f521c08d08c24c0b2ca Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 30 Oct 2025 08:45:46 +0100 Subject: [PATCH 75/87] Polish examples Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/CLIParser.hpp | 14 +++++++++++--- ddsenabler/examples/action/Readme.md | 8 ++++++-- ddsenabler/examples/action/main.cpp | 5 ++--- ddsenabler/examples/service/CLIParser.hpp | 14 +++++++++++--- ddsenabler/examples/service/Readme.md | 4 ++++ ddsenabler/examples/service/main.cpp | 5 ++--- 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/ddsenabler/examples/action/CLIParser.hpp b/ddsenabler/examples/action/CLIParser.hpp index 5311a66f..387c7350 100644 --- a/ddsenabler/examples/action/CLIParser.hpp +++ b/ddsenabler/examples/action/CLIParser.hpp @@ -50,13 +50,15 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_action [options]" << + std::cout << "Usage: ddsenabler_example_action [options]" << std::endl; std::cout << "" << std::endl; std::cout << "--config Path to the configuration file" << std::endl; - std::cout << "--action-name Name of the action to be registered" << + std::cout << " (optional, if not provided default config is used)" << + std::endl; + std::cout << "--action-name Name of the action to be registered" << std::endl; std::cout << " (Default: 'Fibonacci/_action/')" << std::endl; @@ -68,9 +70,13 @@ class CLIParser std::endl; std::cout << "--persistence-path Path to the persistence directory" << std::endl; + std::cout << " (No default value as it is required)" << + std::endl; std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; - std::cout << "--expected-requests Number of requests expected to be received" << + std::cout << "--expected-requests Number of requests expected to be received" << + std::endl; + std::cout << " (Default: 0, meaning infinite)" << std::endl; std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; @@ -86,6 +92,8 @@ class CLIParser std::endl; std::cout << "--goals-path Directory containing goal JSON files" << std::endl; + std::cout << " (No default value as it is required for client mode)" << + std::endl; std::exit(return_code); } diff --git a/ddsenabler/examples/action/Readme.md b/ddsenabler/examples/action/Readme.md index 3372c601..9e7fa8b3 100644 --- a/ddsenabler/examples/action/Readme.md +++ b/ddsenabler/examples/action/Readme.md @@ -13,9 +13,11 @@ Users are encouraged to implement their own functional server logic as needed in ./install/ddsenabler/examples/action/ddsenabler_example_action client \ --persistence-path ./install/ddsenabler/examples/persistence/ \ --goals-path ./install/ddsenabler/examples/action/goals/ \ - --request-initial-wait 3 \ - --cancel-requests false + --request-initial-wait 3 + --cancel-requests false --config $PATH_TO_CONFIG_FILE + --action-name $ACTION_NAME + --timeout N ``` ### SERVER @@ -24,4 +26,6 @@ Users are encouraged to implement their own functional server logic as needed in --persistence-path ./install/ddsenabler/examples/persistence/ --config $PATH_TO_CONFIG_FILE --expected-requests N + --action-name $ACTION_NAME + --timeout N ``` diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 9953df96..9e7e83ec 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -164,10 +164,9 @@ static void test_action_notification_callback( action_file, action_name, action_info); - - action_discovered_ = true; - app_cv_.notify_all(); } + action_discovered_ = true; + app_cv_.notify_all(); } else { diff --git a/ddsenabler/examples/service/CLIParser.hpp b/ddsenabler/examples/service/CLIParser.hpp index c224dd15..f874daa5 100644 --- a/ddsenabler/examples/service/CLIParser.hpp +++ b/ddsenabler/examples/service/CLIParser.hpp @@ -49,12 +49,14 @@ class CLIParser static void print_help( uint8_t return_code) { - std::cout << "Usage: ddsenabler_example_service [options]" << + std::cout << "Usage: ddsenabler_example_service [options]" << std::endl; std::cout << "" << std::endl; std::cout << "--config Path to the configuration file" << std::endl; + std::cout << " (optional, if not provided default config is used)" << + std::endl; std::cout << "--service-name Name of the service to be registered" << std::endl; std::cout << " (Default: 'add_two_ints')" << @@ -67,9 +69,13 @@ class CLIParser std::endl; std::cout << "--persistence-path Path to the persistence directory" << std::endl; + std::cout << " (No default value as it is required)" << + std::endl; std::cout << "\n-------------------------------------SERVER OPTIONS------------------------------------\n" << std::endl; - std::cout << "--expected-requests Number of requests expected to be received" << + std::cout << "--expected-requests Number of requests expected to be received" << + std::endl; + std::cout << " (Default: 0, meaning infinite)" << std::endl; std::cout << "\n-------------------------------------CLIENT OPTIONS------------------------------------\n" << std::endl; @@ -79,7 +85,9 @@ class CLIParser std::endl; std::cout << " (Default: 0)" << std::endl; - std::cout << "--requests-path Directory containing request JSON files" << + std::cout << "--requests-path Directory containing request JSON files" << + std::endl; + std::cout << " (No default value as it is required for client mode)" << std::endl; std::exit(return_code); } diff --git a/ddsenabler/examples/service/Readme.md b/ddsenabler/examples/service/Readme.md index adcb2d02..4805c1d9 100644 --- a/ddsenabler/examples/service/Readme.md +++ b/ddsenabler/examples/service/Readme.md @@ -15,6 +15,8 @@ Users are encouraged to implement their own functional server logic as needed in --requests-path ./install/ddsenabler/examples/service/requests \ --request-initial-wait 3 --config $PATH_TO_CONFIG_FILE + --service-name $SERVICE_NAME + --timeout N ``` ### SERVER @@ -23,4 +25,6 @@ Users are encouraged to implement their own functional server logic as needed in --persistence-path ./install/ddsenabler/examples/persistence/ --expected-requests N --config $PATH_TO_CONFIG_FILE + --service-name $SERVICE_NAME + --timeout N ``` diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 33047337..f6532220 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -164,10 +164,9 @@ static void test_service_notification_callback( service_file, service_name, service_info); - - service_discovered_ = true; - app_cv_.notify_all(); } + service_discovered_ = true; + app_cv_.notify_all(); } else { From 9134b9f250d594279b89070d5f0f3bc6f41234e8 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 12:24:03 +0100 Subject: [PATCH 76/87] Update tests Signed-off-by: Eugenio Collado --- ddsenabler/test/DDSEnablerTester.hpp | 160 ++++++++++++++++++ .../test/ddsEnablerTests/CMakeLists.txt | 23 ++- .../test/ddsEnablerTests/DdsEnablerTest.cpp | 2 +- ...tion_msgs__msg__dds___GoalStatusArray_.bin | Bin ...n_msgs__srv__dds___CancelGoal_Request_.bin | Bin ..._msgs__srv__dds___CancelGoal_Response_.bin | Bin ...tion__dds___Fibonacci_FeedbackMessage_.bin | Bin ...on__dds___Fibonacci_GetResult_Request_.bin | Bin ...n__dds___Fibonacci_GetResult_Response_.bin | Bin ...ion__dds___Fibonacci_SendGoal_Request_.bin | Bin ...on__dds___Fibonacci_SendGoal_Response_.bin | Bin .../test_files/add_two_ints} | 0 ...rfaces__srv__dds___AddTwoInts_Request_.bin | Bin ...faces__srv__dds___AddTwoInts_Response_.bin | Bin .../test_files/fibonacci__action_} | 0 .../rcl_interfaces__msg__dds___Log_.bin | Bin ...interfaces__msg__dds___ParameterEvent_.bin | Bin ...srv__dds___DescribeParameters_Request_.bin | Bin ...rv__dds___DescribeParameters_Response_.bin | Bin ..._srv__dds___GetParameterTypes_Request_.bin | Bin ...srv__dds___GetParameterTypes_Response_.bin | Bin ...ces__srv__dds___GetParameters_Request_.bin | Bin ...es__srv__dds___GetParameters_Response_.bin | Bin ...es__srv__dds___ListParameters_Request_.bin | Bin ...s__srv__dds___ListParameters_Response_.bin | Bin ...dds___SetParametersAtomically_Request_.bin | Bin ...ds___SetParametersAtomically_Response_.bin | Bin ...ces__srv__dds___SetParameters_Request_.bin | Bin ...es__srv__dds___SetParameters_Response_.bin | Bin ...n__msg__dds___ParticipantEntitiesInfo_.bin | Bin ...srv__dds___GetTypeDescription_Request_.bin | Bin ...rv__dds___GetTypeDescription_Response_.bin | Bin .../test/ddsEnablerTypedTests/CMakeLists.txt | 4 + 33 files changed, 180 insertions(+), 9 deletions(-) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_msgs__msg__dds___GoalStatusArray_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin (100%) rename ddsenabler/test/{test_files/test_service.json => ddsEnablerTests/test_files/add_two_ints} (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin (100%) rename ddsenabler/test/{test_files/test_action.json => ddsEnablerTests/test_files/fibonacci__action_} (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__msg__dds___Log_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin (100%) rename ddsenabler/test/{ => ddsEnablerTests}/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin (100%) diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 400a2003..7afc2511 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -26,6 +26,8 @@ #include "ddsenabler/dds_enabler_runner.hpp" +#include + using namespace eprosima::ddspipe; using namespace eprosima::ddsenabler; using namespace eprosima::ddsenabler::participants; @@ -90,6 +92,21 @@ class DDSEnablerTester : public ::testing::Test test_data_notification_callback, test_type_query_callback, test_topic_query_callback + }, + { + test_service_notification_callback, + test_service_request_notification_callback, + test_service_reply_notification_callback, + test_service_query_callback + }, + { + test_action_notification_callback, + test_action_goal_request_notification_callback, + test_action_feedback_notification_callback, + test_action_cancel_request_notification_callback, + test_action_result_notification_callback, + test_action_status_notification_callback, + test_action_query_callback } }; @@ -130,6 +147,21 @@ class DDSEnablerTester : public ::testing::Test test_data_notification_callback, test_type_query_callback, test_topic_query_callback + }, + { + test_service_notification_callback, + test_service_request_notification_callback, + test_service_reply_notification_callback, + test_service_query_callback + }, + { + test_action_notification_callback, + test_action_goal_request_notification_callback, + test_action_feedback_notification_callback, + test_action_cancel_request_notification_callback, + test_action_result_notification_callback, + test_action_status_notification_callback, + test_action_query_callback } }; @@ -325,6 +357,16 @@ class DDSEnablerTester : public ::testing::Test std::unique_ptr& serialized_type_internal, uint32_t& serialized_type_internal_size) { + constexpr char persistence_dir[] = "test_files"; + if (utils::load_type_from_file( + persistence_dir, + type_name, + serialized_type_internal, + serialized_type_internal_size)) + { + return true; + } + std::cout << "ERROR: fail to load type from directory: " << persistence_dir << std::endl; return false; } @@ -380,6 +422,119 @@ class DDSEnablerTester : public ::testing::Test } } + // SERVICES + static void test_service_notification_callback( + const char* service_name, + const eprosima::ddsenabler::participants::ServiceInfo& service_info) + { + } + + static bool test_service_query_callback( + const char* service_name, + eprosima::ddsenabler::participants::ServiceInfo& service_info) + { + constexpr char persistence_dir[] = "test_files"; + if (utils::load_service_from_file( + persistence_dir, + service_name, + service_info)) + { + return true; + } + std::cout << "ERROR: fail to load service from directory: " << persistence_dir << std::endl; + return false; + } + + static void test_service_reply_notification_callback( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time) + { + } + + static void test_service_request_notification_callback( + const char* service_name, + const char* json, + uint64_t request_id, + int64_t publish_time) + { + } + + // ACTIONS + + // Static action notification callback + static void test_action_notification_callback( + const char* action_name, + const eprosima::ddsenabler::participants::ActionInfo& action_info) + { + } + + // Static action query callback + static bool test_action_query_callback( + const char* action_name, + eprosima::ddsenabler::participants::ActionInfo& action_info) + { + constexpr char persistence_dir[] = "test_files"; + if (!utils::load_action_from_file( + persistence_dir, + action_name, + action_info)) + { + std::cerr << "Failed to load action: " << action_name << std::endl; + return false; + } + return true; + } + + // Static action goal request notification callback + static bool test_action_goal_request_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) + { + return false; + } + + // Static action result notification callback + static void test_action_result_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) + { + } + + // Static action feedback notification callback + static void test_action_feedback_notification_callback( + const char* action_name, + const char* json, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t publish_time) + { + } + + // Static action status notification callback + static void test_action_status_notification_callback( + const char* action_name, + const eprosima::ddsenabler::participants::UUID& goal_id, + eprosima::ddsenabler::participants::StatusCode statusCode, + const char* statusMessage, + int64_t publish_time) + { + } + + // Static action cancel request notification callback + static void test_action_cancel_request_notification_callback( + const char* action_name, + const eprosima::ddsenabler::participants::UUID& goal_id, + int64_t timestamp, + uint64_t request_id, + int64_t publish_time) + { + } + // Pointer to the current test instance (for use in the static callback) static DDSEnablerTester* current_test_instance_; @@ -396,4 +551,9 @@ class DDSEnablerTester : public ::testing::Test }; + + + + + } // namespace ddsenablertester diff --git a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt index cf1acc8e..626d9c2b 100644 --- a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt +++ b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt @@ -40,14 +40,10 @@ set(TEST_LIST send_history_bigger_than_writer send_history_smaller_than_writer send_history_multiple_types - manual_service_discovery - manual_request - manual_reply - manual_action_discovery - manual_action_client - manual_action_client_cancel - manual_action_server - manual_action_server_cancel + service_client + service_server + action_client + action_server ) set(TEST_NEEDED_SOURCES @@ -56,6 +52,7 @@ set(TEST_NEEDED_SOURCES set(TEST_EXTRA_HEADERS ${PROJECT_SOURCE_DIR}/test ${PROJECT_SOURCE_DIR}/test/ddsEnablerTests/types + ${PROJECT_SOURCE_DIR}/examples/utils ) add_blackbox_executable( @@ -67,6 +64,16 @@ add_blackbox_executable( "${TEST_LIBRARY_SOURCES}" ) +target_sources(blackbox_DDSEnablerTest PRIVATE ${PROJECT_SOURCE_DIR}/examples/utils/Utils.cpp) +target_include_directories(blackbox_DDSEnablerTest PRIVATE ${PROJECT_SOURCE_DIR}/examples/utils) + +# Copy test resources next to the test binary so runtime can use a relative path +add_custom_command(TARGET blackbox_DDSEnablerTest POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${PROJECT_SOURCE_DIR}/test/ddsEnablerTests/test_files + $/test_files +) + ################################################################################## diff --git a/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp b/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp index 3a475262..c44f02a3 100644 --- a/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp +++ b/ddsenabler/test/ddsEnablerTests/DdsEnablerTest.cpp @@ -457,4 +457,4 @@ int main( { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/ddsenabler/test/test_files/action_msgs__msg__dds___GoalStatusArray_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_msgs__msg__dds___GoalStatusArray_.bin similarity index 100% rename from ddsenabler/test/test_files/action_msgs__msg__dds___GoalStatusArray_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_msgs__msg__dds___GoalStatusArray_.bin diff --git a/ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_msgs__srv__dds___CancelGoal_Request_.bin diff --git a/ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_msgs__srv__dds___CancelGoal_Response_.bin diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin similarity index 100% rename from ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_FeedbackMessage_.bin diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Request_.bin diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_GetResult_Response_.bin diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Request_.bin diff --git a/ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/action_tutorials_interfaces__action__dds___Fibonacci_SendGoal_Response_.bin diff --git a/ddsenabler/test/test_files/test_service.json b/ddsenabler/test/ddsEnablerTests/test_files/add_two_ints similarity index 100% rename from ddsenabler/test/test_files/test_service.json rename to ddsenabler/test/ddsEnablerTests/test_files/add_two_ints diff --git a/ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/example_interfaces__srv__dds___AddTwoInts_Request_.bin diff --git a/ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/example_interfaces__srv__dds___AddTwoInts_Response_.bin diff --git a/ddsenabler/test/test_files/test_action.json b/ddsenabler/test/ddsEnablerTests/test_files/fibonacci__action_ similarity index 100% rename from ddsenabler/test/test_files/test_action.json rename to ddsenabler/test/ddsEnablerTests/test_files/fibonacci__action_ diff --git a/ddsenabler/test/test_files/rcl_interfaces__msg__dds___Log_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__msg__dds___Log_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__msg__dds___Log_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__msg__dds___Log_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__msg__dds___ParameterEvent_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___DescribeParameters_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___DescribeParameters_Response_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameterTypes_Response_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameters_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___GetParameters_Response_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___ListParameters_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___ListParameters_Response_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParametersAtomically_Response_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParameters_Request_.bin diff --git a/ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rcl_interfaces__srv__dds___SetParameters_Response_.bin diff --git a/ddsenabler/test/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin b/ddsenabler/test/ddsEnablerTests/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin similarity index 100% rename from ddsenabler/test/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/rmw_dds_common__msg__dds___ParticipantEntitiesInfo_.bin diff --git a/ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin b/ddsenabler/test/ddsEnablerTests/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin similarity index 100% rename from ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Request_.bin diff --git a/ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin b/ddsenabler/test/ddsEnablerTests/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin similarity index 100% rename from ddsenabler/test/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin rename to ddsenabler/test/ddsEnablerTests/test_files/type_description_interfaces__srv__dds___GetTypeDescription_Response_.bin diff --git a/ddsenabler/test/ddsEnablerTypedTests/CMakeLists.txt b/ddsenabler/test/ddsEnablerTypedTests/CMakeLists.txt index 0de57b01..c272ae70 100644 --- a/ddsenabler/test/ddsEnablerTypedTests/CMakeLists.txt +++ b/ddsenabler/test/ddsEnablerTypedTests/CMakeLists.txt @@ -686,6 +686,7 @@ set(TEST_NEEDED_SOURCES set(TEST_EXTRA_HEADERS ${PROJECT_SOURCE_DIR}/test ${PROJECT_SOURCE_DIR}/test/ddsEnablerTypedTests/types + ${PROJECT_SOURCE_DIR}/examples/utils ) add_blackbox_executable( @@ -697,3 +698,6 @@ add_blackbox_executable( "${TEST_LIBRARY_SOURCES}" ) +target_sources(blackbox_DDSEnablerTypedTest PRIVATE ${PROJECT_SOURCE_DIR}/examples/utils/Utils.cpp) +target_include_directories(blackbox_DDSEnablerTypedTest PRIVATE ${PROJECT_SOURCE_DIR}/examples/utils) + From 42a69dcd455352bb496ce333b2b18928a49bf9da Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 14:29:50 +0100 Subject: [PATCH 77/87] Fix windows testing Signed-off-by: Eugenio Collado --- ddsenabler/test/DDSEnablerTester.hpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 7afc2511..0ddb834e 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -49,6 +49,12 @@ static int write_delay_ms_ = 20; static int wait_for_ack_ns_ = 1000000000; static int wait_after_publication_ms_ = 200; +const auto input_file_path = std::filesystem::current_path() / "test_files"; +auto persistence_dir = input_file_path.string(); +#if defined(_WIN32) // On windows, the path separator is '\' +std::replace(persistence_dir.begin(), persistence_dir.end(), '/', '\\'); +#endif // _WIN32 + class DDSEnablerTester : public ::testing::Test { public: @@ -357,7 +363,6 @@ class DDSEnablerTester : public ::testing::Test std::unique_ptr& serialized_type_internal, uint32_t& serialized_type_internal_size) { - constexpr char persistence_dir[] = "test_files"; if (utils::load_type_from_file( persistence_dir, type_name, @@ -433,7 +438,6 @@ class DDSEnablerTester : public ::testing::Test const char* service_name, eprosima::ddsenabler::participants::ServiceInfo& service_info) { - constexpr char persistence_dir[] = "test_files"; if (utils::load_service_from_file( persistence_dir, service_name, @@ -475,7 +479,6 @@ class DDSEnablerTester : public ::testing::Test const char* action_name, eprosima::ddsenabler::participants::ActionInfo& action_info) { - constexpr char persistence_dir[] = "test_files"; if (!utils::load_action_from_file( persistence_dir, action_name, From 3606ed4f266ab3fd817712cfe37e52ef17d7751a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 16:19:57 +0100 Subject: [PATCH 78/87] Polish tests Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/goals/1 | 2 +- ddsenabler/examples/action/goals/2 | 2 +- ddsenabler/examples/service/main.cpp | 19 +- ddsenabler/test/DDSEnablerTester.hpp | 7 +- .../execute_and_validate_action_client.py | 187 ++++++++++++++++++ .../execute_and_validate_action_server.py | 121 ++++++++++++ .../scripts/ros2_nodes/AdditionClient.py | 118 +++++++++++ .../scripts/ros2_nodes/AdditionServer.py | 98 +++++++++ .../scripts/ros2_nodes/FibonacciClient.py | 84 ++++++++ .../scripts/ros2_nodes/FibonacciServer.py | 149 ++++++++++++++ .../compose/scripts/ros2_nodes/node_main.py | 41 +++- .../actions/action_client/compose.yml | 4 +- .../actions/action_client_cancel/compose.yml | 4 +- .../actions/action_server/compose.yml | 29 +-- .../actions/run_action_server_timeout.sh | 20 -- .../services/run_service_server_timeout.sh | 21 -- .../services/service_client/compose.yml | 4 +- .../services/service_server/compose.yml | 33 +--- 18 files changed, 826 insertions(+), 117 deletions(-) create mode 100644 ddsenabler_test/compose/scripts/execute_and_validate_action_client.py create mode 100644 ddsenabler_test/compose/scripts/execute_and_validate_action_server.py create mode 100644 ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py create mode 100644 ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py create mode 100644 ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py create mode 100644 ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py delete mode 100755 ddsenabler_test/compose/test_cases/actions/run_action_server_timeout.sh delete mode 100755 ddsenabler_test/compose/test_cases/services/run_service_server_timeout.sh diff --git a/ddsenabler/examples/action/goals/1 b/ddsenabler/examples/action/goals/1 index 53967fb0..12762e95 100644 --- a/ddsenabler/examples/action/goals/1 +++ b/ddsenabler/examples/action/goals/1 @@ -1,3 +1,3 @@ { - "order": 3 + "order": 5 } diff --git a/ddsenabler/examples/action/goals/2 b/ddsenabler/examples/action/goals/2 index 12762e95..b733ce25 100644 --- a/ddsenabler/examples/action/goals/2 +++ b/ddsenabler/examples/action/goals/2 @@ -1,3 +1,3 @@ { - "order": 5 + "order": 6 } diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index f6532220..fb7b8ad3 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -367,7 +367,24 @@ bool server_specific_logic( uint64_t request_id) { std::this_thread::sleep_for(std::chrono::milliseconds(200)); // Simulate processing time - std::string json = "{\"sum\": 3}"; // Example response, replace with actual logic + + // Add_two_ints service logic + int a = 1; // Default values in case of parsing failure + int b = 2; // Default values in case of parsing failure + try + { + auto request_json = nlohmann::json::parse(request); + a = request_json["rq/add_two_intsRequest"]["data"]["0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0"]["a"].get(); + b = request_json["rq/add_two_intsRequest"]["data"]["0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0"]["b"].get(); + } + catch (const std::exception& e) + { + std::cerr << "Failed to parse request JSON: " << e.what() << " Using default values a=1, b=2." << std::endl; + } + nlohmann::json response_json; + response_json["sum"] = a + b; + std::string json = response_json.dump(); + if (!enabler->send_service_reply(service_name, json, request_id)) { std::cerr << "Failed to send service reply for request ID: " << request_id << std::endl; diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 0ddb834e..81355f00 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -13,6 +13,9 @@ // limitations under the License. #include +#include +#include + #include #include @@ -49,8 +52,8 @@ static int write_delay_ms_ = 20; static int wait_for_ack_ns_ = 1000000000; static int wait_after_publication_ms_ = 200; -const auto input_file_path = std::filesystem::current_path() / "test_files"; -auto persistence_dir = input_file_path.string(); +static const auto input_file_path = std::filesystem::current_path() / "test_files"; +static std::string persistence_dir = input_file_path.string(); #if defined(_WIN32) // On windows, the path separator is '\' std::replace(persistence_dir.begin(), persistence_dir.end(), '/', '\\'); #endif // _WIN32 diff --git a/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py b/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py new file mode 100644 index 00000000..ae0ff694 --- /dev/null +++ b/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py @@ -0,0 +1,187 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +import re +from typing import List, Tuple + +import log + +import validation + +DESCRIPTION = """Script to validate Fibonacci action client output""" +USAGE = ('python3 execute_and_validate_action_client.py ' + '[-s ] [-t ] [-e ] [--delay ] [-d]') + + +def parse_options(): + """ + Parse arguments. + + :return: The arguments parsed. + """ + parser = argparse.ArgumentParser( + formatter_class=argparse.ArgumentDefaultsHelpFormatter, + add_help=True, + description=(DESCRIPTION), + usage=(USAGE) + ) + parser.add_argument( + '-s', + '--samples', + type=int, + default=3, + help='Number of goal requests to send/expect.' + ) + parser.add_argument( + '-t', + '--timeout', + type=int, + default=20, + help='Timeout for the action client application.' + ) + parser.add_argument( + '-e', + '--exe', + type=str, + default='/scripts/ros2_nodes/node_main.py', + help='Path to the action client executable (python entrypoint).' + ) + parser.add_argument( + '--delay', + type=float, + default=0, + help='Time to wait before starting execution.' + ) + parser.add_argument( + '-d', + '--debug', + action='store_true', + help='Print test debugging info.' + ) + + return parser.parse_args() + + +def _client_command(args): + """ + Build the command to execute the client. + + :param args: Arguments parsed + :return: Command to execute the client + """ + command = [ + 'python3', args.exe, + '--action', + '--client', + '--samples', str(args.samples) + ] + + return command + + +# ------------------------- Parsing & Validation ------------------------- # + +def _extract_number_sequences_from_line(line: str) -> List[int]: + """Extract a list of ints from a line, supporting formats like: + - Result { 0,1,1,2 } + - Result: [0, 1, 1, 2] + - result -> 0 1 1 2 + The function returns the first reasonable list of ints found. + """ + # Prefer content inside brackets or braces + for opening, closing in [("[", "]"), ("{", "}")]: + if opening in line and closing in line: + content = line.split(opening, 1)[1].split(closing, 1)[0] + nums = re.findall(r"-?\d+", content) + return [int(n) for n in nums] + + # Otherwise, extract from the tail of the line + tail = line.split(':', 1)[-1] + nums = re.findall(r"-?\d+", tail) + return [int(n) for n in nums] + + +def _client_parse_output(stdout: str, stderr: str) -> Tuple[List[List[int]], str]: + """ + Transform the output of the program into a list of Fibonacci sequences. + + We look for lines containing the word 'Result' (case-insensitive) and + extract number sequences from them. Each sequence corresponds to one goal. + """ + lines = stdout.splitlines() + + sequences: List[List[int]] = [] + for line in lines: + if 'result' in line.lower(): + seq = _extract_number_sequences_from_line(line) + if len(seq) >= 2: # minimal Fibonacci + sequences.append(seq) + + return sequences, stderr + + +def _is_fibonacci(seq: List[int]) -> bool: + """Check that a sequence is a valid Fibonacci progression starting at 0, 1.""" + if len(seq) < 2: + return False + if not (seq[0] == 0 and seq[1] == 1): + return False + for i in range(2, len(seq)): + if seq[i] != seq[i - 1] + seq[i - 2]: + return False + return True + + +def _client_validate(stdout_parsed: List[List[int]], stderr_parsed: str): + # First apply the default validator + ret_code = validation.validate_default(stdout_parsed, stderr_parsed) + if ret_code != validation.ReturnCode.SUCCESS: + return ret_code + + # Ensure we have at least one sequence + if len(stdout_parsed) == 0: + log.logger.error('No result sequences were found in client output.') + return validation.ReturnCode.NOT_VALID_MESSAGES + + # Validate each result sequence as Fibonacci + for seq in stdout_parsed: + if not _is_fibonacci(seq): + log.logger.error(f'Non-Fibonacci sequence detected: {seq}') + return validation.ReturnCode.NOT_VALID_MESSAGES + + return ret_code + + +if __name__ == '__main__': + + # Parse arguments + args = parse_options() + + # Set log level + if args.debug: + log.activate_debug() + + command = _client_command(args) + + ret_code = validation.run_and_validate( + command=command, + timeout=args.timeout, + delay=args.delay, + parse_output_function=_client_parse_output, + validate_output_function=_client_validate) + + log.logger.info(f'Action client validator exited with code {ret_code}') + + exit(ret_code.value) diff --git a/ddsenabler_test/compose/scripts/execute_and_validate_action_server.py b/ddsenabler_test/compose/scripts/execute_and_validate_action_server.py new file mode 100644 index 00000000..9d3c1cbe --- /dev/null +++ b/ddsenabler_test/compose/scripts/execute_and_validate_action_server.py @@ -0,0 +1,121 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse + +import log + +import validation + +DESCRIPTION = """Script to validate Fibonacci action server output""" +USAGE = ('python3 execute_and_validate_action_server.py ' + '[-s ] [--expect-cancel] [-t ] [-e ] [--delay ] [-d]') + + +def parse_options(): + """ + Parse arguments. + + :return: The arguments parsed. + """ + parser = argparse.ArgumentParser( + formatter_class=argparse.ArgumentDefaultsHelpFormatter, + add_help=True, + description=(DESCRIPTION), + usage=(USAGE) + ) + parser.add_argument( + '-s', + '--samples', + type=int, + default=3, + help='Number of goals the server must process before exiting.' + ) + parser.add_argument( + '--expect-cancel', + action='store_true', + help='Expect goals to be cancelled; count cancellations towards samples.' + ) + parser.add_argument( + '-t', + '--timeout', + type=int, + default=20, + help='Timeout for the action server application.' + ) + parser.add_argument( + '-e', + '--exe', + type=str, + default='/scripts/ros2_nodes/node_main.py', + help='Path to the action server executable (python entrypoint).' + ) + parser.add_argument( + '--delay', + type=float, + default=0, + help='Time to wait before starting execution.' + ) + parser.add_argument( + '-d', + '--debug', + action='store_true', + help='Print test debugging info.' + ) + + return parser.parse_args() + + +def _server_command(args): + """ + Build the command to execute the server. + + :param args: Arguments parsed + :return: Command to execute the server + """ + command = [ + 'python3', args.exe, + '--action', + '--samples', str(args.samples) + ] + if args.expect_cancel: + command.append('--expect-cancel') + + return command + + +if __name__ == '__main__': + + # Parse arguments + args = parse_options() + + # Set log level + if args.debug: + log.activate_debug() + + command = _server_command(args) + + # Check process exits after serving the expected goals and stderr is empty + ret_code = validation.run_and_validate( + command=command, + timeout=args.timeout, + delay=args.delay, + parse_output_function=validation.parse_default, + validate_output_function=validation.validate_default, + timeout_as_error=True + ) + + log.logger.info(f'Action server validator exited with code {ret_code}') + + exit(ret_code.value) diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py new file mode 100644 index 00000000..4c50df4c --- /dev/null +++ b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py @@ -0,0 +1,118 @@ +# Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +ROS 2 Addition Service Client used for testing. +""" + +### +# Required for import ../utils +import inspect +import os +import sys + +currentdir = os.path.dirname( + os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) +### + +import random + +from example_interfaces.srv import AddTwoInts + +import rclpy +from rclpy.node import Node + +from utils import print_with_timestamp, sleep_random_time + + +class AdditionClient(Node): + + def __init__( + self): + + # Call Node constructor + super().__init__('ClientAddition') + + # Create both clients + self.addition_client = self.create_client( + AddTwoInts, 'add_two_ints') + + print_with_timestamp( + f'Client Addition created.') + + def run( + self, + samples: int, + wait: bool): + """ + Loop until number of samples has been replied. + + :param samples: Number of samples to reply. + + :return: True if all samples have been replied, False otherwise. + """ + print_with_timestamp( + f'Client waiting for server.') + while not self.addition_client.wait_for_service(timeout_sec=1.0): + print_with_timestamp( + f'Server not available yet...') + + print_with_timestamp( + f'Running Client Addition for {samples} samples.') + + while samples > 0: + # Sleep a minimum amount of time + if wait: + sleep_random_time(0.1, 0.2) + + # Generate random numbers + a = random.randint(0, 100) + b = random.randint(0, 100) + + # Send request + result = self._send_request_sync(a, b) + + # Log result + print_with_timestamp( + f'Result {{ {a},{b},{result} }}') + + # Decrement samples + samples -= 1 + + return True + + def _send_request_sync( + self, + a: int, + b: int) -> int: + + """Send addition request and wait for result.""" + # Set request + request = AddTwoInts.Request() + request.a = a + request.b = b + + print_with_timestamp( + f'Request {{ {a},{b} }} sent, waiting for server result.') + + # Send request + self.future = self.addition_client.call_async(request) + + # Wait for response + rclpy.spin_until_future_complete(self, self.future) + + # Return result + return self.future.result().sum diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py new file mode 100644 index 00000000..1fdfbb8a --- /dev/null +++ b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py @@ -0,0 +1,98 @@ +# Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +ROS 2 Add two ints Service Server used for testing. +""" + +### +# Required for import ../utils +import inspect +import os +import sys + +currentdir = os.path.dirname( + os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) +### + +import rclpy +from rclpy.node import Node +import time + +from example_interfaces.srv import AddTwoInts + +from utils import print_with_timestamp, sleep_random_time + + +class AdditionServer(Node): + + def __init__( + self): + """Construct default Addition Server.""" + super().__init__('AdditionMicroServer') + self.srv = self.create_service( + AddTwoInts, + 'add_two_ints', + self._addition_service_callback) + + self.samples_replied = 0 + self.wait_ = False + + print_with_timestamp( + f'Server Addition created.') + + def _addition_service_callback( + self, + request: AddTwoInts.Request, + response: AddTwoInts.Response): + """Response to the request received.""" + # Calculate this microservice result + response.sum = request.a + request.b + self.samples_replied += 1 + + # Log server result + print_with_timestamp( + f'Request {{ {request.a} + {request.b} = {response.sum} }}') + + # Sleep a minimum amount of time to simulate a long computation + if self.wait_: + sleep_random_time(0.1, 0.2) + + # return response + return response + + def run( + self, + samples: int, + wait: bool): + """ + Loop until number of samples has been replied. + + :param samples: Number of samples to reply. + + :return: True if all samples have been replied, False otherwise. + """ + print_with_timestamp( + f'Running Server Addition for {samples} samples.') + self.wait_ = wait + + while self.samples_replied < samples: + rclpy.spin_once(self) + + # Sleep some time after last reply sent, in case it needs to be resent + time.sleep(2) + + return True diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py new file mode 100644 index 00000000..d04f08dc --- /dev/null +++ b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py @@ -0,0 +1,84 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +ROS 2 Fibonacci Action Client used for testing. +""" + +# Required for import ../utils +import inspect +import os +import sys + +currentdir = os.path.dirname( + os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) + +import rclpy +from rclpy.node import Node +from rclpy.action import ActionClient + +# Prefer action_tutorials_interfaces to match standard tutorial servers +from action_tutorials_interfaces.action import Fibonacci + +from utils import print_with_timestamp, sleep_random_time + + +class FibonacciClient(Node): + """Fibonacci Action Client node.""" + + def __init__(self): + super().__init__('FibonacciActionClient') + self._client = ActionClient(self, Fibonacci, 'fibonacci') + print_with_timestamp('Fibonacci Action Client created.') + + def run(self, samples: int, wait: bool): + """Send `samples` goals and wait for their results.""" + print_with_timestamp('Client waiting for action server.') + while not self._client.wait_for_server(timeout_sec=1.0): + print_with_timestamp('Action server not available yet...') + + print_with_timestamp(f'Running Fibonacci Action Client for {samples} goals.') + while samples > 0: + # Optionally wait before sending a goal + if wait: + sleep_random_time(0.05, 0.15) + + sequence = self._send_goal_sync(order=10) + + print_with_timestamp( + 'Result { ' + ','.join(map(str, sequence)) + ' }') + + samples -= 1 + + return True + + def _send_goal_sync(self, order: int): + goal_msg = Fibonacci.Goal() + goal_msg.order = int(order) + + send_future = self._client.send_goal_async(goal_msg) + rclpy.spin_until_future_complete(self, send_future) + goal_handle = send_future.result() + + if not goal_handle.accepted: + print_with_timestamp('Goal rejected') + return [] + + get_result_future = goal_handle.get_result_async() + rclpy.spin_until_future_complete(self, get_result_future) + result = get_result_future.result().result + + return list(result.sequence) diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py new file mode 100644 index 00000000..918c5207 --- /dev/null +++ b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py @@ -0,0 +1,149 @@ +# Copyright 2025 Proyectos y Sistemas de Mantenimiento SL (eProsima). +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +""" +ROS 2 Fibonacci Action Server used for testing. +""" + +import inspect +import os +import sys +import time + +currentdir = os.path.dirname( + os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) + +import rclpy +from rclpy.node import Node +from rclpy.action import ActionServer, CancelResponse, GoalResponse +from rclpy.callback_groups import ReentrantCallbackGroup +from rclpy.executors import MultiThreadedExecutor +import time + +# Prefer action_tutorials_interfaces to match standard tutorial servers +from action_tutorials_interfaces.action import Fibonacci + +from utils import print_with_timestamp + + +class FibonacciServer(Node): + """Fibonacci Action Server node.""" + + def __init__(self): + super().__init__('FibonacciActionServer') + + self._cb_group = ReentrantCallbackGroup() + + self._action_server = ActionServer( + self, + Fibonacci, + 'fibonacci', + self.execute_callback, + goal_callback=self.goal_callback, + cancel_callback=self.cancel_callback, + callback_group=self._cb_group) + + self.goals_executed = 0 + self.goals_canceled = 0 + self.expect_cancel_ = False + + print_with_timestamp('Fibonacci Action Server created.') + + def goal_callback(self, goal_request: Fibonacci.Goal): + if goal_request.order < 0: + return GoalResponse.REJECT + return GoalResponse.ACCEPT + + def cancel_callback(self, goal_handle): + return CancelResponse.ACCEPT + + async def execute_callback(self, goal_handle): + """Execute received goal to compute Fibonacci sequence.""" + order = int(goal_handle.request.order) + + # Build Fibonacci sequence + sequence = [] + if order <= 0: + sequence = [] + elif order == 1: + sequence = [0] + else: + sequence = [0, 1] + feedback_msg = Fibonacci.Feedback() + for i in range(2, order): + # If cancel requested, cancel goal and return partial sequence + if goal_handle.is_cancel_requested: + goal_handle.canceled() + self.goals_canceled += 1 + result = Fibonacci.Result() + result.sequence = sequence + print_with_timestamp( + 'Goal canceled with partial { ' + ','.join(map(str, sequence)) + ' }') + return result + sequence.append(sequence[i - 1] + sequence[i - 2]) + # Publish feedback so clients can track progress + feedback_msg.partial_sequence = sequence.copy() + goal_handle.publish_feedback(feedback_msg) + time.sleep(1) + + if goal_handle.is_cancel_requested: + goal_handle.canceled() + self.goals_canceled += 1 + result = Fibonacci.Result() + result.sequence = sequence + print_with_timestamp( + 'Goal canceled with partial { ' + ','.join(map(str, sequence)) + ' }') + return result + + goal_handle.succeed() + result = Fibonacci.Result() + result.sequence = sequence + + self.goals_executed += 1 + + print_with_timestamp( + 'Result { ' + ','.join(map(str, sequence)) + ' }') + + return result + + def run(self, samples: int, wait: bool, expect_cancel: bool = False): + """Spin until a number of goals have been processed. + + If expect_cancel is True, count canceled goals towards the target. + Otherwise, count successfully executed goals. + """ + self.expect_cancel_ = expect_cancel + print_with_timestamp( + f'Running Fibonacci Action Server, waiting for {samples} ' + + ('canceled' if self.expect_cancel_ else 'executed') + ' goals.') + + executor = MultiThreadedExecutor(num_threads=2) + executor.add_node(self) + + try: + while True: + executor.spin_once(timeout_sec=0.1) + if self.expect_cancel_: + if self.goals_canceled >= samples: + break + else: + if self.goals_executed >= samples: + break + finally: + executor.shutdown() + + time.sleep(0.5) + return True diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py b/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py index 10f4b5a8..24aff259 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py @@ -14,13 +14,16 @@ import argparse +import rclpy + +# Import service and action nodes lazily to keep optional deps from AdditionClient import AdditionClient from AdditionServer import AdditionServer +from FibonacciClient import FibonacciClient +from FibonacciServer import FibonacciServer -import rclpy - -DESCRIPTION = """Script to Execute a ROS2 Service Node""" -USAGE = ('python3 node_main.py [-s] [-s 15] [-a]') +DESCRIPTION = """Script to Execute a ROS2 Node (Service or Action)""" +USAGE = ('python3 node_main.py [--action] [--client] [-s 10] [-w]') def parse_options(): @@ -35,13 +38,23 @@ def parse_options(): description=(DESCRIPTION), usage=(USAGE) ) - required_args = parser.add_argument_group('required arguments') + required_args = parser.add_argument_group('role') required_args.add_argument( '-c', '--client', action='store_true', help='Execute Client instead of Server.' ) + parser.add_argument( + '--action', + action='store_true', + help='Run Action nodes (Fibonacci) instead of Service nodes (AddTwoInts).' + ) + parser.add_argument( + '--expect-cancel', + action='store_true', + help='In Action server mode, expect goals to be cancelled and count cancellations towards samples.' + ) parser.add_argument( '-s', '--samples', @@ -75,13 +88,23 @@ def main(): # Create Server or Client node = None - if args.client: - node = AdditionClient() + if args.action: + if args.client: + node = FibonacciClient() + else: + node = FibonacciServer() else: - node = AdditionServer() + if args.client: + node = AdditionClient() + else: + node = AdditionServer() # Run nodes until finish - result = node.run(args.samples, args.wait) + if args.action and not args.client: + # Action server: pass expect-cancel behavior + result = node.run(args.samples, args.wait, args.expect_cancel) + else: + result = node.run(args.samples, args.wait) if not result: exit(1) diff --git a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml index b7f00f03..33d24b88 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client/compose.yml @@ -25,8 +25,8 @@ services: environment: - ROS_DOMAIN_ID=40 volumes: - - ./../run_action_server_timeout.sh:/run_action_server_timeout.sh:ro - entrypoint: ["/bin/bash", "/run_action_server_timeout.sh"] + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_server.py --timeout 20 --samples 3 networks: std_net: diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml index 547263c8..8379befd 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_cancel/compose.yml @@ -24,8 +24,8 @@ services: environment: - ROS_DOMAIN_ID=41 volumes: - - ./../run_action_server_timeout.sh:/run_action_server_timeout.sh:ro - entrypoint: ["/bin/bash", "/run_action_server_timeout.sh"] + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_server.py --timeout 20 --samples 3 --expect-cancel networks: std_net: diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml index aac8613b..95a1f9f5 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -22,32 +22,9 @@ services: - std_net environment: - ROS_DOMAIN_ID=42 - command: > - sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" - - fibonacci_client_2: - image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} - container_name: fibonacci_client_2 - depends_on: - - ddsenabler - networks: - - std_net - environment: - - ROS_DOMAIN_ID=42 - command: > - sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" - - fibonacci_client_3: - image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} - container_name: fibonacci_client_3 - depends_on: - - ddsenabler - networks: - - std_net - environment: - - ROS_DOMAIN_ID=42 - command: > - sh -c "sleep 3 && ros2 run action_tutorials_cpp fibonacci_action_client" + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 networks: std_net: diff --git a/ddsenabler_test/compose/test_cases/actions/run_action_server_timeout.sh b/ddsenabler_test/compose/test_cases/actions/run_action_server_timeout.sh deleted file mode 100755 index b9826dfb..00000000 --- a/ddsenabler_test/compose/test_cases/actions/run_action_server_timeout.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# Start the ROS2 server in the background -source /opt/vulcanexus/jazzy/setup.bash -ros2 run action_tutorials_cpp fibonacci_action_server & -SERVER_PID=$! - -# Run for 25 seconds -sleep 25 - -# Gracefully terminate the server -kill -9 $SERVER_PID - -echo "Service server with PID $SERVER_PID terminated after 25 seconds" - -# Wait for the process to fully stop -wait $SERVER_PID 2>/dev/null - -# Return 0 -exit 0 diff --git a/ddsenabler_test/compose/test_cases/services/run_service_server_timeout.sh b/ddsenabler_test/compose/test_cases/services/run_service_server_timeout.sh deleted file mode 100755 index 4da921af..00000000 --- a/ddsenabler_test/compose/test_cases/services/run_service_server_timeout.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Start the ROS2 server in the background -source /opt/vulcanexus/jazzy/setup.bash -ros2 run demo_nodes_cpp add_two_ints_server & -SERVER_PID=$! - -# Run for 15 seconds -sleep 15 - -# Gracefully terminate the server -kill -9 $SERVER_PID - -echo "Service server with PID $SERVER_PID terminated after 15 seconds" - -# Wait for the process to fully stop -wait $SERVER_PID 2>/dev/null - -# Return 0 -exit 0 - diff --git a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml index 97826e61..5676c48b 100644 --- a/ddsenabler_test/compose/test_cases/services/service_client/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_client/compose.yml @@ -24,8 +24,8 @@ services: environment: - ROS_DOMAIN_ID=33 volumes: - - ./../run_service_server_timeout.sh:/run_service_server_timeout.sh:ro - entrypoint: ["/bin/bash", "/run_service_server_timeout.sh"] + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_server.py --timeout 10 --samples 3 networks: std_net: diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index ac4872c6..1dc4f39f 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -22,33 +22,6 @@ services: - std_net environment: - ROS_DOMAIN_ID=34 - command: ros2 run demo_nodes_cpp add_two_ints_client - - add_two_ints_client_2: - image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} - container_name: add_two_ints_client_2 - depends_on: - - ddsenabler - networks: - - std_net - environment: - - ROS_DOMAIN_ID=34 - command: > - sh -c "sleep 3 && - ros2 run demo_nodes_cpp add_two_ints_client" - add_two_ints_client_3: - image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} - container_name: add_two_ints_client_3 - depends_on: - - ddsenabler - networks: - - std_net - environment: - - ROS_DOMAIN_ID=34 - command: > - sh -c "sleep 6 && - ros2 run demo_nodes_cpp add_two_ints_client" -networks: - std_net: - default: - driver: none + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 From 3d9198a025428d9d3226a272b434d06c504092de Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 16:40:12 +0100 Subject: [PATCH 79/87] Dockes tests for discovered types Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 1 + ddsenabler_test/compose/CMakeLists.txt | 1 + .../execute_and_validate_action_client.py | 6 ++-- .../scripts/ros2_nodes/AdditionClient.py | 22 ++++++------ .../scripts/ros2_nodes/AdditionServer.py | 18 +++++----- .../scripts/ros2_nodes/FibonacciClient.py | 16 ++++----- .../scripts/ros2_nodes/FibonacciServer.py | 21 ++++++----- .../compose/scripts/ros2_nodes/node_main.py | 11 +++--- .../action_client_discovered/compose.yml | 35 +++++++++++++++++++ .../action_client_discovered/config.yml | 2 ++ .../service_client_discovered/compose.yml | 34 ++++++++++++++++++ .../service_client_discovered/config.yml | 2 ++ 12 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_client_discovered/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_client_discovered/config.yml diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 9e7e83ec..3a95698d 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -399,6 +399,7 @@ bool client_routine( return false; } } + std::this_thread::sleep_for(std::chrono::seconds(1)); // Wait for any last feedback/result/cancel notifications return true; } diff --git a/ddsenabler_test/compose/CMakeLists.txt b/ddsenabler_test/compose/CMakeLists.txt index edba0265..3f5b0217 100644 --- a/ddsenabler_test/compose/CMakeLists.txt +++ b/ddsenabler_test/compose/CMakeLists.txt @@ -20,6 +20,7 @@ set(TESTS reception/topics_yaml services/service_server services/service_client + services/service_client_discovered actions/action_client actions/action_client_cancel actions/action_server diff --git a/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py b/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py index ae0ff694..f4f654b8 100644 --- a/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py +++ b/ddsenabler_test/compose/scripts/execute_and_validate_action_client.py @@ -101,15 +101,15 @@ def _extract_number_sequences_from_line(line: str) -> List[int]: The function returns the first reasonable list of ints found. """ # Prefer content inside brackets or braces - for opening, closing in [("[", "]"), ("{", "}")]: + for opening, closing in [('[', ']'), ('{', '}')]: if opening in line and closing in line: content = line.split(opening, 1)[1].split(closing, 1)[0] - nums = re.findall(r"-?\d+", content) + nums = re.findall(r'-?\d+', content) return [int(n) for n in nums] # Otherwise, extract from the tail of the line tail = line.split(':', 1)[-1] - nums = re.findall(r"-?\d+", tail) + nums = re.findall(r'-?\d+', tail) return [int(n) for n in nums] diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py index 4c50df4c..7520bc4b 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py @@ -16,6 +16,13 @@ ROS 2 Addition Service Client used for testing. """ +import random + +from example_interfaces.srv import AddTwoInts + +import rclpy +from rclpy.node import Node + ### # Required for import ../utils import inspect @@ -28,14 +35,7 @@ sys.path.insert(0, parentdir) ### -import random - -from example_interfaces.srv import AddTwoInts - -import rclpy -from rclpy.node import Node - -from utils import print_with_timestamp, sleep_random_time +from utils import print_with_timestamp, sleep_random_time # noqa: E402 class AdditionClient(Node): @@ -50,8 +50,7 @@ def __init__( self.addition_client = self.create_client( AddTwoInts, 'add_two_ints') - print_with_timestamp( - f'Client Addition created.') + print_with_timestamp('Client Addition created.') def run( self, @@ -64,8 +63,7 @@ def run( :return: True if all samples have been replied, False otherwise. """ - print_with_timestamp( - f'Client waiting for server.') + print_with_timestamp('Client waiting for server.') while not self.addition_client.wait_for_service(timeout_sec=1.0): print_with_timestamp( f'Server not available yet...') diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py index 1fdfbb8a..e18f87be 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionServer.py @@ -16,6 +16,13 @@ ROS 2 Add two ints Service Server used for testing. """ +import time + +import rclpy +from rclpy.node import Node + +from example_interfaces.srv import AddTwoInts + ### # Required for import ../utils import inspect @@ -28,13 +35,7 @@ sys.path.insert(0, parentdir) ### -import rclpy -from rclpy.node import Node -import time - -from example_interfaces.srv import AddTwoInts - -from utils import print_with_timestamp, sleep_random_time +from utils import print_with_timestamp, sleep_random_time # noqa: E402 class AdditionServer(Node): @@ -51,8 +52,7 @@ def __init__( self.samples_replied = 0 self.wait_ = False - print_with_timestamp( - f'Server Addition created.') + print_with_timestamp('Server Addition created.') def _addition_service_callback( self, diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py index d04f08dc..2ce8423d 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciClient.py @@ -16,6 +16,13 @@ ROS 2 Fibonacci Action Client used for testing. """ +import rclpy +from rclpy.node import Node +from rclpy.action import ActionClient + +# Prefer action_tutorials_interfaces to match standard tutorial servers +from action_tutorials_interfaces.action import Fibonacci + # Required for import ../utils import inspect import os @@ -26,14 +33,7 @@ parentdir = os.path.dirname(currentdir) sys.path.insert(0, parentdir) -import rclpy -from rclpy.node import Node -from rclpy.action import ActionClient - -# Prefer action_tutorials_interfaces to match standard tutorial servers -from action_tutorials_interfaces.action import Fibonacci - -from utils import print_with_timestamp, sleep_random_time +from utils import print_with_timestamp, sleep_random_time # noqa: E402 class FibonacciClient(Node): diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py index 918c5207..49c587f9 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/FibonacciServer.py @@ -16,27 +16,26 @@ ROS 2 Fibonacci Action Server used for testing. """ -import inspect -import os -import sys import time -currentdir = os.path.dirname( - os.path.abspath(inspect.getfile(inspect.currentframe()))) -parentdir = os.path.dirname(currentdir) -sys.path.insert(0, parentdir) - -import rclpy from rclpy.node import Node from rclpy.action import ActionServer, CancelResponse, GoalResponse from rclpy.callback_groups import ReentrantCallbackGroup from rclpy.executors import MultiThreadedExecutor -import time # Prefer action_tutorials_interfaces to match standard tutorial servers from action_tutorials_interfaces.action import Fibonacci -from utils import print_with_timestamp +import inspect +import os +import sys + +currentdir = os.path.dirname( + os.path.abspath(inspect.getfile(inspect.currentframe()))) +parentdir = os.path.dirname(currentdir) +sys.path.insert(0, parentdir) + +from utils import print_with_timestamp # noqa: E402 class FibonacciServer(Node): diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py b/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py index 24aff259..4faa7249 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/node_main.py @@ -14,14 +14,14 @@ import argparse -import rclpy - # Import service and action nodes lazily to keep optional deps from AdditionClient import AdditionClient from AdditionServer import AdditionServer from FibonacciClient import FibonacciClient from FibonacciServer import FibonacciServer +import rclpy + DESCRIPTION = """Script to Execute a ROS2 Node (Service or Action)""" USAGE = ('python3 node_main.py [--action] [--client] [-s 10] [-w]') @@ -48,12 +48,15 @@ def parse_options(): parser.add_argument( '--action', action='store_true', - help='Run Action nodes (Fibonacci) instead of Service nodes (AddTwoInts).' + help='Run Action node instead of Service node.' ) parser.add_argument( '--expect-cancel', action='store_true', - help='In Action server mode, expect goals to be cancelled and count cancellations towards samples.' + help=( + 'In Action server mode, expect goals to be cancelled and count ' + 'cancellations towards samples.' + ) ) parser.add_argument( '-s', diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml new file mode 100644 index 00000000..3468cc51 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml @@ -0,0 +1,35 @@ +# Test description: +# Run ddsenabler example action client against an already running Fibonacci action server. +# No persistence path is used as the types are discovered at runtime. +# The action client sends 3 consecutive goal requests and expects to receive +# the corresponding feedbacks, status and results. +# Domain 40 is set for ROS 2 nodes. + +services: + fibonacci_server: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_server + networks: + - std_net + environment: + - ROS_DOMAIN_ID=40 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_server.py --timeout 20 --samples 3 + + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + depends_on: + - fibonacci_server + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./install/ddsenabler/examples/action/ddsenabler_example_action client --goals-path /persistence/goals --config /config/config.yml --request-initial-wait 2 + +networks: + std_net: + default: + driver: none diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml new file mode 100644 index 00000000..820ec0f8 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 40 diff --git a/ddsenabler_test/compose/test_cases/services/service_client_discovered/compose.yml b/ddsenabler_test/compose/test_cases/services/service_client_discovered/compose.yml new file mode 100644 index 00000000..ca28c9ae --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_client_discovered/compose.yml @@ -0,0 +1,34 @@ +# Test description: +# Run ddsenabler example service client against an already running AddTwoInts server. +# No persistence path is used as the types are discovered at runtime. +# 3 requests are sent to the server. +# Domain 33 is used. + +services: + add_two_ints_server: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_server + networks: + - std_net + environment: + - ROS_DOMAIN_ID=33 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_server.py --timeout 10 --samples 3 + + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + depends_on: + - add_two_ints_server + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./install/ddsenabler/examples/service/ddsenabler_example_service client --requests-path /persistence/requests --config /config/config.yml --request-initial-wait 2 + +networks: + std_net: + default: + driver: none diff --git a/ddsenabler_test/compose/test_cases/services/service_client_discovered/config.yml b/ddsenabler_test/compose/test_cases/services/service_client_discovered/config.yml new file mode 100644 index 00000000..21f38f14 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_client_discovered/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 33 From 86ec60c8c9871aabfd4bbd50609077a3f5034235 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 16:46:20 +0100 Subject: [PATCH 80/87] Fix windows tests Signed-off-by: Eugenio Collado --- ddsenabler/test/DDSEnablerTester.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ddsenabler/test/DDSEnablerTester.hpp b/ddsenabler/test/DDSEnablerTester.hpp index 81355f00..50cc9cdf 100644 --- a/ddsenabler/test/DDSEnablerTester.hpp +++ b/ddsenabler/test/DDSEnablerTester.hpp @@ -52,11 +52,7 @@ static int write_delay_ms_ = 20; static int wait_for_ack_ns_ = 1000000000; static int wait_after_publication_ms_ = 200; -static const auto input_file_path = std::filesystem::current_path() / "test_files"; -static std::string persistence_dir = input_file_path.string(); -#if defined(_WIN32) // On windows, the path separator is '\' -std::replace(persistence_dir.begin(), persistence_dir.end(), '/', '\\'); -#endif // _WIN32 +static const std::filesystem::path input_file_path = std::filesystem::current_path() / "test_files"; class DDSEnablerTester : public ::testing::Test { @@ -366,6 +362,7 @@ class DDSEnablerTester : public ::testing::Test std::unique_ptr& serialized_type_internal, uint32_t& serialized_type_internal_size) { + std::string persistence_dir = input_file_path.string(); if (utils::load_type_from_file( persistence_dir, type_name, @@ -441,6 +438,7 @@ class DDSEnablerTester : public ::testing::Test const char* service_name, eprosima::ddsenabler::participants::ServiceInfo& service_info) { + std::string persistence_dir = input_file_path.string(); if (utils::load_service_from_file( persistence_dir, service_name, @@ -482,6 +480,7 @@ class DDSEnablerTester : public ::testing::Test const char* action_name, eprosima::ddsenabler::participants::ActionInfo& action_info) { + std::string persistence_dir = input_file_path.string(); if (!utils::load_action_from_file( persistence_dir, action_name, From 5f67644930bfc69bd478f1ec18c410acbbbdf3f8 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 16:51:39 +0100 Subject: [PATCH 81/87] Fix python lintern Signed-off-by: Eugenio Collado --- ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py index 7520bc4b..ddff425d 100644 --- a/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py +++ b/ddsenabler_test/compose/scripts/ros2_nodes/AdditionClient.py @@ -65,8 +65,7 @@ def run( """ print_with_timestamp('Client waiting for server.') while not self.addition_client.wait_for_service(timeout_sec=1.0): - print_with_timestamp( - f'Server not available yet...') + print_with_timestamp('Server not available yet...') print_with_timestamp( f'Running Client Addition for {samples} samples.') From 8e21afbe742c88be88cbcbe545655688149cd7f1 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Mon, 3 Nov 2025 16:54:07 +0100 Subject: [PATCH 82/87] Uncrustify Signed-off-by: Eugenio Collado --- ddsenabler_participants/src/cpp/EnablerParticipant.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp index 6fc19bac..fc8f2930 100644 --- a/ddsenabler_participants/src/cpp/EnablerParticipant.cpp +++ b/ddsenabler_participants/src/cpp/EnablerParticipant.cpp @@ -219,7 +219,7 @@ bool EnablerParticipant::publish_rpc( { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to publish data in service " << rpc_info->service_name << - " : service is only announced on the enabler side."); + " : service is only announced on the enabler side."); return false; } @@ -972,7 +972,7 @@ bool EnablerParticipant::query_action_nts_( { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << - " : feedback topic writer creation failed."); + " : feedback topic writer creation failed."); return false; } } @@ -1002,7 +1002,7 @@ bool EnablerParticipant::query_action_nts_( { EPROSIMA_LOG_ERROR(DDSENABLER_ENABLER_PARTICIPANT, "Failed to announce action " << action.action_name << - " : status topic writer creation failed."); + " : status topic writer creation failed."); return false; } } From dcd2309ec6e73986753041236654a8b0f5bc932c Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 4 Nov 2025 07:45:23 +0100 Subject: [PATCH 83/87] Fix CI Signed-off-by: Eugenio Collado --- ddsenabler/test/ddsEnablerTests/CMakeLists.txt | 13 +++++++++++++ ddsenabler_test/compose/CMakeLists.txt | 1 + .../test_cases/services/service_server/compose.yml | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt index 626d9c2b..31e09e60 100644 --- a/ddsenabler/test/ddsEnablerTests/CMakeLists.txt +++ b/ddsenabler/test/ddsEnablerTests/CMakeLists.txt @@ -74,6 +74,19 @@ add_custom_command(TARGET blackbox_DDSEnablerTest POST_BUILD $/test_files ) +# Also copy test resources to the test target binary directory (configuration-agnostic) +# Rationale: On single-config generators (Linux), CTest runs from the target dir, which matches +# $. On multi-config generators (Windows/MSVC), CTest's working directory is usually +# the CMake current binary dir (e.g., .../ddsEnablerTests) while the executable lives under a +# configuration subfolder (e.g., .../ddsEnablerTests/Debug). The tests locate resources via +# std::filesystem::current_path()/"test_files"; thus, we ensure the resources are available from +# the CTest working dir as well. +add_custom_command(TARGET blackbox_DDSEnablerTest POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${PROJECT_SOURCE_DIR}/test/ddsEnablerTests/test_files + ${CMAKE_CURRENT_BINARY_DIR}/test_files +) + ################################################################################## diff --git a/ddsenabler_test/compose/CMakeLists.txt b/ddsenabler_test/compose/CMakeLists.txt index 3f5b0217..d6cdfec0 100644 --- a/ddsenabler_test/compose/CMakeLists.txt +++ b/ddsenabler_test/compose/CMakeLists.txt @@ -23,6 +23,7 @@ set(TESTS services/service_client_discovered actions/action_client actions/action_client_cancel + actions/action_client_discovered actions/action_server ) diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index 1dc4f39f..dc851b32 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -25,3 +25,8 @@ services: volumes: - ../../../scripts:/scripts command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + +networks: + std_net: + default: + driver: none From cdae9f809f126b3735fb98c104354b9f86848731 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Tue, 4 Nov 2025 15:32:35 +0100 Subject: [PATCH 84/87] Signal handler Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 41 +++++++++++++++++++-------- ddsenabler/examples/service/main.cpp | 42 ++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 24 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index 3a95698d..e6c1be26 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -279,13 +279,16 @@ bool wait_for_action_discovery( std::condition_variable& app_cv) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { return stop_app_ || action_discovered_; - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for service discovery." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for service discovery." << std::endl; + } return false; } return true; @@ -299,13 +302,16 @@ bool wait_for_action_request( std::string& goal_json) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { return stop_app_ || !received_requests_.empty(); - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for service request." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for service request." << std::endl; + } return false; } @@ -322,13 +328,16 @@ bool wait_for_action_result( uint32_t sent_requests) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), [&sent_requests]() { return stop_app_ || received_results_ >= sent_requests; - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for action result." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for action result." << std::endl; + } return false; } return true; @@ -345,7 +354,6 @@ bool client_routine( // Wait for service to be discovered if (!wait_for_action_discovery(timeout, app_mutex_, app_cv_)) { - std::cerr << "Failed to discover service: " << action_name << std::endl; return false; } @@ -395,7 +403,6 @@ bool client_routine( // Wait publish period or until stop signal is received else if (!wait_for_action_result(timeout, app_mutex_, app_cv_, sent_requests)) { - std::cerr << "Failed to receive service reply." << std::endl; return false; } } @@ -414,6 +421,10 @@ bool server_specific_logic( std::string feedback_json = "{\"partial_sequence\": ["; for (size_t i = 0; i < fibonacci_number; ++i) { + if (stop_app_) + { + return false; + } json += std::to_string(fibonacci_sequence[i]); feedback_json += std::to_string(fibonacci_sequence[i]); @@ -470,7 +481,6 @@ bool server_routine( std::string goal_json; if (!wait_for_action_request(timeout, app_mutex_, app_cv_, request_id, goal_json)) { - std::cerr << "Timeout waiting for action request." << std::endl; return false; } @@ -513,6 +523,13 @@ int main( int argc, char** argv) { + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); +#ifndef _WIN32 + signal(SIGQUIT, signal_handler); + signal(SIGHUP, signal_handler); +#endif // _WIN32 + using namespace eprosima::ddsenabler; eprosima::utils::Log::ReportFilenames(true); diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index fb7b8ad3..4d47f100 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -248,13 +248,16 @@ bool wait_for_service_discovery( std::condition_variable& app_cv) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { return stop_app_ || service_discovered_; - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for service discovery." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for service discovery." << std::endl; + } return false; } return true; @@ -268,13 +271,16 @@ bool wait_for_service_request( std::string& request) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), []() { return stop_app_ || !received_requests_.empty(); - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for service request." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for service request." << std::endl; + } return false; } @@ -292,13 +298,16 @@ bool wait_for_service_reply( uint32_t sent_requests) { std::unique_lock lock(app_mutex); - if (stop_app_ || !app_cv.wait_for(lock, std::chrono::seconds(timeout), + if (!app_cv.wait_for(lock, std::chrono::seconds(timeout), [&sent_requests]() { return stop_app_ || received_replies_ >= sent_requests; - })) + }) || stop_app_) { - std::cerr << "Timeout waiting for service reply." << std::endl; + if (!stop_app_) + { + std::cerr << "Timeout waiting for service reply." << std::endl; + } return false; } return true; @@ -314,7 +323,6 @@ bool client_routine( // Wait for service to be discovered if (!wait_for_service_discovery(timeout, app_mutex_, app_cv_)) { - std::cerr << "Failed to discover service: " << service_name << std::endl; return false; } @@ -327,6 +335,11 @@ bool client_routine( uint32_t sent_requests = 0; for (const auto& [path, number] : sample_files) { + if (stop_app_) + { + return false; + } + std::ifstream file(path, std::ios::binary); if (file) { @@ -353,7 +366,6 @@ bool client_routine( // Wait publish period or until stop signal is received if (!wait_for_service_reply(timeout, app_mutex_, app_cv_, sent_requests)) { - std::cerr << "Failed to receive service reply." << std::endl; return false; } } @@ -414,7 +426,6 @@ bool server_routine( std::string request; if (!wait_for_service_request(timeout, app_mutex_, app_cv_, request_id, request)) { - std::cerr << "Timeout waiting for service request." << std::endl; return false; } @@ -453,6 +464,13 @@ int main( int argc, char** argv) { + signal(SIGINT, signal_handler); + signal(SIGTERM, signal_handler); +#ifndef _WIN32 + signal(SIGQUIT, signal_handler); + signal(SIGHUP, signal_handler); +#endif // _WIN32 + using namespace eprosima::ddsenabler; eprosima::utils::Log::ReportFilenames(true); From 02cd3168e82a869e92b553327f0bd2491fee4435 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 6 Nov 2025 07:57:29 +0100 Subject: [PATCH 85/87] Stop app protected by mtx Signed-off-by: Eugenio Collado --- ddsenabler/examples/action/main.cpp | 17 +++++++++++++---- ddsenabler/examples/service/main.cpp | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ddsenabler/examples/action/main.cpp b/ddsenabler/examples/action/main.cpp index e6c1be26..1b571a28 100644 --- a/ddsenabler/examples/action/main.cpp +++ b/ddsenabler/examples/action/main.cpp @@ -421,10 +421,14 @@ bool server_specific_logic( std::string feedback_json = "{\"partial_sequence\": ["; for (size_t i = 0; i < fibonacci_number; ++i) { - if (stop_app_) { - return false; + std::lock_guard lock(app_mutex_); + if (stop_app_) + { + return false; + } } + json += std::to_string(fibonacci_sequence[i]); feedback_json += std::to_string(fibonacci_sequence[i]); @@ -474,8 +478,12 @@ bool server_routine( } std::cout << "Action announced: " << action_name << std::endl; - - while (!stop_app_) + bool stop_app = false; + { + std::lock_guard lock(app_mutex_); + stop_app = stop_app_; + } + while (!stop_app) { eprosima::ddsenabler::participants::UUID request_id; std::string goal_json; @@ -506,6 +514,7 @@ bool server_routine( { break; } + stop_app = stop_app_; } } diff --git a/ddsenabler/examples/service/main.cpp b/ddsenabler/examples/service/main.cpp index 4d47f100..03864ae3 100644 --- a/ddsenabler/examples/service/main.cpp +++ b/ddsenabler/examples/service/main.cpp @@ -335,9 +335,12 @@ bool client_routine( uint32_t sent_requests = 0; for (const auto& [path, number] : sample_files) { - if (stop_app_) { - return false; + std::lock_guard lock(app_mutex_); + if (stop_app_) + { + return false; + } } std::ifstream file(path, std::ios::binary); @@ -420,7 +423,13 @@ bool server_routine( std::cout << "Service announced: " << service_name << std::endl; - while (!stop_app_) + bool stop_app = false; + { + std::lock_guard lock(app_mutex_); + stop_app = stop_app_; + } + + while (!stop_app) { uint64_t request_id = 0; std::string request; @@ -448,6 +457,7 @@ bool server_routine( std::this_thread::sleep_for(std::chrono::milliseconds(1000)); return true; } + stop_app = stop_app_; } } From 13531e7dce7552ba08a252408396345fc6f38450 Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 6 Nov 2025 08:20:41 +0100 Subject: [PATCH 86/87] Docker Testing multiclient Signed-off-by: Eugenio Collado --- ddsenabler_test/compose/CMakeLists.txt | 2 + .../action_client_discovered/compose.yml | 4 +- .../action_client_discovered/config.yml | 2 +- .../actions/action_server/compose.yml | 2 +- .../action_server_multiclient/compose.yml | 60 +++++++++++++++++++ .../action_server_multiclient/config.yml | 2 + .../services/service_server/compose.yml | 4 +- .../service_server_multiclient/compose.yml | 58 ++++++++++++++++++ .../service_server_multiclient/config.yml | 2 + 9 files changed, 130 insertions(+), 6 deletions(-) create mode 100644 ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/actions/action_server_multiclient/config.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml create mode 100644 ddsenabler_test/compose/test_cases/services/service_server_multiclient/config.yml diff --git a/ddsenabler_test/compose/CMakeLists.txt b/ddsenabler_test/compose/CMakeLists.txt index d6cdfec0..35633614 100644 --- a/ddsenabler_test/compose/CMakeLists.txt +++ b/ddsenabler_test/compose/CMakeLists.txt @@ -19,12 +19,14 @@ set(TESTS reception/topics_json reception/topics_yaml services/service_server + services/service_server_multiclient services/service_client services/service_client_discovered actions/action_client actions/action_client_cancel actions/action_client_discovered actions/action_server + actions/action_server_multiclient ) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/test_cases DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml index 3468cc51..851c2f60 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/compose.yml @@ -3,7 +3,7 @@ # No persistence path is used as the types are discovered at runtime. # The action client sends 3 consecutive goal requests and expects to receive # the corresponding feedbacks, status and results. -# Domain 40 is set for ROS 2 nodes. +# Domain 45 is set for ROS 2 nodes. services: fibonacci_server: @@ -12,7 +12,7 @@ services: networks: - std_net environment: - - ROS_DOMAIN_ID=40 + - ROS_DOMAIN_ID=45 volumes: - ../../../scripts:/scripts command: python3 /scripts/execute_and_validate_action_server.py --timeout 20 --samples 3 diff --git a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml index 820ec0f8..4228342f 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_client_discovered/config.yml @@ -1,2 +1,2 @@ dds: - domain: 40 + domain: 45 diff --git a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml index 95a1f9f5..f9402a00 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server/compose.yml @@ -13,7 +13,7 @@ services: - ../persistence:/persistence command: ./install/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 3 - fibonacci_client_1: + fibonacci_client: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} container_name: fibonacci_client_1 depends_on: diff --git a/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml new file mode 100644 index 00000000..506d1406 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml @@ -0,0 +1,60 @@ +# Test description: +# Run ddsenabler example action server and 3 Fibonacci clients sending each one 3 goals. +# Domain 43 is used by all containers. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./install/ddsenabler/examples/action/ddsenabler_example_action server --persistence-path /persistence --goals-path /persistence/goals --config /config/config.yml --expected-requests 9 + + fibonacci_client_1: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_1 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=43 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + + fibonacci_client_2: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_2 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=43 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + + fibonacci_client_3: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: fibonacci_client_3 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=43 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + + + +networks: + std_net: + default: + driver: none diff --git a/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/config.yml b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/config.yml new file mode 100644 index 00000000..09131445 --- /dev/null +++ b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 43 diff --git a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml index dc851b32..d7f6ec9d 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server/compose.yml @@ -1,5 +1,5 @@ # Test description: -# Run ddsenabler example action_server and a Fibonacci client sending goals. +# Run ddsenabler example service server and a client sending 3 goals. # Domain 34 is used by all containers. services: @@ -13,7 +13,7 @@ services: - ../persistence:/persistence command: ./install/ddsenabler/examples/service/ddsenabler_example_service server --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --expected-requests 3 - add_two_ints_client_1: + add_two_ints_client: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} container_name: add_two_ints_client_1 depends_on: diff --git a/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml new file mode 100644 index 00000000..38be625a --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml @@ -0,0 +1,58 @@ +# Test description: +# Run ddsenabler example service server and 3 clients sending each one 3 goals. +# Domain 35 is used by all containers. + +services: + ddsenabler: + image: ${DDSENABLER_COMPOSE_TEST_DOCKER_IMAGE} + container_name: ddsenabler + networks: + - std_net + volumes: + - ./config.yml:/config/config.yml + - ../persistence:/persistence + command: ./install/ddsenabler/examples/service/ddsenabler_example_service server --persistence-path /persistence --requests-path /persistence/requests --config /config/config.yml --expected-requests 9 + + add_two_ints_client_1: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_1 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=35 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + + add_two_ints_client_2: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_2 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=35 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + + add_two_ints_client_3: + image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} + container_name: add_two_ints_client_3 + depends_on: + - ddsenabler + networks: + - std_net + environment: + - ROS_DOMAIN_ID=35 + volumes: + - ../../../scripts:/scripts + command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + +networks: + std_net: + default: + driver: none diff --git a/ddsenabler_test/compose/test_cases/services/service_server_multiclient/config.yml b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/config.yml new file mode 100644 index 00000000..ba1235cf --- /dev/null +++ b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/config.yml @@ -0,0 +1,2 @@ +dds: + domain: 35 From 556780c99a0f5426a360c79b457bcf9a99b22e2a Mon Sep 17 00:00:00 2001 From: Eugenio Collado Date: Thu, 6 Nov 2025 10:52:10 +0100 Subject: [PATCH 87/87] Fix CI multiclient Signed-off-by: Eugenio Collado --- .../actions/action_server_multiclient/compose.yml | 6 +++--- .../services/service_server_multiclient/compose.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml index 506d1406..621902e6 100644 --- a/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml +++ b/ddsenabler_test/compose/test_cases/actions/action_server_multiclient/compose.yml @@ -24,7 +24,7 @@ services: - ROS_DOMAIN_ID=43 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + command: python3 /scripts/execute_and_validate_action_client.py --timeout 40 --samples 3 fibonacci_client_2: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -37,7 +37,7 @@ services: - ROS_DOMAIN_ID=43 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + command: python3 /scripts/execute_and_validate_action_client.py --timeout 40 --samples 3 fibonacci_client_3: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -50,7 +50,7 @@ services: - ROS_DOMAIN_ID=43 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_action_client.py --timeout 20 --samples 3 + command: python3 /scripts/execute_and_validate_action_client.py --timeout 40 --samples 3 diff --git a/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml index 38be625a..bc4ef95c 100644 --- a/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml +++ b/ddsenabler_test/compose/test_cases/services/service_server_multiclient/compose.yml @@ -24,7 +24,7 @@ services: - ROS_DOMAIN_ID=35 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + command: python3 /scripts/execute_and_validate_client.py --timeout 20 --samples 3 add_two_ints_client_2: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -37,7 +37,7 @@ services: - ROS_DOMAIN_ID=35 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + command: python3 /scripts/execute_and_validate_client.py --timeout 20 --samples 3 add_two_ints_client_3: image: ${DDSENABLER_COMPOSE_TEST_ROS2_DOCKER_IMAGE} @@ -50,7 +50,7 @@ services: - ROS_DOMAIN_ID=35 volumes: - ../../../scripts:/scripts - command: python3 /scripts/execute_and_validate_client.py --timeout 10 --samples 3 + command: python3 /scripts/execute_and_validate_client.py --timeout 20 --samples 3 networks: std_net: