X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=42d35816c31b1f9dc81fdc9ce534b039dd7d96c0;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=f8bef3bda8aa930e66d915e5e877409d6df2e7c4;hpb=82e1242e3ad5d276b74e81488a3ffdac25701520;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index f8bef3bda8..42d35816c3 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -25,9 +25,9 @@ LY_DEFINE (ly_input_warning, "ly:input-warning", 2, 0, 1, (SCM sip, SCM msg, SCM
            " to the location in @var{sip}.  @var{msg} is interpreted"
            " similar to @code{format}'s argument, using @var{rest}.")
 {
-  Input *ip = Input::unsmob (sip);
+  Input *ip = unsmob<Input> (sip);
 
-  LY_ASSERT_TYPE (Input::unsmob, sip, 1);
+  LY_ASSERT_SMOB (Input, sip, 1);
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
@@ -43,9 +43,9 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM
            " to the location in @var{sip}.  @var{msg} is interpreted"
            " similar to @code{format}'s argument, using @var{rest}.")
 {
-  Input *ip = Input::unsmob (sip);
+  Input *ip = unsmob<Input> (sip);
 
-  LY_ASSERT_TYPE (Input::unsmob, sip, 1);
+  LY_ASSERT_SMOB (Input, sip, 1);
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
 
   msg = scm_simple_format (SCM_BOOL_F, msg, rest);
@@ -62,8 +62,8 @@ LY_DEFINE (ly_input_file_line_char_column,
            "Return input location in @var{sip} as"
            " @code{(file-name line char column)}.")
 {
-  LY_ASSERT_TYPE (Input::unsmob, sip, 1);
-  Input *ip = Input::unsmob (sip);
+  LY_ASSERT_SMOB (Input, sip, 1);
+  Input *ip = unsmob<Input> (sip);
 
   int l, ch, col, offset = 0;
   ip->get_counts (&l, &ch, &col, &offset);
@@ -80,8 +80,8 @@ LY_DEFINE (ly_input_both_locations,
            " @code{(file-name first-line first-column last-line last-column)}.")
 {
 
-  LY_ASSERT_TYPE (Input::unsmob, sip, 1);
-  Input *ip = Input::unsmob (sip);
+  LY_ASSERT_SMOB (Input, sip, 1);
+  Input *ip = unsmob<Input> (sip);
 
   return scm_list_5 (ly_string2scm (ip->file_string ()),
                      scm_from_int (ip->line_number ()),