Issue 4365: non-member unsmob<T> replaces T::unsmob and T::is_smob

[lilypond.git] / lily / global-context.cc

diff --git a/lily/global-context.cc b/lily/global-context.cc
index b9afbd7671d51ee680030f14dcf40cb8bdd6586c..c21deb3b9ba54651c20cf21237d5ba538a249dc2 100644 (file)
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -46,7 +46,7 @@ Global_context::Global_context (Output_def *o)
                                  ly_symbol2scm ("Prepare"));
   events_below ()->register_as_listener (event_source_);
 
-  Context_def *globaldef = Context_def::unsmob (definition_);
+  Context_def *globaldef = unsmob<Context_def> (definition_);
   if (!globaldef)
     programming_error ("no `Global' context found");
   else
@@ -91,8 +91,8 @@ Global_context::get_moments_left () const
 void
 Global_context::prepare (SCM sev)
 {
-  Stream_event *ev = Stream_event::unsmob (sev);
-  Moment *mom = Moment::unsmob (ev->get_property ("moment"));
+  Stream_event *ev = unsmob<Stream_event> (sev);
+  Moment *mom = unsmob<Moment> (ev->get_property ("moment"));
 
   assert (mom);
 
@@ -113,7 +113,7 @@ Context *
 Global_context::get_score_context () const
 {
   return (scm_is_pair (context_list_))
-         ? Context::unsmob (scm_car (context_list_))
+         ? unsmob<Context> (scm_car (context_list_))
          : 0;
 }