X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspaceable-grob.cc;h=0153e6d804009f4972e772d921df7b87bfb5a960;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=686b6640060147298e7858b04c59f8666cd5f79e;hpb=ea4fdf1afa3e6bb9a7c586f5a533be93ff3312d3;p=lilypond.git diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 686b664006..0153e6d804 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--2011 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::unsmob (scm_caar (s))) + spring = Spring::unsmob (scm_caar (s)); } if (!spring)