github

Author: mikir

compiler/extensions/cpp/runtime/src/zserio/BitStreamWriter.cpp

@@ -628,7 +628,8 @@ inline void BitStreamWriter::writeVarNum(
         if (hasNextByte)
         {
             numBits--;
-            byte |= static_cast<uint8_t>(0x01U << numBits); // use bit 6 if signed bit is present, use bit 7 otherwise
+            uint8_t add = static_cast<uint8_t>(0x01U << numBits);
+            byte = static_cast<uint8_t>(byte | add); // use bit 6 if signed bit is present, use bit 7 otherwise
         }
         else // this is the last byte
         {
@@ -637,8 +638,8 @@ inline void BitStreamWriter::writeVarNum(
         }
 
         const size_t shiftBits = (numVarBytes - (i + 1)) * 7 + ((hasMaxByteRange && hasNextByte) ? 1 : 0);
-        uint8_t val = static_cast<uint8_t>((value >> shiftBits) & bitMasks[numBits - 1]);
-        byte = static_cast<uint8_t>(byte | val);
+        uint8_t add = static_cast<uint8_t>((value >> shiftBits) & bitMasks[numBits - 1]);
+        byte = static_cast<uint8_t>(byte | add);
         writeUnsignedBits(byte, 8);
     }
 }