Issue 4878: Make type_p_name_ always char pointer

[lilypond.git] / lily / include / context-mod.hh

diff --git a/lily/include/context-mod.hh b/lily/include/context-mod.hh
index babb8642283a0714d9e1114751c5d3455f52e9e0..81b1f34e36c47189b543eda186e84dbf66e6fb98 100644 (file)
--- a/lily/include/context-mod.hh
+++ b/lily/include/context-mod.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010 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
@@ -30,29 +30,27 @@
 #include "smobs.hh"
 #include "virtual-methods.hh"
 
-
 /*
   Modifications for an interpretation context as given in the
   input.
 */
-struct Context_mod
+struct Context_mod : public Simple_smob<Context_mod>
 {
+  SCM mark_smob () const;
+  int print_smob (SCM, scm_print_state *) const;
+  static const char * const type_p_name_;
 private:
   SCM mods_;
 public:
   void add_context_mod (SCM);
   void add_context_mods (SCM);
 
-  VIRTUAL_COPY_CONSTRUCTOR (Context_mod, Context_mod);
-
   SCM get_mods () const;
 
   Context_mod ();
   Context_mod (Context_mod const &);
-  DECLARE_SIMPLE_SMOBS (Context_mod);
+  Context_mod (SCM mod_list);
 };
 
-DECLARE_UNSMOB (Context_mod, context_mod);
 
 #endif /* CONTEXT_MOD_HH */
-