#
#
# patch "roster_merge.cc"
#  from [78e23a1381bbc2f2ba604f09f53b2dd6bfd18344]
#    to [67a009f965ad598a522d8b60b19e786175451a33]
#
============================================================
--- roster_merge.cc	78e23a1381bbc2f2ba604f09f53b2dd6bfd18344
+++ roster_merge.cc	67a009f965ad598a522d8b60b19e786175451a33
@@ -37,7 +37,7 @@ namespace resolve_conflicts
     return boost::shared_ptr<any_path>(new file_path(file_path_external(utf8(path))));
   };
 
-  static char const * const
+  static char const *
   image(resolve_conflicts::resolution_t resolution)
   {
     switch (resolution)
@@ -3194,7 +3194,7 @@ void string_to_set(string const & from, 
   to.clear();
   for (string::const_iterator i = from.begin(); i != from.end(); ++i)
     {
-      char label = (*i - '0') << 4 + (*i - '0');
+      char label = ((*i - '0') << 4) + (*i - '0');
       to.insert(revision_id(string(constants::idlen_bytes, label)));
     }
 }