X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-output.cc;h=9e8cc9ff9a5bcf3353588f0996afabdf73ded7ee;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=18eb372020f3bf381fe358baeaa749f6dceec4d0;hpb=00b9619cea1020f6773f23df8764ef85ee2912bf;p=lilypond.git

diff --git a/lily/music-output.cc b/lily/music-output.cc
index 18eb372020..9e8cc9ff9a 100644
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -39,21 +39,20 @@ Music_output::derived_mark () const
 {
 }
 
-const char Music_output::type_p_name_[] = "ly:music-output?";
+const char * const Music_output::type_p_name_ = "ly:music-output?";
 
 SCM
-Music_output::mark_smob ()
+Music_output::mark_smob () const
 {
   derived_mark ();
   return SCM_EOL;
 }
 
 int
-Music_output::print_smob (SCM s, SCM p, scm_print_state *)
+Music_output::print_smob (SCM p, scm_print_state *) const
 {
-  Music_output *sc = (Music_output *) SCM_CELL_WORD_1 (s);
   scm_puts ("#<", p);
-  scm_puts (sc->class_name (), p);
+  scm_puts (class_name (), p);
   scm_puts (">", p);
 
   return 1;