More conversions, now with gcc

Author: sorsarre

bitreader/include/bitreader/bitreader.hpp

@@ -230,7 +230,8 @@ namespace brcpp {
         {
             state.shift -= bits;
             const auto shifted = static_cast<T>(state.buffer >> state.shift);
-            ret |= shifted & _mask<T>(bits);
+            const auto masked = static_cast<T>(shifted & _mask<T>(bits));
+            ret |= masked;
         }
 
         //----------------------------------------------------------------------

bitreader/include/bitreader/bitwriter.hpp

@@ -62,7 +62,7 @@ namespace brcpp {
                 size_t post = std::min<uint64_t>(_state.avail, to_write);
                 T portion = (data >> (bits - written - post)) & _mask<T>(post);
                 size_t diff = _state.avail - post;
-                _state.buffer |= portion << diff;
+                _state.buffer |= static_cast<internal_state::buffer_type>(portion << diff);
                 _state.avail -= post;
 
                 if (_state.avail == 0) {