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));
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)