coding style nits; more accurate programming_error for introducing infinity.

[lilypond.git] / lily / pango-select.cc

diff --git a/lily/pango-select.cc b/lily/pango-select.cc
index 5c93c1386cbf7642d7837486654f2f7e4096438d..bd684b92f857344bb7f91ff02d41b3940da660a8 100644 (file)
--- a/lily/pango-select.cc
+++ b/lily/pango-select.cc
@@ -19,7 +19,7 @@ properties_to_pango_description (SCM chain, Real text_size)
   PangoFontDescription *description = 0;
   if (scm_is_string (name))
     {
-      std::string name_str = ly_scm2string (name);
+      string name_str = ly_scm2string (name);
       description = pango_font_description_from_string (name_str.c_str ());
     }
   else
@@ -132,7 +132,7 @@ symbols_to_pango_font_description (SCM family,
 {
   PangoFontDescription *description = pango_font_description_new ();
 
-  std::string family_str = "roman";
+  string family_str = "roman";
   if (scm_is_symbol (family))
     family_str = ly_symbol2string (family);
   else if (scm_is_string (family))