X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=42d35816c31b1f9dc81fdc9ce534b039dd7d96c0;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=a324ccf0f4f747441febe98455cc3f49c7a2ff66;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git
diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc
index a324ccf0f4..42d35816c3 100644
--- a/lily/input-scheme.cc
+++ b/lily/input-scheme.cc
@@ -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 (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 (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 (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 (sip);
return scm_list_5 (ly_string2scm (ip->file_string ()),
scm_from_int (ip->line_number ()),