X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fgrob-smob.cc;h=eaec5420c23e1b084131f6ec9575e2e39fd00469;hb=113223f5d488baf62b0e1a7bf4c2cfee037f4e0e;hp=4772e621594b8111a940195bc941c2694cf7d269;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index 4772e62159..eaec5420c2 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--2014 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,16 +22,13 @@
 #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 Grob::type_p_name_[] = "ly:grob?";
 
 SCM
 Grob::mark_smob (SCM ses)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
+  ASSERT_LIVE_IS_ALLOWED (ses);
 
   Grob *s = (Grob *) SCM_CELL_WORD_1 (ses);
   scm_gc_mark (s->immutable_property_alist_);