Release: bump Welcome versions.

[lilypond.git] / lily / input-smob.cc

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 6700936d44cc084c965de39f83f4ea881229927e..6f5fc18a54fb116a58dc2c1db13cf227c472704c 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--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,23 +25,21 @@
 /* Dummy input location for use if real one is missing.  */
 Input dummy_input_global;
 
-const char Input::type_p_name_[] = "ly:input-location?";
+const char * const Input::type_p_name_ = "ly:input-location?";
 
 SCM
-Input::mark_smob (SCM s)
+Input::mark_smob () const
 {
-  Input *sc = unsmob (s);
-
-  if (Source_file *sf = sc->get_source_file ())
+  if (Source_file *sf = get_source_file ())
     return sf->self_scm ();
 
   return SCM_EOL;
 }
 
 int
-Input::print_smob (SCM s, SCM port, scm_print_state *)
+Input::print_smob (SCM port, scm_print_state *) const
 {
-  string str = "#<location " + Input::unsmob (s)->location_string () + ">";
+  string str = "#<location " + location_string () + ">";
   scm_puts (str.c_str (), port);
   return 1;
 }
@@ -49,8 +47,8 @@ Input::print_smob (SCM s, SCM port, scm_print_state *)
 SCM
 Input::equal_p (SCM sa, SCM sb)
 {
-  Input *a = unsmob (sa);
-  Input *b = unsmob (sb);
+  Input *a = unsmob<Input> (sa);
+  Input *b = unsmob<Input> (sb);
   if (a->get_source_file () == b->get_source_file ()
       && a->start () == b->start ()
       && a->end () == b->end ())