diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp index e91773c0c2..371b80caa2 100644 --- a/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp +++ b/iceoryx_hoofs/include/iceoryx_hoofs/internal/posix_wrapper/unix_domain_socket.hpp @@ -47,9 +47,6 @@ class UnixDomainSocket using UdsName_t = string; using Message_t = string; - using result_t = expected; - using errorType_t = IpcChannelError; - UnixDomainSocket() noexcept = delete; UnixDomainSocket(const UnixDomainSocket& other) = delete; UnixDomainSocket(UnixDomainSocket&& other) noexcept; diff --git a/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp b/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp index 2b813f098e..73af0c012f 100644 --- a/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp +++ b/iceoryx_posh/test/integrationtests/test_mq_interface_startup_race.cpp @@ -61,6 +61,8 @@ class CMqInterfaceStartupRace_test : public Test public: virtual void SetUp() { + platform::IoxIpcChannelType::create(roudi::IPC_CHANNEL_ROUDI_NAME, IpcChannelSide::SERVER) + .and_then([this](auto& channel) { this->m_roudiQueue.emplace(std::move(channel)); }); ASSERT_THAT(m_roudiQueue.has_value(), true); } virtual void TearDown() @@ -110,8 +112,7 @@ class CMqInterfaceStartupRace_test : public Test /// @note smart_lock in combination with optional is currently not really usable std::mutex m_roudiQueueMutex; - platform::IoxIpcChannelType::result_t m_roudiQueue{ - platform::IoxIpcChannelType::create(roudi::IPC_CHANNEL_ROUDI_NAME, IpcChannelSide::SERVER)}; + optional m_roudiQueue; std::mutex m_appQueueMutex; optional m_appQueue; };