iox-#590 Remove IoxIpcChannelType from all platforms

Signed-off-by: Simon Hoinkis <simon.hoinkis@apex.ai>
eclipse-iceoryx · Aug 4, 2022 · fae12a6 · fae12a6
1 parent 537c65a
commit fae12a6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 26 deletions.
diff --git a/iceoryx_dust/README.md b/iceoryx_dust/README.md
@@ -1,5 +1,5 @@
 
-# Eclipse iceoryx hoofs overview
+# Eclipse iceoryx dust overview
 
 Similar to iceoryx hoofs `iceoryx_dust` (**D**eemed **u**seful **s**oftware **t**hingies) is a library for basic building blocks.
 Compared to hoofs classes in `iceoryx_dust`, the difference is that the classes in dust only conform to quality level 2.

diff --git a/iceoryx_hoofs/platform/linux/include/iceoryx_hoofs/platform/platform_settings.hpp b/iceoryx_hoofs/platform/linux/include/iceoryx_hoofs/platform/platform_settings.hpp
@@ -21,11 +21,6 @@
 
 namespace iox
 {
-namespace posix
-{
-class UnixDomainSocket;
-} // namespace posix
-
 namespace platform
 {
 /// defined in the man sem_overview
@@ -41,7 +36,6 @@ constexpr const char IOX_PATH_SEPARATORS[IOX_NUMBER_OF_PATH_SEPARATORS] = {'/'};
 constexpr uint64_t IOX_UDS_SOCKET_MAX_MESSAGE_SIZE = 4096;
 constexpr const char IOX_UDS_SOCKET_PATH_PREFIX[] = "/tmp/";
 constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
-using IoxIpcChannelType = iox::posix::UnixDomainSocket;
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_hoofs/platform/mac/include/iceoryx_hoofs/platform/platform_settings.hpp b/iceoryx_hoofs/platform/mac/include/iceoryx_hoofs/platform/platform_settings.hpp
@@ -20,11 +20,6 @@
 
 namespace iox
 {
-namespace posix
-{
-class UnixDomainSocket;
-}
-
 namespace platform
 {
 /// defined so that it is consistent to linux
@@ -42,7 +37,6 @@ constexpr const char IOX_PATH_SEPARATORS[IOX_NUMBER_OF_PATH_SEPARATORS] = {'/'};
 constexpr uint64_t IOX_UDS_SOCKET_MAX_MESSAGE_SIZE = 2048;
 constexpr const char IOX_UDS_SOCKET_PATH_PREFIX[] = "/tmp/";
 constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
-using IoxIpcChannelType = iox::posix::UnixDomainSocket;
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_hoofs/platform/qnx/include/iceoryx_hoofs/platform/platform_settings.hpp b/iceoryx_hoofs/platform/qnx/include/iceoryx_hoofs/platform/platform_settings.hpp
@@ -20,11 +20,6 @@
 
 namespace iox
 {
-namespace posix
-{
-class UnixDomainSocket;
-}
-
 namespace platform
 {
 /// defined so that it is consistent to linux
@@ -40,7 +35,6 @@ constexpr const char IOX_PATH_SEPARATORS[IOX_NUMBER_OF_PATH_SEPARATORS] = {'/'};
 constexpr uint64_t IOX_UDS_SOCKET_MAX_MESSAGE_SIZE = 2048;
 constexpr const char IOX_UDS_SOCKET_PATH_PREFIX[] = "/tmp/";
 constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/var/lock/";
-using IoxIpcChannelType = iox::posix::UnixDomainSocket;
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_hoofs/platform/unix/include/iceoryx_hoofs/platform/platform_settings.hpp b/iceoryx_hoofs/platform/unix/include/iceoryx_hoofs/platform/platform_settings.hpp
@@ -21,11 +21,6 @@
 
 namespace iox
 {
-namespace posix
-{
-class UnixDomainSocket;
-} // namespace posix
-
 namespace platform
 {
 /// defined in the man sem_overview
@@ -41,7 +36,6 @@ constexpr const char IOX_PATH_SEPARATORS[IOX_NUMBER_OF_PATH_SEPARATORS] = {'/'};
 constexpr uint64_t IOX_UDS_SOCKET_MAX_MESSAGE_SIZE = 1024;
 constexpr const char IOX_UDS_SOCKET_PATH_PREFIX[] = "/tmp/";
 constexpr const char IOX_LOCK_FILE_PATH_PREFIX[] = "/tmp/";
-using IoxIpcChannelType = iox::posix::UnixDomainSocket;
 } // namespace platform
 } // namespace iox
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_interface_base.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/ipc_interface_base.hpp
@@ -20,7 +20,6 @@
 
 #include "iceoryx_hoofs/cxx/deadline_timer.hpp"
 #include "iceoryx_hoofs/cxx/optional.hpp"
-#include "iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp"
 #include "iceoryx_hoofs/internal/relocatable_pointer/relative_pointer.hpp"
 #include "iceoryx_hoofs/internal/units/duration.hpp"
 #include "iceoryx_hoofs/platform/errno.hpp"
@@ -34,6 +33,8 @@
 
 #if defined(_WIN32)
 #include "iceoryx_dust/posix_wrapper/named_pipe.hpp"
+#else
+#include "iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp"
 #endif
 
 #include <cstdint>
@@ -52,6 +53,8 @@ namespace platform
 {
 #if defined(_WIN32)
 using IoxIpcChannelType = iox::posix::NamedPipe;
+#else
+using IoxIpcChannelType = iox::posix::UnixDomainSocket;
 #endif
 } // namespace platform
 namespace runtime