Merge branch 'translation' into 'master'

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index b2e0d53a880405a5037811a2f057a25e1bad2749..ad4d0bab772453f4007edd23b6519c429eed347e 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -223,7 +223,7 @@ System::get_paper_systems ()
       scm_vector_set_x (lines, scm_from_int (i),
                         system->get_paper_system ());
 
-      debug_output (to_string (i) + "]", false);
+      debug_output (::to_string (i) + "]", false);
     }
   return lines;
 }
@@ -548,8 +548,7 @@ System::post_processing ()
      anyway. */
 
   vector<Grob *> all_elts_sorted (all_elements_->array ());
-  vector_sort (all_elts_sorted, std::less<Grob *> ());
-  uniq (all_elts_sorted);
+  uniquify (all_elts_sorted);
   this->get_stencil ();
   for (vsize i = all_elts_sorted.size (); i--;)
     {