#
#
# patch "roster.cc"
#  from [f62b03b41fa5286a94947a3bebc17ac9b83774cb]
#    to [ff33bb4320ab5a7a013d9bf791ca94eafdab511f]
#
============================================================
--- roster.cc	f62b03b41fa5286a94947a3bebc17ac9b83774cb
+++ roster.cc	ff33bb4320ab5a7a013d9bf791ca94eafdab511f
@@ -1443,10 +1443,10 @@ namespace
 
   void
   mark_merged_node(marking_t const & left_marking,
-                   set<revision_id> left_uncommon_ancestors,
+                   set<revision_id> const & left_uncommon_ancestors,
                    node_t ln,
                    marking_t const & right_marking,
-                   set<revision_id> right_uncommon_ancestors,
+                   set<revision_id> const & right_uncommon_ancestors,
                    node_t rn,
                    revision_id const & new_rid,
                    node_t n,
@@ -1711,13 +1711,13 @@ namespace {
                         roster_t const & left_roster,
                         marking_map const & left_markings,
                         cset const & left_cs,
-                        set<revision_id> left_uncommon_ancestors,
+                        set<revision_id> const & left_uncommon_ancestors,
 
                         revision_id const & right_rid,
                         roster_t const & right_roster,
                         marking_map const & right_markings,
                         cset const & right_cs,
-                        set<revision_id> right_uncommon_ancestors,
+                        set<revision_id> const & right_uncommon_ancestors,
 
                         revision_id const & new_rid,
                         roster_t & new_roster,