Housekeeping; 2005->2006, remove "notes for 2.6"

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

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index aa0956e567bf278ea988fe065bf37c8d13d2cdae..4fb42c9237d2a707fc0e0460d720e0de3cc57bc8 100644 (file)
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob.hh"
@@ -32,8 +32,8 @@ Grob::mark_smob (SCM ses)
      between X and Y in an erratic manner, leading to much more
      recursion depth (and core dumps if we link to pthreads).  */
 
-  if (s->original_)
-    scm_gc_mark (s->original_->self_scm ());
+  if (s->original ())
+    scm_gc_mark (s->original ()->self_scm ());
 
   s->derived_mark ();
   scm_gc_mark (s->object_alist_);
@@ -48,7 +48,7 @@ Grob::print_smob (SCM s, SCM port, scm_print_state *)
   Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
 
   scm_puts ("#<Grob ", port);
-  scm_puts ((char *) sc->name ().to_str0 (), port);
+  scm_puts ((char *) sc->name ().c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);