X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-mod.cc;h=892d692bbf8f6c2a89ff1d7288929cf8a8891e95;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=398735900c939f108a1ee0f2eccecccb676eca4c;hpb=bf090c279f6f8e0ebbffc72d7ee435172dfaddc8;p=lilypond.git

diff --git a/lily/context-mod.cc b/lily/context-mod.cc
index 398735900c..892d692bbf 100644
--- a/lily/context-mod.cc
+++ b/lily/context-mod.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010--2014 Reinhold Kainhofer <reinhold@kainhofer.com>
+  Copyright (C) 2010--2015 Reinhold Kainhofer <reinhold@kainhofer.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -34,27 +34,21 @@ Context_mod::Context_mod (SCM mod_list)
   mods_ = scm_reverse (mod_list);
 }
 
-const char Context_mod::type_p_name_[] = "ly:context-mod?";
+const char * const Context_mod::type_p_name_ = "ly:context-mod?";
 
 int
-Context_mod::print_smob (SCM smob, SCM port, scm_print_state *)
+Context_mod::print_smob (SCM port, scm_print_state *) const
 {
-  Context_mod *me = (Context_mod *) SCM_CELL_WORD_1 (smob);
-
   scm_puts ("#<Context_mod ", port);
-  scm_display (me->get_mods (), port);
+  scm_display (get_mods (), port);
   scm_puts (">", port);
   return 1;
 }
 
 SCM
-Context_mod::mark_smob (SCM smob)
+Context_mod::mark_smob () const
 {
-  ASSERT_LIVE_IS_ALLOWED (smob);
-
-  Context_mod *me = (Context_mod *) SCM_CELL_WORD_1 (smob);
-
-  return me->mods_;
+  return mods_;
 }
 
 void