X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic-iterator.cc;h=c076b7ad65867e9e9b3cdb9266ae0748c1dd7586;hb=06f227dd80f3a30cbf33c879b7c125079dfaf5c3;hp=c1603c8709f10353d739f6063228a22b982268cf;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index c1603c8709..c076b7ad65 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2012 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 @@ -50,7 +50,7 @@ Music_iterator::~Music_iterator () Context * Music_iterator::get_outlet () const { - return handle_.get_outlet (); + return handle_.get_context (); } void @@ -178,7 +178,7 @@ Music_iterator::report_event (Music *m) FIXME: then don't do it. */ if (!m->is_mus_type ("event")) - m->origin ()->programming_error (_ ("Sending non-event to context")); + m->origin ()->programming_error ("Sending non-event to context"); m->send_to_context (get_outlet ()); }