X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=c6ed9120396c3e9550edc8b4088f7bc081606aa3;hb=79575c7fdd6596cea0489e7054c6df919846375e;hp=c3c608cc0bb6d20bb6a518ff442a9d5d16697f13;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git

diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc
index c3c608cc0b..c6ed912039 100644
--- a/lily/spaceable-grob.cc
+++ b/lily/spaceable-grob.cc
@@ -51,7 +51,7 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d)
   for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM dist = scm_car (s);
-      if (scm_car (dist) == p->self_scm ())
+      if (scm_is_eq (scm_car (dist), p->self_scm ()))
         {
           scm_set_cdr_x (dist, scm_max (scm_cdr (dist),
                                         newdist));
@@ -85,9 +85,9 @@ Spaceable_grob::get_spring (Grob *this_col, Grob *next_col)
        s = scm_cdr (s))
     {
       if (scm_is_pair (scm_car (s))
-          && Grob::unsmob (scm_cdar (s)) == next_col
-          && Spring::is_smob (scm_caar (s)))
-        spring = Spring::unsmob (scm_caar (s));
+          && unsmob<Grob> (scm_cdar (s)) == next_col
+          && unsmob<Spring> (scm_caar (s)))
+        spring = unsmob<Spring> (scm_caar (s));
     }
 
   if (!spring)