X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=19a5eef4c5ff87ffc4fc18a84f2f0af14fce3286;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=4f6a787e37aabcae91b128f6e20c33afa2a81677;hpb=d2762a4f1add2bb04d6fc34d3c7ae03eeb7d500f;p=lilypond.git diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc index 4f6a787e37..19a5eef4c5 100644 --- a/lily/spring-smob.cc +++ b/lily/spring-smob.cc @@ -26,7 +26,8 @@ SCM Spring::equal_p (SCM a, SCM b) { - return a == b ? SCM_BOOL_T : SCM_BOOL_F; + // TODO SCM: This could be made simpler. + return scm_is_eq (a, b) ? SCM_BOOL_T : SCM_BOOL_F; } LY_DEFINE (ly_make_spring, "ly:make-spring", @@ -49,7 +50,7 @@ LY_DEFINE (ly_spring_set_inverse_compress_strength_x, "ly:spring-set-inverse-com LY_ASSERT_SMOB (Spring, spring, 1); LY_ASSERT_TYPE (scm_is_number, strength, 2); - Spring *s = Spring::unsmob (spring); + Spring *s = unsmob (spring); s->set_inverse_compress_strength (scm_to_double (strength)); return s->smobbed_copy (); } @@ -61,9 +62,9 @@ LY_DEFINE (ly_spring_set_inverse_stretch_strength_x, "ly:spring-set-inverse-stre LY_ASSERT_SMOB (Spring, spring, 1); LY_ASSERT_TYPE (scm_is_number, strength, 2); - Spring *s = Spring::unsmob (spring); + Spring *s = unsmob (spring); s->set_inverse_stretch_strength (scm_to_double (strength)); return s->smobbed_copy (); } -const char Spring::type_p_name_[] = "ly:spring?"; +const char * const Spring::type_p_name_ = "ly:spring?";