Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / bar-line.cc

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 28acd4f68ab219cba1c711edf0422d4448085374..4922a84d37b29921d1e5a79d29c4ccd1508f1f0d 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -26,7 +26,7 @@ Bar_line::print (SCM smob)
   
   if (scm_is_string (s) && scm_is_number (barsize))
     {
-      std::string str = ly_scm2string (s);
+      string str = ly_scm2string (s);
       Real sz = robust_scm2double (barsize, 0);
       if (sz <= 0)
        return SCM_EOL;
@@ -37,7 +37,7 @@ Bar_line::print (SCM smob)
 }
 
 Stencil
-Bar_line::compound_barline (Grob *me, std::string str, Real h,
+Bar_line::compound_barline (Grob *me, string str, Real h,
                            bool rounded)
 {
   Real kern = robust_scm2double (me->get_property ("kern"), 1);