X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=42d35816c31b1f9dc81fdc9ce534b039dd7d96c0;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=37b7524fd770e033e05004e2840f8818b7ac430c;hpb=f5e923a6ce8cebb7ef893c03ce56aa5e598002c9;p=lilypond.git

diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index 37b7524fd7..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,7 +25,7 @@ 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_SMOB (Input, sip, 1);
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
@@ -43,7 +43,7 @@ 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_SMOB (Input, sip, 1);
   LY_ASSERT_TYPE (scm_is_string, msg, 2);
@@ -63,7 +63,7 @@ LY_DEFINE (ly_input_file_line_char_column,
            " @code{(file-name line char column)}.")
 {
   LY_ASSERT_SMOB (Input, sip, 1);
-  Input *ip = Input::unsmob (sip);
+  Input *ip = unsmob<Input> (sip);
 
   int l, ch, col, offset = 0;
   ip->get_counts (&l, &ch, &col, &offset);
@@ -81,7 +81,7 @@ LY_DEFINE (ly_input_both_locations,
 {
 
   LY_ASSERT_SMOB (Input, sip, 1);
-  Input *ip = Input::unsmob (sip);
+  Input *ip = unsmob<Input> (sip);
 
   return scm_list_5 (ly_string2scm (ip->file_string ()),
                      scm_from_int (ip->line_number ()),