X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fundead.cc;h=4aed7a60237f12b21d35e7f0eb5fb4aa122dc939;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=9adc5e6fd072f65c27b62baa61e5d1f6a995f029;hpb=90d3233da87b372e02690978f89b2add3863fba6;p=lilypond.git

diff --git a/lily/undead.cc b/lily/undead.cc
index 9adc5e6fd0..4aed7a6023 100644
--- a/lily/undead.cc
+++ b/lily/undead.cc
@@ -22,20 +22,18 @@
 class Undead : public Simple_smob<Undead>
 {
 public:
-  int print_smob (SCM, scm_print_state *);
-  SCM mark_smob ();
-  static const char type_p_name_[];
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
 private:
   SCM object_;
 public:
-  SCM object () { return object_; }
+  SCM object () const { return object_; }
   Undead (SCM object = SCM_UNDEFINED) : object_ (object) { };
 };
 
-ADD_SMOB_INIT (Undead);
-
 SCM
-Undead::mark_smob ()
+Undead::mark_smob () const
 {
   bool saved = parsed_objects_should_be_dead;
   parsed_objects_should_be_dead = false;
@@ -45,7 +43,7 @@ Undead::mark_smob ()
 }
 
 int
-Undead::print_smob (SCM port, scm_print_state *)
+Undead::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<Undead ", port);
   scm_display (object (), port);
@@ -53,7 +51,7 @@ Undead::print_smob (SCM port, scm_print_state *)
   return 1;
 }
 
-const char Undead::type_p_name_[] = "ly:undead?";
+const char * const Undead::type_p_name_ = "ly:undead?";
 
 LY_DEFINE (ly_make_undead, "ly:make-undead",
            1, 0, 0, (SCM object),
@@ -69,7 +67,7 @@ LY_DEFINE (ly_get_undead, "ly:get-undead",
            "Get back object from @var{undead}.")
 {
   LY_ASSERT_SMOB (Undead, undead, 1);
-  return Undead::unsmob (undead)->object ();
+  return unsmob<Undead> (undead)->object ();
 }
 
 // '