Run grand replace for 2015.

[lilypond.git] / lily / unpure-pure-container.cc

diff --git a/lily/unpure-pure-container.cc b/lily/unpure-pure-container.cc
index 5d5fe38235cf314e9a57f730b55686f94f806fcc..ede75022c6d0c148857e19f01f22f1c2687138c5 100644 (file)
--- a/lily/unpure-pure-container.cc
+++ b/lily/unpure-pure-container.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2011--2014 Mike Solomon <mike@mikesolomon.org>
+  Copyright (C) 2011--2015 Mike Solomon <mike@mikesolomon.org>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -61,7 +61,7 @@ LY_DEFINE (ly_unpure_pure_container_unpure_part, "ly:unpure-pure-container-unpur
            1, 0, 0, (SCM pc),
            "Return the unpure part of @var{pc}.")
 {
-  LY_ASSERT_TYPE (Unpure_pure_container::unsmob, pc, 1);
+  LY_ASSERT_SMOB (Unpure_pure_container, pc, 1);
   return Unpure_pure_container::unsmob (pc)->unpure_part ();
 }
 
@@ -69,20 +69,19 @@ LY_DEFINE (ly_unpure_pure_container_pure_part, "ly:unpure-pure-container-pure-pa
            1, 0, 0, (SCM pc),
            "Return the pure part of @var{pc}.")
 {
-  LY_ASSERT_TYPE (Unpure_pure_container::unsmob, pc, 1);
+  LY_ASSERT_SMOB (Unpure_pure_container, pc, 1);
   return Unpure_pure_container::unsmob (pc)->pure_part ();
 }
 
 int
-Unpure_pure_container::print_smob (SCM s, SCM port, scm_print_state *)
+Unpure_pure_container::print_smob (SCM port, scm_print_state *)
 {
-  Unpure_pure_container *p = Unpure_pure_container::unsmob (s);
   scm_puts ("#<unpure-pure-container ", port);
-  scm_display (p->unpure_part (), port);
-  if (!p->is_unchanging ())
+  scm_display (unpure_part (), port);
+  if (!is_unchanging ())
     {
       scm_puts (" ", port);
-      scm_display (p->pure_part (), port);
+      scm_display (pure_part (), port);
     }
   scm_puts (" >", port);
   return 1;