Issue 2787: Sanitize usage of -DDEBUG, -DNDEBUG and assert

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index 6d6b5ac8f3b2297dc72db4065c2b50491bc1426e..4f98412745ac87b10803b501266c6fc112075075 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -594,7 +594,7 @@ System::get_paper_system ()
       Grob *g = entries[j].grob_;
       Stencil st = g->get_print_stencil ();
 
-      if (st.expr () == SCM_EOL)
+      if (scm_is_null (st.expr ()))
         continue;
 
       Offset o;
@@ -949,7 +949,7 @@ MAKE_SCHEME_CALLBACK (System, calc_pure_height, 3);
 SCM
 System::calc_pure_height (SCM smob, SCM start_scm, SCM end_scm)
 {
-  System *me = dynamic_cast<System *> (Grob::unsmob (smob));
+  System *me = derived_unsmob<System> (smob);
   int start = scm_to_int (start_scm);
   int end = scm_to_int (end_scm);
 
@@ -993,7 +993,7 @@ enum
 static SCM
 get_maybe_spaceable_staves (SCM smob, int filter)
 {
-  System *me = dynamic_cast<System *> (Grob::unsmob (smob));
+  System *me = derived_unsmob<System> (smob);
   Grob *align = Grob::unsmob (me->get_object ("vertical_alignment"));
   SCM ret = SCM_EOL;