Run fixcc.py with astyle 2.02

[lilypond.git] / lily / grob-property.cc

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index de1e01b396b4e63dd2f9099c35b52ea318ae7576..22c5fe2e7198e644d9001d8144587043671dbcbc 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -36,8 +36,8 @@ print_property_callback_stack ()
 }
 #endif
 
-static SCM modification_callback = SCM_EOL;
-static SCM cache_callback = SCM_EOL;
+static Protected_scm modification_callback = SCM_EOL;
+static Protected_scm cache_callback = SCM_EOL;
 
 /*
 FIXME: this should use ly:set-option interface instead.
@@ -168,9 +168,9 @@ Grob::internal_get_property (SCM sym) const
 #ifndef NDEBUG
   if (val == ly_symbol2scm ("calculation-in-progress"))
     {
-      programming_error (_f ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
-                             ly_symbol2string (sym).c_str (),
-                             name ().c_str ()));
+      programming_error (to_string ("cyclic dependency: calculation-in-progress encountered for #'%s (%s)",
+                                    ly_symbol2string (sym).c_str (),
+                                    name ().c_str ()));
       if (debug_property_callbacks)
         {
           message ("backtrace: ");