X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-metric.cc;h=c9daa95f3edf2000d39fb47a5d856a8df505073a;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=47bdc513d2bf8fc20d104291047ea074bf82aec8;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 47bdc513d2..c9daa95f3e 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2014 Han-Wen Nienhuys + Copyright (C) 1999--2015 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 @@ -95,14 +95,14 @@ Font_metric::derived_mark () const } SCM -Font_metric::mark_smob () +Font_metric::mark_smob () const { derived_mark (); return description_; } int -Font_metric::print_smob (SCM port, scm_print_state *) +Font_metric::print_smob (SCM port, scm_print_state *) const { scm_puts ("#<", port); scm_puts (class_name (), port); @@ -112,7 +112,7 @@ Font_metric::print_smob (SCM port, scm_print_state *) return 1; } -const char Font_metric::type_p_name_[] = "ly:font-metric?"; +const char * const Font_metric::type_p_name_ = "ly:font-metric?"; SCM Font_metric::font_file_name () const