X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-combine-music.cc;h=9cf603a3a4929f70aaef18db2c0a5779f0985c8e;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=de6e2d0493037e718e8274f738860878a0633806;hpb=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc
index de6e2d0493..9cf603a3a4 100644
--- a/lily/lyric-combine-music.cc
+++ b/lily/lyric-combine-music.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ MAKE_SCHEME_CALLBACK (Lyric_combine_music, length_callback, 1);
 SCM
 Lyric_combine_music::length_callback (SCM m)
 {
-  Music *me = Music::unsmob (m);
-  Music *melody = Music::unsmob (scm_car (me->get_property ("elements")));
+  Music *me = unsmob<Music> (m);
+  Music *melody = unsmob<Music> (scm_car (me->get_property ("elements")));
   return melody->get_length ().smobbed_copy ();
 }