iox-eclipse-iceoryx#1391 Move PolymorphicHandler to design

atirehgram · Feb 21, 2023 · 34f6dcb · 34f6dcb
1 parent 432a6ee
commit 34f6dcb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 23 deletions.
diff --git a/.clang-tidy-diff-scans.txt b/.clang-tidy-diff-scans.txt
@@ -29,11 +29,6 @@
 ./iceoryx_hoofs/source/posix_wrapper/*
 ./iceoryx_hoofs/source/posix_wrapper/shared_memory_object/*
 ./iceoryx_hoofs/test/moduletests/test_posix*
-./iceoryx_hoofs/include/iceoryx_hoofs/design_pattern/polymorphic_handler.hpp
-
-./iceoryx_hoofs/include/iceoryx_hoofs/internal/design_pattern/polymorphic_handler.inl
-
-./iceoryx_hoofs/test/moduletests/test_polymorphic_handler.cpp
 
 ./iceoryx_hoofs/posix/**/*
 

diff --git a/...al/design_pattern/polymorphic_handler.inl → ...nclude/iox/detail/polymorphic_handler.inl b/...al/design_pattern/polymorphic_handler.inl → ...nclude/iox/detail/polymorphic_handler.inl
@@ -14,20 +14,17 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_INL
-#define IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_INL
+#ifndef IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_INL
+#define IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_INL
 
-#include "iceoryx_hoofs/design_pattern/polymorphic_handler.hpp"
+#include "iox/polymorphic_handler.hpp"
 #include "iox/static_lifetime_guard.hpp"
 #include <atomic>
 #include <cstdlib>
 #include <type_traits>
 
 namespace iox
 {
-namespace design_pattern
-{
-
 namespace detail
 {
 
@@ -176,7 +173,6 @@ PolymorphicHandler<Interface, Default, Hooks>::guard() noexcept
     return StaticLifetimeGuard<Self>();
 }
 
-} // namespace design_pattern
 } // namespace iox
 
-#endif // IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_INL
+#endif // IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_INL
diff --git a/...fs/design_pattern/polymorphic_handler.hpp → ...esign/include/iox/polymorphic_handler.hpp b/...fs/design_pattern/polymorphic_handler.hpp → ...esign/include/iox/polymorphic_handler.hpp
@@ -14,8 +14,8 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_HPP
-#define IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_HPP
+#ifndef IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_HPP
+#define IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_HPP
 
 #include <atomic>
 #include <type_traits>
@@ -24,8 +24,6 @@
 
 namespace iox
 {
-namespace design_pattern
-{
 namespace detail
 {
 
@@ -124,9 +122,8 @@ class PolymorphicHandler
     std::atomic<Interface*> m_current{nullptr};
 };
 
-} // namespace design_pattern
 } // namespace iox
 
-#include "iceoryx_hoofs/internal/design_pattern/polymorphic_handler.inl"
+#include "iox/detail/polymorphic_handler.inl"
 
-#endif // IOX_HOOFS_DESIGN_PATTERN_POLYMORPHIC_HANDLER_HPP
+#endif // IOX_HOOFS_DESIGN_POLYMORPHIC_HANDLER_HPP
diff --git a/.../moduletests/test_polymorphic_handler.cpp → ...tests/test_design_polymorphic_handler.cpp b/.../moduletests/test_polymorphic_handler.cpp → ...tests/test_design_polymorphic_handler.cpp
@@ -14,7 +14,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#include "iceoryx_hoofs/design_pattern/polymorphic_handler.hpp"
+#include "iox/polymorphic_handler.hpp"
 #include "iox/static_lifetime_guard.hpp"
 
 #include "test.hpp"
@@ -82,7 +82,7 @@ struct Hooks
     }
 };
 
-using Handler = iox::design_pattern::PolymorphicHandler<Interface, Default, Hooks>;
+using Handler = iox::PolymorphicHandler<Interface, Default, Hooks>;
 
 class PolymorphicHandler_test : public Test
 {

diff --git a/iceoryx_posh/source/roudi/application/iceoryx_roudi_app.cpp b/iceoryx_posh/source/roudi/application/iceoryx_roudi_app.cpp
@@ -23,7 +23,6 @@
 #include "iox/optional.hpp"
 #include "iox/scoped_static.hpp"
 
-
 namespace iox
 {
 namespace roudi