WIP

Author: danpoe

src/util/sharing_map.h

@@ -1361,7 +1361,7 @@ ::replace(const key_type &k, valueU &&m)
   nodet &lp = get_leaf_node(k);
 
   INVARIANT(
-    !value_equalt()(as_const<nodet>(lp).get_value(), m),
+    !value_equalt()(as_const<nodet>(static_cast<nodet &>(lp)).get_value(), m),
     "values should not be replaced with equal values to maximize sharing");
 
   lp.set_value(std::forward<valueU>(m));
@@ -1372,12 +1372,12 @@ ::update(const key_type &k, std::function<void(mapped_type &)> mutator)
 {
   nodet &lp = get_leaf_node(k);
 
-  value_comparatort comparator(as_const<nodet>(lp).get_value());
+  value_comparatort comparator(as_const<nodet>(static_cast<nodet &>(lp)).get_value());
 
   lp.mutate_value(mutator);
 
   INVARIANT(
-    !comparator(as_const<nodet>(lp).get_value()),
+    !comparator(as_const<nodet>(static_cast<nodet &>(lp)).get_value()),
     "sharing_mapt::update should make some change. Consider using read-only "
     "method to check if an update is needed beforehand");
 }