diff --git a/include/fastdds/rtps/common/InstanceHandle.h b/include/fastdds/rtps/common/InstanceHandle.h
index 4adbe9f387a..70dfceb3ae5 100644
--- a/include/fastdds/rtps/common/InstanceHandle.h
+++ b/include/fastdds/rtps/common/InstanceHandle.h
@@ -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))
 }
 
 /**
@@ -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 )