Compile fixes.

[lilypond.git] / lily / scale.cc

diff --git a/lily/scale.cc b/lily/scale.cc
index 89e8103887b3af3c2d98ace94ecf4e8065137b7c..ecd2b9357edb3a2ea4aec7c8ed10405c9008eb05 100644 (file)
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2006 Han-Wen Nienhuys <hanwen@lilypond.org>
+  (c) 2006--2007 Han-Wen Nienhuys <hanwen@lilypond.org>
   
 */
 
@@ -66,9 +66,9 @@ LY_DEFINE (ly_set_default_scale, "ly:set-default-scale",
           1, 0, 0, (SCM scale),
           "Set the global default scale.")
 {
-  Scale *s = Scale::unsmob (scale);
-  SCM_ASSERT_TYPE (s, scale, SCM_ARG1, __FUNCTION__, "scale");
+  LY_ASSERT_SMOB (Scale, scale, 1);
 
+  Scale *s = Scale::unsmob (scale);
   if (default_global_scale)
     default_global_scale->unprotect ();
   default_global_scale = s;
@@ -111,5 +111,5 @@ Scale::~Scale ()
 {
 }
 
-IMPLEMENT_SMOBS(Scale);
-IMPLEMENT_DEFAULT_EQUAL_P(Scale);
+IMPLEMENT_SMOBS (Scale);
+IMPLEMENT_DEFAULT_EQUAL_P (Scale);