iox-eclipse-iceoryx#91 Remove obsolete shared memory base address in …

…RouDiConfig Signed-off-by: Hoinkis Simon (CC-AD/ESW1) <simon.hoinkis2@de.bosch.com>
mossmaurice · Aug 25, 2020 · 5ddecf3 · 5ddecf3
1 parent 5a3049c
commit 5ddecf3
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 10 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp b/iceoryx_posh/include/iceoryx_posh/roudi/roudi_config.hpp
@@ -24,13 +24,6 @@ namespace roudi
 {
 struct RouDiConfig
 {
-    struct
-    {
-        /// @todo since we are now fully relocatable, this can be removed
-        uint64_t m_sharedMemoryBaseAddressOffset = 0u;
-        bool m_verifySharedMemoryPlacement = false;
-    } roudi;
-
     RouDiConfig& setDefaults();
     RouDiConfig& optimize();
 };

diff --git a/iceoryx_posh/source/roudi/roudi_config.cpp b/iceoryx_posh/source/roudi/roudi_config.cpp
@@ -20,8 +20,6 @@ namespace roudi
 {
 RouDiConfig& RouDiConfig::setDefaults()
 {
-    roudi.m_sharedMemoryBaseAddressOffset = 0ull;
-    roudi.m_verifySharedMemoryPlacement = false;
     return *this;
 }
 

diff --git a/iceoryx_posh/test/moduletests/test_roudi_shm.cpp b/iceoryx_posh/test/moduletests/test_roudi_shm.cpp
@@ -69,7 +69,6 @@ class PortManager_test : public Test
         // starting at {1,1,1}
 
         auto config = iox::RouDiConfig_t().setDefaults();
-        config.roudi.m_verifySharedMemoryPlacement = false;
         m_roudiMemoryManager = new IceOryxRouDiMemoryManager(config);
         m_roudiMemoryManager->createAndAnnounceMemory();
         m_shmManager = new CShmMangerTester(m_roudiMemoryManager);