Skip to content

iox-#2426 Fix comparison operator in channel.inl #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FerdinandSpitzschnueffler merged 1 commit into from
Mar 7, 2025
Merged

iox-#2426 Fix comparison operator in channel.inl #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/website/release-notes/iceoryx-unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
- Fix span span constructor assert when using begin/end constructor [#2253](https://github.com/eclipse-iceoryx/iceoryx/issues/2253)
- Listener examples need to take all samples in the callback [#2251](https://github.com/eclipse-iceoryx/iceoryx/issues/2251)
- 'iox::string' tests can exceed the translation unit compilation timeout [#2278](https://github.com/eclipse-iceoryx/iceoryx/issues/2278)
- Building iceoryx with bazel on Windows is broken [#2320](https://github.com/eclipse-iceoryx/iceoryx/issues/2320)
- Building iceoryx with bazel on Windows is broken [#2320](https://github.com/eclipse-iceoryx/iceoryx/issues/2320)
- Fix wrong memory orders in SpscSoFi [#2177](https://github.com/eclipse-iceoryx/iceoryx/issues/2177)
- ssize_t: redefinition; different basic types [#2209](https://github.com/eclipse-iceoryx/iceoryx/issues/2209)
- Fix bazel build on macos [#2345](https://github.com/eclipse-iceoryx/iceoryx/issues/2345)
Expand All @@ -155,6 +155,7 @@
- Depend on @ncurses when building with Bazel [#2372](https://github.com/eclipse-iceoryx/iceoryx/issues/2372)
- Fix windows performance issue [#2377](https://github.com/eclipse-iceoryx/iceoryx/issues/2377)
- Max Client and Server cannot be configured independently of Max Publisher and Subscriber [#2394](https://github.com/eclipse-iceoryx/iceoryx/issues/2394)
- Fix call to non-existing `getService` in channel.inl [#2426](https://github.com/eclipse-iceoryx/iceoryx/issues/2426)

**Refactoring:**

Expand Down
1 change: 0 additions & 1 deletion iceoryx_posh/include/iceoryx_posh/gateway/channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "iceoryx_posh/iceoryx_posh_types.hpp"
#include "iox/expected.hpp"
#include "iox/fixed_position_container.hpp"
#include "iox/optional.hpp"

#include <memory>

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_posh/include/iceoryx_posh/internal/gateway/channel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ template <typename IceoryxTerminal, typename ExternalTerminal>
constexpr inline bool Channel<IceoryxTerminal, ExternalTerminal>::operator==(
const Channel<IceoryxTerminal, ExternalTerminal>& rhs) const noexcept
{
return m_service == rhs.getService();
return m_service == rhs.getServiceDescription();
}

template <typename IceoryxTerminal, typename ExternalTerminal>
Expand Down
14 changes: 14 additions & 0 deletions iceoryx_posh/test/moduletests/test_gw_channel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,18 @@ TEST_F(ChannelTest, ReturnsErrorIfPoolExhausted)
EXPECT_FALSE(channel.has_error());
}

TEST_F(ChannelTest, ComparisonWorks)
{
::testing::Test::RecordProperty("TEST_ID", "535de22b-575d-467c-810a-6beced4d4144");
auto channel1 = iox::gw::Channel<StubbedIceoryxTerminal, StubbedExternalTerminal>::create(
{"", "", ""}, StubbedIceoryxTerminal::Options());
ASSERT_FALSE(channel1.has_error());
EXPECT_TRUE(channel1 == channel1);

auto channel2 = iox::gw::Channel<StubbedIceoryxTerminal, StubbedExternalTerminal>::create(
{"Service", "", ""}, StubbedIceoryxTerminal::Options());
ASSERT_FALSE(channel2.has_error());
EXPECT_FALSE(channel1 == channel2);
}

} // namespace
Loading