Skip to content

Commit

Permalink
Add unsigned specification to literals (#5125) (#5149)
Browse files Browse the repository at this point in the history
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
(cherry picked from commit daef938)

# Conflicts:
#	include/fastdds/rtps/common/InstanceHandle.h
  • Loading branch information
JesusPoderoso authored and mergify[bot] committed Aug 26, 2024
1 parent 4945931 commit b9ca5fc
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions include/fastdds/rtps/common/InstanceHandle.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,13 @@ inline std::ostream& operator <<(
{
output << (int)iHandle.value[i] << ".";
}
<<<<<<< HEAD
output << (int)iHandle.value[15] << std::dec;
return output;
=======
ss << (int)iHandle.value[15u] << std::dec;
return output << ss.str();
>>>>>>> daef93808 (Add unsigned specification to literals (#5125) (#5149))
}

/**
Expand Down Expand Up @@ -331,9 +336,9 @@ inline std::istream& operator >>(
input.setstate(std::ios_base::failbit);
}

iHandle.value[0] = static_cast<octet>(hex);
iHandle.value[0u] = static_cast<octet>(hex);

for (int i = 1; i < 16; ++i)
for (uint8_t i = 1; i < 16; ++i)
{
input >> point >> hex;
if ( point != '.' || hex > 255 )
Expand Down

0 comments on commit b9ca5fc

Please sign in to comment.