Run grand replace for 2015.

[lilypond.git] / lily / source-file.cc

diff --git a/lily/source-file.cc b/lily/source-file.cc
index e4679bda60060802d0746dd102cbb1ae986feb02..69b18e90e5440bc6a5d4a643e91b38fee84ee1fe 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -102,7 +102,6 @@ Source_file::init ()
   istream_ = 0;
   line_offset_ = 0;
   str_port_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
@@ -359,30 +358,22 @@ Source_file::get_port () const
 
 /****************************************************************/
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Source_file);
-IMPLEMENT_DEFAULT_EQUAL_P (Source_file);
-IMPLEMENT_TYPE_P (Source_file, "ly:source-file?");
+const char Source_file::type_p_name_[] = "ly:source-file?";
 
 SCM
-Source_file::mark_smob (SCM smob)
+Source_file::mark_smob ()
 {
-  Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
-  return sc->str_port_;
+  return str_port_;
 }
 
 int
-Source_file::print_smob (SCM smob, SCM port, scm_print_state *)
+Source_file::print_smob (SCM port, scm_print_state *)
 {
-  Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
   scm_puts ("#<Source_file ", port);
-  scm_puts (sc->name_.c_str (), port);
+  scm_puts (name_.c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);
   return 1;
 }
-