commit ddc12942a3736c7d3dded167a4bb5216c4b7bcf8
author Dmitri Prime <bolms@google.com> Wed Nov 30 12:32:18 2022 -0800
committer GitHub <noreply@github.com> Wed Nov 30 12:32:18 2022 -0800
tree 6dfed734ab64c7114f6a8c18264cfcdbdd3a1d14
parent a02d5f4b18f04e4b9a86ed24ce19b7e979880447
parent cc6f1ba9de0a30bae55807e335aafd18c97e01c1

Merge pull request #61 from BenjaminLawson/fix-implicit-conversion

Fix implicit narrowing conversion in OffsetBitBlock

runtime/cpp/emboss_memory_util.h

diff --git a/runtime/cpp/emboss_memory_util.h b/runtime/cpp/emboss_memory_util.h
index 5ff5617..49f4287 100644
--- a/runtime/cpp/emboss_memory_util.h
+++ b/runtime/cpp/emboss_memory_util.h
@@ -913,9 +913,10 @@
 
  private:
   ValueType MaskInValue(ValueType original_value, ValueType new_value) const {
-    ValueType original_mask =
-        ~(MaskToNBits(static_cast<ValueType>(~ValueType{0}), size_) << offset_);
-    return (original_value & original_mask) | (new_value << offset_);
+    ValueType original_mask = static_cast<ValueType>(~(
+        MaskToNBits(static_cast<ValueType>(~ValueType{0}), size_) << offset_));
+    return static_cast<ValueType>((original_value & original_mask) |
+                                  (new_value << offset_));
   }
 
   const UnderlyingBitBlockType bit_block_;