Fix insertBits so it doesn't shift things into oblivion

--HG--
extra : convert_revision : 8833b60e3fc94c917fbdb7a99f3d90155907b44e

diff --git a/src/base/bitfield.hh b/src/base/bitfield.hh
index 69cce22459aa11014958ef6c78a39d176ce27e72..518bad6b87ad64fcbcad7203f8dc3364974ac01f 100644 (file)
--- a/src/base/bitfield.hh
+++ b/src/base/bitfield.hh
@@ -96,8 +96,9 @@ inline
 T
 insertBits(T val, int first, int last, B bit_val)
 {
+    T t_bit_val = bit_val;
     T bmask = mask(first - last + 1) << last;
-    return ((bit_val << last) & bmask) | (val & ~bmask);
+    return ((t_bit_val << last) & bmask) | (val & ~bmask);
 }
 
 /**