Refs #19036: Solve build issue in windows

Signed-off-by: elianalf <[email protected]>
eProsima · Aug 2, 2024 · 7d9d6b3 · 7d9d6b3
1 parent ef97318
commit 7d9d6b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp b/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp
@@ -55,7 +55,7 @@ class SHMLocator
 
         if ((fastdds::dds::RETCODE_OK == SystemInfo::get_username(user_name)) && (user_name.length() < 16))
         {
-            std::strcpy(reinterpret_cast<char*>(&locator.address[1]), user_name.c_str());
+            std::memcpy(&locator.address[1], user_name.c_str(), user_name.length());
         }
         else
         {

diff --git a/test/examples/xtypes_minimal.compose.yml b/test/examples/xtypes_minimal.compose.yml
@@ -73,8 +73,7 @@ services:
       LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
       EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/hello_world@FILE_EXTENSION@
       FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/hello_world/hello_world_profile.xml
-    network_mode: host
-    ipc: host
+
     command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/hello_world@FILE_EXTENSION@ publisher --samples 10"
     depends_on:
       - xtypes-subscriber
@@ -91,8 +90,6 @@ services:
       LD_LIBRARY_PATH: @PROJECT_BINARY_DIR@/src/cpp:@fastcdr_LIB_DIR@@TINYXML2_LIB_DIR_COMPOSE_LD_LIBRARY_PATH@
       EXAMPLE_DIR: @PROJECT_BINARY_DIR@/examples/cpp/xtypes@FILE_EXTENSION@
       FASTDDS_DEFAULT_PROFILES_FILE: @PROJECT_BINARY_DIR@/examples/cpp/xtypes/xtypes_minimal_profile.xml
-    network_mode: host
-    ipc: host
     command: @SHELL_EXECUTABLE@ -c "$${EXAMPLE_DIR}/xtypes@FILE_EXTENSION@ publisher --samples 10 --xml-type"
     depends_on:
       - xtypes-subscriber
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ class SHMLocator @@
             if ((fastdds::dds::RETCODE_OK == SystemInfo::get_username(user_name)) && (user_name.length() < 16))
             {
-                std::strcpy(reinterpret_cast<char*>(&locator.address[1]), user_name.c_str());
+                std::memcpy(&locator.address[1], user_name.c_str(), user_name.length());
             }
             else
             {
@@ Expand Down @@