* mf/GNUmakefile ($(outdir)/emmentaler-%.otf

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 0ad308bdb154c1cdf7064c2dd31d7c3611053ede..fc49f16d4ddd7b5b6b67fc3da0629f5252d87d56 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -430,7 +430,7 @@ Grob::fixup_refpoint ()
   MESSAGES
 ****************************************************************/
 void
-Grob::warning (std::string s) const
+Grob::warning (string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))
@@ -443,7 +443,7 @@ Grob::warning (std::string s) const
 }
 
 
-std::string
+string
 Grob::name () const
 {
   SCM meta = get_property ("meta");
@@ -453,7 +453,7 @@ Grob::name () const
 }
 
 void
-Grob::programming_error (std::string s) const
+Grob::programming_error (string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))
@@ -608,9 +608,9 @@ common_refpoint_of_list (SCM elist, Grob *common, Axis a)
 }
 
 Grob *
-common_refpoint_of_array (Link_array<Grob> const &arr, Grob *common, Axis a)
+common_refpoint_of_array (vector<Grob*> const &arr, Grob *common, Axis a)
 {
-  for (int i = arr.size (); i--;)
+  for (vsize i = arr.size (); i--;)
     if (Grob *s = arr[i])
       {
        if (common)