X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-mod-scheme.cc;h=a774fc7426a571135ee2467390f539659e2006ea;hb=2bbacb364aa29041af9cbbbd32cfad2e8e387cb3;hp=9c79c37859b6203b147bca35e225bfada6d4df4f;hpb=1ec92395c0ac0f8aa26cf4e2472ef21d9c620b32;p=lilypond.git

diff --git a/lily/context-mod-scheme.cc b/lily/context-mod-scheme.cc
index 9c79c37859..a774fc7426 100644
--- a/lily/context-mod-scheme.cc
+++ b/lily/context-mod-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2010--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2010--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ LY_DEFINE (ly_get_context_mods, "ly:get-context-mods",
            "Returns the list of context modifications stored in"
            " @var{contextmod}.")
 {
-  Context_mod *tr = unsmob_context_mod (contextmod);
+  Context_mod *tr = unsmob<Context_mod> (contextmod);
   LY_ASSERT_SMOB (Context_mod, contextmod, 1);
   return tr->get_mods ();
 }
@@ -36,7 +36,7 @@ LY_DEFINE (ly_add_context_mod, "ly:add-context-mod",
            "Adds the given context @var{modification} to the list"
            " @var{contextmods} of context modifications.")
 {
-  Context_mod *ctxmod = unsmob_context_mod (contextmods);
+  Context_mod *ctxmod = unsmob<Context_mod> (contextmods);
   LY_ASSERT_SMOB (Context_mod, contextmods, 1);
   ctxmod->add_context_mod (modification);
   return SCM_UNSPECIFIED;
@@ -47,7 +47,7 @@ LY_DEFINE (ly_make_context_mod, "ly:make-context-mod",
            "Creates a context modification, optionally initialized"
            " via the list of modifications @var{mod-list}.")
 {
-  if (mod_list != SCM_UNDEFINED)
+  if (!SCM_UNBNDP (mod_list))
     {
       LY_ASSERT_TYPE (ly_cheap_is_list, mod_list, 1);
       return Context_mod (mod_list).smobbed_copy ();
@@ -57,14 +57,14 @@ LY_DEFINE (ly_make_context_mod, "ly:make-context-mod",
 }
 
 LY_DEFINE (ly_context_mod_apply_x, "ly:context-mod-apply!",
-	   2, 0, 0, (SCM context, SCM mod),
-	   "Apply the context modification @var{mod} to @var{context}.")
+           2, 0, 0, (SCM context, SCM mod),
+           "Apply the context modification @var{mod} to @var{context}.")
 {
   LY_ASSERT_SMOB (Context, context, 1);
   LY_ASSERT_SMOB (Context_mod, mod, 2);
 
-  apply_property_operations (unsmob_context (context),
-			     unsmob_context_mod (mod)->get_mods ());
+  apply_property_operations (unsmob<Context> (context),
+                             unsmob<Context_mod> (mod)->get_mods ());
   scm_remember_upto_here_1 (context);
   return SCM_UNSPECIFIED;
 }