release commit

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 11ae7cb1518d4c38b474602448f3476a2d92af3d..6b539519e1629af16abbb30e92071835a17ba6e0 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -27,9 +27,9 @@ Context::is_removable () const
 void
 Context::check_removal ()
 {
-  for (SCM p = context_list_; scm_is_pair (p); p = scm_cdr (p))
+  for (SCM p = context_list_; scm_is_pair (p); p = ly_cdr (p))
     {
-      Context *trg =  unsmob_context (scm_car (p));
+      Context *trg =  unsmob_context (ly_car (p));
 
       trg->check_removal ();
       if (trg->is_removable ())
@@ -175,7 +175,7 @@ SCM
 Context::default_child_context_name () const
 {
   return scm_is_pair (accepts_list_)
-    ? scm_car (scm_last_pair (accepts_list_))
+    ? ly_car (scm_last_pair (accepts_list_))
     : SCM_EOL;
 }
 
@@ -308,9 +308,9 @@ find_context_below (Context * where,
   
   Context * found = 0;
   for (SCM s = where->children_contexts ();
-       !found && scm_is_pair (s); s = scm_cdr (s))
+       !found && scm_is_pair (s); s = ly_cdr (s))
     {
-      Context * tr = unsmob_context (scm_car (s));
+      Context * tr = unsmob_context (ly_car (s));
 
       found = find_context_below (tr, type, id);
     }
@@ -364,7 +364,7 @@ Context::now_mom () const
 int
 Context::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Context *sc = (Context *) scm_cdr (s);
+  Context *sc = (Context *) ly_cdr (s);
      
   scm_puts ("#<", port);
   scm_puts (classname (sc), port);