X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=3258297b49539e2af7ed329eba280fc1b4192e6c;hb=aafcc4147ae2fea2ba1d95c7a54963c61f21b963;hp=b2aaedf44abed31aaf41b715f9e90e009e150a23;hpb=90d3233da87b372e02690978f89b2add3863fba6;p=lilypond.git

diff --git a/lily/context-def.cc b/lily/context-def.cc
index b2aaedf44a..3258297b49 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -29,8 +29,6 @@
 #include "translator.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Context_def);
-
 Context_def::Context_def ()
 {
   context_aliases_ = SCM_EOL;
@@ -52,7 +50,7 @@ Context_def::Context_def ()
 Input *
 Context_def::origin () const
 {
-  return Input::unsmob (input_location_);
+  return unsmob<Input> (input_location_);
 }
 
 Context_def::Context_def (Context_def const &s)
@@ -87,7 +85,7 @@ Context_def::~Context_def ()
 const char Context_def::type_p_name_[] = "ly:context-def?";
 
 int
-Context_def::print_smob (SCM port, scm_print_state *)
+Context_def::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Context_def ", port);
   scm_display (context_name_, port);
@@ -99,7 +97,7 @@ Context_def::print_smob (SCM port, scm_print_state *)
 }
 
 SCM
-Context_def::mark_smob ()
+Context_def::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
@@ -237,7 +235,7 @@ Context_def::internal_path_to_acceptable_context (SCM type_sym,
 
   vector<Context_def *> accepteds;
   for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s))
-    if (Context_def *t = Context_def::unsmob (find_context_def (odef,
+    if (Context_def *t = unsmob<Context_def> (find_context_def (odef,
                                                                scm_car (s))))
       accepteds.push_back (t);
 
@@ -400,7 +398,7 @@ LY_DEFINE (ly_context_def_lookup, "ly:context-def-lookup",
            " @samp{property-ops}, @samp{context-name}, @samp{group-type}.")
 {
   LY_ASSERT_SMOB (Context_def, def, 1);
-  Context_def *cd = Context_def::unsmob (def);
+  Context_def *cd = unsmob<Context_def> (def);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   SCM res = cd->lookup (sym);
@@ -424,9 +422,9 @@ LY_DEFINE (ly_context_def_modify, "ly:context-def-modify",
   LY_ASSERT_SMOB (Context_def, def, 1);
   LY_ASSERT_SMOB (Context_mod, mod, 2);
 
-  Context_def *cd = Context_def::unsmob (def)->clone ();
+  Context_def *cd = unsmob<Context_def> (def)->clone ();
 
-  for (SCM s = Context_mod::unsmob (mod)->get_mods ();
+  for (SCM s = unsmob<Context_mod> (mod)->get_mods ();
        scm_is_pair (s);
        s = scm_cdr (s))
     cd->add_context_mod (scm_car (s));