Release: bump Welcome versions.

[lilypond.git] / lily / output-def.cc

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 525ccd975e0a9bcc6950cc0d9cf1220e0b2c985c..e277a00534513f8cddb7460da4b6afc86bd954bc 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -17,13 +17,12 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "output-def.hh"
-
 #include "context-def.hh"
 #include "file-path.hh"
 #include "global-context.hh"
 #include "international.hh"
 #include "interval.hh"
+#include "ly-module.hh"
 #include "main.hh"
 #include "output-def.hh"
 #include "scm-hash.hh"
@@ -34,8 +33,6 @@
 
 #include "string-convert.hh"
 
-ADD_SMOB_INIT (Output_def);
-
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;
@@ -65,7 +62,7 @@ Output_def::~Output_def ()
 
 
 SCM
-Output_def::mark_smob ()
+Output_def::mark_smob () const
 {
   /* FIXME: why is this necessary?
      all paper_ should be protected by themselves. */
@@ -78,7 +75,7 @@ Output_def::mark_smob ()
 void
 assign_context_def (Output_def * m, SCM transdef)
 {
-  Context_def *tp = Context_def::unsmob (transdef);
+  Context_def *tp = unsmob<Context_def> (transdef);
   assert (tp);
 
   if (tp)
@@ -92,12 +89,12 @@ assign_context_def (Output_def * m, SCM transdef)
 SCM
 find_context_def (Output_def const *m, SCM name)
 {
-  Context_def *cd = Context_def::unsmob (m->lookup_variable (name));
+  Context_def *cd = unsmob<Context_def> (m->lookup_variable (name));
   return cd ? cd->self_scm () : SCM_EOL;
 }
 
 int
-Output_def::print_smob (SCM p, scm_print_state *)
+Output_def::print_smob (SCM p, scm_print_state *) const
 {
   scm_puts ("#< ", p);
   scm_puts (class_name (), p);