X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment-scheme.cc;h=740b6ee2c9075789ee2dee31d16fee22bd1e4e2e;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=ef0248338534bfecbbddee341f209c6fe562954d;hpb=e8b68d8a878a0ee0381719230cf911dbcefa168d;p=lilypond.git

diff --git a/lily/moment-scheme.cc b/lily/moment-scheme.cc
index ef02483385..740b6ee2c9 100644
--- a/lily/moment-scheme.cc
+++ b/lily/moment-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -78,8 +78,8 @@ LY_DEFINE (ly_moment_sub, "ly:moment-sub",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
 
   return (*ma - *mb).smobbed_copy ();
 }
@@ -91,8 +91,8 @@ LY_DEFINE (ly_moment_add, "ly:moment-add",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
 
   return (*ma + *mb).smobbed_copy ();
 }
@@ -104,8 +104,8 @@ LY_DEFINE (ly_moment_mul, "ly:moment-mul",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
   return (*ma * * mb).smobbed_copy ();
 }
 
@@ -116,8 +116,8 @@ LY_DEFINE (ly_moment_div, "ly:moment-div",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
 
   return (*ma / * mb).smobbed_copy ();
 }
@@ -129,8 +129,8 @@ LY_DEFINE (ly_moment_mod, "ly:moment-mod",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
   return (*ma % * mb).smobbed_copy ();
 }
 
@@ -140,7 +140,7 @@ LY_DEFINE (ly_moment_grace, "ly:moment-grace",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  return ly_rational2scm (Moment::unsmob (mom)->grace_part_);
+  return ly_rational2scm (unsmob<Moment> (mom)->grace_part_);
 }
 
 LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
@@ -149,7 +149,7 @@ LY_DEFINE (ly_moment_grace_numerator, "ly:moment-grace-numerator",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  Moment *ma = Moment::unsmob (mom);
+  Moment *ma = unsmob<Moment> (mom);
 
   return scm_from_int64 (ma->grace_part_.numerator ());
 }
@@ -159,7 +159,7 @@ LY_DEFINE (ly_moment_grace_denominator, "ly:moment-grace-denominator",
            "Extract denominator from grace timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = Moment::unsmob (mom);
+  Moment *ma = unsmob<Moment> (mom);
 
   return scm_from_int64 (ma->grace_part_.denominator ());
 }
@@ -170,7 +170,7 @@ LY_DEFINE (ly_moment_main, "ly:moment-main",
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
 
-  return ly_rational2scm (Moment::unsmob (mom)->main_part_);
+  return ly_rational2scm (unsmob<Moment> (mom)->main_part_);
 }
 
 LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
@@ -178,7 +178,7 @@ LY_DEFINE (ly_moment_main_numerator, "ly:moment-main-numerator",
            "Extract numerator from main timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = Moment::unsmob (mom);
+  Moment *ma = unsmob<Moment> (mom);
 
   return scm_from_int64 (ma->main_part_.numerator ());
 }
@@ -188,7 +188,7 @@ LY_DEFINE (ly_moment_main_denominator, "ly:moment-main-denominator",
            "Extract denominator from main timing.")
 {
   LY_ASSERT_SMOB (Moment, mom, 1);
-  Moment *ma = Moment::unsmob (mom);
+  Moment *ma = unsmob<Moment> (mom);
 
   return scm_from_int64 (ma->main_part_.denominator ());
 }
@@ -200,8 +200,8 @@ LY_DEFINE (ly_moment_less_p, "ly:moment<?",
   LY_ASSERT_SMOB (Moment, a, 1);
   LY_ASSERT_SMOB (Moment, b, 2);
 
-  Moment *ma = Moment::unsmob (a);
-  Moment *mb = Moment::unsmob (b);
+  Moment *ma = unsmob<Moment> (a);
+  Moment *mb = unsmob<Moment> (b);
 
   return ly_bool2scm (*ma < *mb);
 }