Skip to content

Commit

Permalink
iox-eclipse-iceoryx#14 fix DDS gateway build
Browse files Browse the repository at this point in the history
Signed-off-by: Mathias Kraus <[email protected]>
  • Loading branch information
elBoberido authored and marthtz committed May 12, 2021
1 parent b396729 commit 998d2e7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion iceoryx_dds/test/mocks/chunk_mock_dds.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ class ChunkMockDDS
auto& chunkSettings = chunkSettingsResult.value();

m_chunkHeader = new (m_rawMemory) iox::mepoo::ChunkHeader(Size, chunkSettings);
m_chunkHeader->userPayloadSize = sizeof(T);

// Set the value
auto userPayloadPtr = reinterpret_cast<T*>(m_rawMemory + sizeof(iox::mepoo::ChunkHeader));
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_posh/source/mepoo/chunk_header.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ChunkHeader* ChunkHeader::fromUserPayload(void* const userPayload) noexcept

const ChunkHeader* ChunkHeader::fromUserPayload(const void* const userPayload) noexcept
{
return ChunkHeader::fromUserPayload(const_cast<void* const>(userPayload));
return ChunkHeader::fromUserPayload(const_cast<void*>(userPayload));
}

uint32_t ChunkHeader::usedSizeOfChunk() const noexcept
Expand Down
6 changes: 3 additions & 3 deletions iceoryx_posh/test/moduletests/test_mepoo_chunk_header.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,14 @@ TEST(ChunkHeader_test, FromUserPayloadFunctionCalledWithConstNullptrReturnsNullp
TEST(ChunkHeader_test, FromUserPayloadFunctionCalledWithNonConstParamReturnsNonConstType)
{
auto isNonConstReturn =
std::is_same<decltype(ChunkHeader::fromUserPayload(std::declval<void* const>())), ChunkHeader*>::value;
std::is_same<decltype(ChunkHeader::fromUserPayload(std::declval<void*>())), ChunkHeader*>::value;
EXPECT_TRUE(isNonConstReturn);
}

TEST(ChunkHeader_test, FromUserPayloadFunctionCalledWithConstParamReturnsConstType)
{
auto isConstReturn = std::is_same<decltype(ChunkHeader::fromUserPayload(std::declval<const void* const>())),
const ChunkHeader*>::value;
auto isConstReturn =
std::is_same<decltype(ChunkHeader::fromUserPayload(std::declval<const void*>())), const ChunkHeader*>::value;
EXPECT_TRUE(isConstReturn);
}

Expand Down

0 comments on commit 998d2e7

Please sign in to comment.