Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eProsima/Fast-DDS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 68b289e4ff2d77ab8d848ffcb744e21105c10562
Choose a base ref
..
head repository: eProsima/Fast-DDS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 206be4126fa8bc8c8887ae5f4ebaadcf0aad86be
Choose a head ref
Showing with 316 additions and 237 deletions.
  1. +6 −2 CMakeLists.txt
  2. +5 −3 examples/cpp/request_reply/CMakeLists.txt
  3. +18 −6 examples/cpp/request_reply/README.md
  4. +72 −60 include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
  5. +1 −1 package.xml
  6. +1 −0 src/cpp/CMakeLists.txt
  7. +6 −6 src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
  8. +7 −1 src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
  9. +9 −9 src/cpp/statistics/types/monitorservice_types.hpp
  10. +8 −8 src/cpp/statistics/types/types.hpp
  11. +9 −6 test/blackbox/types/core/core_types.hpp
  12. +9 −9 test/blackbox/types/statistics/monitorservice_types.hpp
  13. +8 −8 test/blackbox/types/statistics/types.hpp
  14. +1 −1 test/dds-types-test/constants.hpp
  15. +4 −4 test/dds-types-test/declarations.hpp
  16. +6 −6 test/dds-types-test/external.hpp
  17. +7 −4 test/dds-types-test/helpers/basic_inner_types.hpp
  18. +87 −70 test/dds-types-test/unions.hpp
  19. +2 −1 test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.hpp
  20. +8 −3 test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
  21. +12 −6 test/unittest/dds/xtypes/serializers/idl/types/union_struct/gen/union_struct.hpp
  22. +12 −6 test/unittest/dds/xtypes/serializers/json/types/comprehensive_type/gen/ComprehensiveType.hpp
  23. +2 −1 test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
  24. +1 −0 test/unittest/rtps/discovery/CMakeLists.txt
  25. +0 −1 test/unittest/rtps/discovery/EdpTests.cpp
  26. +15 −15 test/unittest/rtps/security/SecurityTests.hpp
8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ endif()
###############################################################################
# Project #
###############################################################################
project(fastdds VERSION "3.0.0" LANGUAGES C CXX)
project(fastdds VERSION "3.0.1" LANGUAGES C CXX)

set(PROJECT_NAME_LARGE "Fast DDS")
string(TOUPPER "${PROJECT_NAME}" PROJECT_NAME_UPPER)
@@ -70,7 +70,7 @@ if(MSVC OR MSVC_IDE)
else()
# Add some generic warnings common to all compilers
set(CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
"${CMAKE_CXX_FLAGS} -Wall -Wpedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
# Add compiler specific options
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
@@ -82,6 +82,10 @@ else()
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
endif()

if(EPROSIMA_EXTRA_CMAKE_CXX_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EPROSIMA_EXTRA_CMAKE_CXX_FLAGS}")
endif()

if(EPROSIMA_BUILD)
string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif()
8 changes: 5 additions & 3 deletions examples/cpp/request_reply/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -35,10 +35,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
endif()

message(STATUS "Configuring ${PROJECT_NAME}...")
file(GLOB_RECURSE REQUEST_REPLY_SOURCES_CXX "*.cxx")
file(GLOB_RECURSE REQUEST_REPLY_SOURCES_CPP "*.cpp")
file(GLOB REQUEST_REPLY_TYPES_SOURCES_CXX "types/*.cxx")
file(GLOB REQUEST_REPLY_SOURCES_CXX "*.cxx")
file(GLOB REQUEST_REPLY_TYPES_SOURCES_CPP "types/*.cpp")
file(GLOB REQUEST_REPLY_SOURCES_CPP "*.cpp")

add_executable(request_reply ${REQUEST_REPLY_SOURCES_CXX} ${REQUEST_REPLY_SOURCES_CPP})
add_executable(request_reply ${REQUEST_REPLY_SOURCES_CXX} ${REQUEST_REPLY_SOURCES_CPP} ${REQUEST_REPLY_TYPES_SOURCES_CXX} ${REQUEST_REPLY_TYPES_SOURCES_CPP})
target_compile_definitions(request_reply PRIVATE
$<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
$<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
24 changes: 18 additions & 6 deletions examples/cpp/request_reply/README.md
Original file line number Diff line number Diff line change
@@ -64,21 +64,33 @@ Mind that it is possible to run multiple server instances and client instances s
* Ubuntu ( / MacOS )

```shell
user@machine:example_path$ ./request_reply client 2 x 5
user@machine:example_path$ ./request_reply client 2 5
2024-07-01T16:08:28.296 [INFO] [ClientApp] Client initialized with ID: 01.0f.cc.6d.21.0f.f0.6b.00.00.00.00
2024-07-01T16:08:28.296 [INFO] [main] Client running. Please press Ctrl+C to stop the Client at any time.
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '1': '2 x 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 with result: 10
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '1': '2 + 5'
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '2': '2 - 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Request sent with ID '3': '2 * 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Request sent with ID '4': '2 / 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '1' with result: '7'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '2' with result: '-3'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '3' with result: '10'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '4' with result: '0'
```

* Windows

```powershell
example_path> request_reply.exe client 2 x 5
example_path> request_reply.exe client 2 5
2024-07-01T16:08:28.296 [INFO] [ClientApp] Client initialized with ID: 01.0f.cc.6d.21.0f.f0.6b.00.00.00.00
2024-07-01T16:08:28.296 [INFO] [main] Client running. Please press Ctrl+C to stop the Client at any time.
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '1': '2 x 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 with result: 10
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '1': '2 + 5'
2024-07-01T16:08:29.296 [INFO] [ClientApp] Request sent with ID '2': '2 - 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Request sent with ID '3': '2 * 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Request sent with ID '4': '2 / 5'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '1' with result: '7'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '2' with result: '-3'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '3' with result: '10'
2024-07-01T16:08:29.297 [INFO] [ClientApp] Reply received from server 01.0f.cc.6d.92.0e.de.f0.00.00.00.00 to request with ID '4' with result: '0'
```

## XML profile playground
Loading