*** empty log message ***

[lilypond.git] / lily / note-collision.cc

diff --git a/lily/note-collision.cc b/lily/note-collision.cc
index ff702b79daf9ddf3e6ac1f35e49a45dd3f62a1c0..51bf6d13ee13766a055e343ea577cbc2278fed79 100644 (file)
--- a/lily/note-collision.cc
+++ b/lily/note-collision.cc
@@ -26,7 +26,7 @@ SCM
 Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
 {
   Grob *me = unsmob_grob (element_smob);
-  Axis a = (Axis) ly_scm2int (axis);
+  Axis a = (Axis) scm_to_int (axis);
   assert (a == X_AXIS);
   
    me = me->get_parent (a);
@@ -401,7 +401,7 @@ Note_collision_interface::automatic_shift (Grob *me,
            = clashes[i]->get_property ("horizontal-shift");
 
          if (ly_c_number_p (sh))
-           shift.push (ly_scm2int (sh));
+           shift.push (scm_to_int (sh));
          else
            shift.push (0);
        }