X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=80624c40a81441b6da7fa3339e8b423a7d8adbc1;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=287b10dc043a42ce8ebe613422a8c51fe916874b;hpb=67cce0767337d165c0bf9f222d6195ff10902d13;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 287b10dc04..80624c40a8 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 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 @@ -38,7 +38,7 @@ internal_print (Grob *me, string *font_char) { string style = robust_symbol2string (me->get_property ("style"), "default"); - string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); if (style != "default") suffix = robust_scm2string (me->get_property ("glyph-name"), ""); @@ -162,7 +162,7 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) } Offset -Note_head::get_stem_attachment (Font_metric *fm, string key) +Note_head::get_stem_attachment (Font_metric *fm, const string &key) { Offset att;