X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-smob.cc;h=72949973b1acf777fb88295945c7cf44e7f6e489;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=edebcbe95eac0b5fc04a52a169e4fbf453ea2941;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index edebcbe95e..72949973b1 100644
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--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
@@ -22,19 +22,15 @@
 #include "paper-score.hh"
 #include "warn.hh"
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Grob);
-IMPLEMENT_DEFAULT_EQUAL_P (Grob);
-IMPLEMENT_TYPE_P (Grob, "ly:grob?");
+const char * const Grob::type_p_name_ = "ly:grob?";
 
 SCM
-Grob::mark_smob (SCM ses)
+Grob::mark_smob () const
 {
-  ASSERT_LIVE_IS_ALLOWED ();
-  
-  Grob *s = (Grob *) SCM_CELL_WORD_1 (ses);
-  scm_gc_mark (s->immutable_property_alist_);
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
+
+  scm_gc_mark (immutable_property_alist_);
 
   /* Do not mark the parents.  The pointers in the mutable
      property list form two tree like structures (one for X
@@ -43,23 +39,21 @@ 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 (original ())
+    scm_gc_mark (original ()->self_scm ());
 
-  s->derived_mark ();
-  scm_gc_mark (s->object_alist_);
-  scm_gc_mark (s->interfaces_);
+  derived_mark ();
+  scm_gc_mark (object_alist_);
+  scm_gc_mark (interfaces_);
 
-  return s->mutable_property_alist_;
+  return mutable_property_alist_;
 }
 
 int
-Grob::print_smob (SCM s, SCM port, scm_print_state *)
+Grob::print_smob (SCM port, scm_print_state *) const
 {
-  Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
-
   scm_puts ("#<Grob ", port);
-  scm_puts ((char *) sc->name ().c_str (), port);
+  scm_puts ((char *) name ().c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);