X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=278e8dabeaa2f167449ea6457987a8a88b895fac;hb=3fd5eabae695f90c0cea826bcea33d54a242b01b;hp=daaf1c71edca29c537dc7a872a817be8775ddd87;hpb=08560a1b8076630c4fc6cb9b902614d8b74fd6fc;p=lilypond.git diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index daaf1c71ed..278e8dabea 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2012 Han-Wen Nienhuys + Copyright (C) 2000--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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)) - && unsmob_grob (scm_cdar (s)) == next_col - && unsmob_spring (scm_caar (s))) - spring = unsmob_spring (scm_caar (s)); + && Grob::unsmob (scm_cdar (s)) == next_col + && Spring::is_smob (scm_caar (s))) + spring = Spring::unsmob (scm_caar (s)); } if (!spring)