X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fstencil.hh;h=8af67c0f766f039184e6ba00500d43044a58a0e7;hb=65a0059b69385985896a24f407b3a791d33aef0f;hp=4f1bceaec462a0c7af11391dd2e4fa4e6ed1d959;hpb=0fe24db3936774a8fb913cb14c997036db7aeb1c;p=lilypond.git diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh index 4f1bceaec4..8af67c0f76 100644 --- a/lily/include/stencil.hh +++ b/lily/include/stencil.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2014 Han-Wen Nienhuys + Copyright (C) 1997--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 @@ -47,7 +47,7 @@ using namespace std; efficient to add "fresh" stencils to what you're going to build. * Do not create Stencil objects on the heap. That includes passing - around Stencil* which are produced by Stencil::unsmob(). Either + around Stencil* which are produced by unsmob(). Either copy Stencil objects, or use SCM references. * Empty stencils have empty dimensions. If add_at_edge is used to @@ -58,8 +58,8 @@ using namespace std; class Stencil : public Simple_smob { public: - SCM mark_smob (); - static const char type_p_name_[]; + SCM mark_smob () const; + static const char * const type_p_name_; private: Box dim_; SCM expr_;