X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=c875b060a565b1db6cf9bd8d15ac43a17acee364;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=c1603c8709f10353d739f6063228a22b982268cf;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index c1603c8709..c875b060a5 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--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 @@ -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 ()); }