Revert "Issue 4360: Reorganize smob initialization to make it more reliable"

This reverts commit 90d3233da87b372e02690978f89b2add3863fba6.

diff --git a/lily/book.cc b/lily/book.cc
index e76963eaf30fb140d2bdf68a6104b6ebcb62f1c2..8e63d889e09ab80cc51f7f3aba265364afd3e331 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -33,7 +33,6 @@ using namespace std;
 #include "paper-score.hh"
 #include "page-marker.hh"
 
-ADD_SMOB_INIT (Book);
 
 Book::Book ()
 {

diff --git a/lily/box.cc b/lily/box.cc
index 050824a25ac74fa6d162b9ce8ff668b5f5ffede9..629b8010fae6b2ab9b429399e463952d5ed2aa04 100644 (file)
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -19,8 +19,6 @@
 
 #include "box.hh"
 
-ADD_SMOB_INIT (Box);
-
 void
 Box::translate (Offset o)
 {

diff --git a/lily/context-def.cc b/lily/context-def.cc
index b2aaedf44abed31aaf41b715f9e90e009e150a23..10f31ae83079c71cfa6062abbb2c9b2a82fffda1 100644 (file)
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -29,8 +29,6 @@
 #include "translator.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Context_def);
-
 Context_def::Context_def ()
 {
   context_aliases_ = SCM_EOL;

diff --git a/lily/context-mod.cc b/lily/context-mod.cc
index b9c43fe76a7f013e3bf16c21d5444920d2d6d222..fd2a25d2fe5fc64fec88a7eea3ec34deedc85962 100644 (file)
--- a/lily/context-mod.cc
+++ b/lily/context-mod.cc
@@ -19,8 +19,6 @@
 
 #include "context-mod.hh"
 
-ADD_SMOB_INIT (Context_mod);
-
 Context_mod::Context_mod ()
 {
   mods_ = SCM_EOL;

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 7a605352fd704fecb0028d336b5b650b46511282..59bcf9afc6764fdf1cf1cd81a97c98bcc2ec53d6 100644 (file)
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -94,8 +94,6 @@ private:
     cooked_ (alist), cooked_from_ (alist), nested_ (0) { }
 };
 
-ADD_SMOB_INIT (Grob_properties);
-
 const char Grob_properties::type_p_name_[] = "ly:grob-properties?";
 
 SCM

diff --git a/lily/context.cc b/lily/context.cc
index 1d8efed630e77b5d088a89f5e2f28c629ba3cf86..9dad38f269c623a9264966ebee9d1cd381ad0357 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -31,8 +31,6 @@
 #include "translator-group.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Context);
-
 bool
 Context::is_removable () const
 {

diff --git a/lily/dispatcher.cc b/lily/dispatcher.cc
index b76e76c35c828c1914416f1fdc0468f1f3ca3789..efb3ca506c0d2bcf2d533daeaee75f25acdd5a75 100644 (file)
--- a/lily/dispatcher.cc
+++ b/lily/dispatcher.cc
@@ -22,8 +22,6 @@
 #include "international.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Dispatcher);
-
 const char Dispatcher::type_p_name_[] = "ly:dispatcher?";
 
 Dispatcher::~Dispatcher ()

diff --git a/lily/duration.cc b/lily/duration.cc
index 78ae045a886316d18d7cb03fd9b48deee8435d58..4768f015b501c6510f52b373fb4625d94f168889 100644 (file)
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -20,8 +20,6 @@
 
 #include "duration.hh"
 
-ADD_SMOB_INIT (Duration);
-
 #include "misc.hh"
 #include "lily-proto.hh"
 

diff --git a/lily/font-metric.cc b/lily/font-metric.cc
index be071fe912dcfa9e5cf4c23d6dc1d55a85334939..f18b2d7256ae2717928937c3bbe76cc41799d121 100644 (file)
--- a/lily/font-metric.cc
+++ b/lily/font-metric.cc
@@ -29,7 +29,6 @@ using namespace std;
 #include "stencil.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Font_metric);
 
 Real
 Font_metric::design_size () const

diff --git a/lily/grob-array.cc b/lily/grob-array.cc
index f267ce5a440729fe97f8d959236b746bfbb517f2..2747e0d77fb052e66339263500d21cd9996a90a4 100644 (file)
--- a/lily/grob-array.cc
+++ b/lily/grob-array.cc
@@ -21,7 +21,6 @@
 #include "item.hh"
 #include "spanner.hh"
 
-ADD_SMOB_INIT (Grob_array);
 
 Item *
 Grob_array::item (vsize i)

diff --git a/lily/grob.cc b/lily/grob.cc
index 8cfb14d53974a23d9e3278b52f7b12e47b67e1ca..435a6faff3a92447ad67c637678a89129f5a09dd 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -39,7 +39,6 @@
 #include "unpure-pure-container.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Grob);
 
 Grob *
 Grob::clone () const

diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index eeb385e1a26d6ae390714f0bb574c584d81da42a..3ee2ef80abce09b44b2acadf1081173eb6579ce6 100644 (file)
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -127,26 +127,37 @@
 
 */
 
+// Initialization class.  Create a variable or static data member of
+// this type at global scope (or creation will happen too late for
+// Scheme initialization), initialising with a function to be called.
+// Reference somewhere (like in the constructor of the containing
+// class) to make sure the variable is actually instantiated.
+
+class Scm_init {
+public:
+  Scm_init () { }
+  Scm_init (void (*fun) (void))
+  {
+    add_scm_init_func (fun);
+  }
+};
+
 template <class Super>
 class Smob_base
 {
   static scm_t_bits smob_tag_;
-  static scm_t_bits init_id (void);
+  static Scm_init scm_init_;
+  static void init (void);
   static string smob_name_;
   static Super *unchecked_unsmob (SCM s)
   {
     return reinterpret_cast<Super *> (SCM_SMOB_DATA (s));
   }
 protected:
-  // This is an initialization with side effect.  It is called once,
-  // the first time smob_tag is actually getting called.  This
-  // allocates and initializes the type before it is first used for
-  // anything.
-  static scm_t_bits smob_tag ()
-  {
-    static scm_t_bits tag = init_id ();
-    return tag;
-  }
+  // reference scm_init_ in smob_tag which is sure to be called.  The
+  // constructor, in contrast, may not be called at all in classes
+  // like Smob1.
+  static scm_t_bits smob_tag () { (void) scm_init_; return smob_tag_; }
   Smob_base () { }
   static SCM register_ptr (Super *p);
   static Super *unregister_ptr (SCM obj);
@@ -206,17 +217,6 @@ private:
   static const int smob_proc_signature_ = -1;
 
 public:
-  static void init (void)
-  {
-    // This is stupid, but without forcing initialization at the
-    // Scheme startup hook stage, stuff like ly:undead? will not be
-    // defined when the first Scheme files are loaded.
-    //
-    // So we provide an explicit initialization routine that can be
-    // used with ADD_SCM_INIT_FUNC
-    (void) smob_tag ();
-  }
-#define ADD_SMOB_INIT(type) ADD_SCM_INIT_FUNC (Smob_init_ ## type, Smob_base<type>::init)
   static bool is_smob (SCM s)
   {
     return SCM_SMOB_PREDICATE (smob_tag (), s);

diff --git a/lily/include/smobs.tcc b/lily/include/smobs.tcc
index 097047e32b05ff2f30763602c57edbee63304b6c..b4dacacaa325ec8759bf321e368b4c8e138cc0ff 100644 (file)
--- a/lily/include/smobs.tcc
+++ b/lily/include/smobs.tcc
@@ -106,11 +106,17 @@ Smob_base<Super>::unregister_ptr (SCM obj)
   return p;
 }
 
+template <class Super>
+scm_t_bits Smob_base<Super>::smob_tag_ = 0;
+
+template <class Super>
+Scm_init Smob_base<Super>::scm_init_ = init;
+
 template <class Super>
 string Smob_base<Super>::smob_name_;
 
 template <class Super>
-scm_t_bits Smob_base<Super>::init_id ()
+void Smob_base<Super>::init ()
 {
   smob_name_ = typeid (Super).name ();
   // Primitive demangling, suitable for GCC, should be harmless
@@ -118,7 +124,8 @@ scm_t_bits Smob_base<Super>::init_id ()
   // unsuitable for Texinfo documentation.  If that proves to be an
   // issue, we need some smarter strategy.
   smob_name_ = smob_name_.substr (smob_name_.find_first_not_of ("0123456789"));
-  scm_t_bits smob_tag = scm_make_smob_type (smob_name_.c_str (), 0);
+  assert(!smob_tag_);
+  smob_tag_ = scm_make_smob_type (smob_name_.c_str (), 0);
   // The following have trivial private default definitions not
   // referring to any aspect of the Super class apart from its name.
   // They should be overridden (or rather masked) at Super level: that
@@ -127,7 +134,7 @@ scm_t_bits Smob_base<Super>::init_id ()
   // doing it like the rest.
 
   if (&Super::free_smob != &Smob_base<Super>::free_smob)
-    scm_set_smob_free (smob_tag, Super::free_smob);
+    scm_set_smob_free (smob_tag_, Super::free_smob);
   // Old GCC versions get their type lattice for pointers-to-members
   // tangled up to a degree where we need to typecast _both_ covariant
   // types in order to be able to compare them.  The other comparisons
@@ -135,10 +142,10 @@ scm_t_bits Smob_base<Super>::init_id ()
   // pointers which work without those contortions.
   if (static_cast<SCM (Super::*)()>(&Super::mark_smob) !=
       static_cast<SCM (Super::*)()>(&Smob_base<Super>::mark_smob))
-    scm_set_smob_mark (smob_tag, Super::mark_trampoline);
-  scm_set_smob_print (smob_tag, Super::print_trampoline);
+    scm_set_smob_mark (smob_tag_, Super::mark_trampoline);
+  scm_set_smob_print (smob_tag_, Super::print_trampoline);
   if (&Super::equal_p != &Smob_base<Super>::equal_p)
-    scm_set_smob_equalp (smob_tag, Super::equal_p);
+    scm_set_smob_equalp (smob_tag_, Super::equal_p);
   if (Super::type_p_name_ != 0)
     {
       SCM subr = scm_c_define_gsubr (Super::type_p_name_, 1, 0, 0,
@@ -151,11 +158,10 @@ scm_t_bits Smob_base<Super>::init_id ()
     }
   ly_add_type_predicate ((void *) is_smob, smob_name_.c_str ());
   if (Super::smob_proc_signature_ >= 0)
-    scm_set_smob_apply (smob_tag,
+    scm_set_smob_apply (smob_tag_,
                         (scm_t_subr)Super::smob_proc,
                         Super::smob_proc_signature_ >> 8,
                         (Super::smob_proc_signature_ >> 4)&0xf,
                         Super::smob_proc_signature_ & 0xf);
-  return smob_tag;
 }
 #endif

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index f6a3b7a77372098e6093137a26e212a3ca13730c..0a33bd6a596243159596b864c38378e4cbc709f2 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -21,8 +21,6 @@
 #include "source-file.hh"
 #include "std-string.hh"
 
-ADD_SMOB_INIT (Input);
-
 
 /* Dummy input location for use if real one is missing.  */
 Input dummy_input_global;

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 7785ede29600765bf181c2a14b2f8a743ac5cb02..3bb7921b2b89d9d5356ec8e4c80edb0f8d177f20 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -36,8 +36,6 @@ using namespace std;
 #include "program-option.hh"
 #include "lily-parser.hh"
 
-ADD_SMOB_INIT (Lily_lexer);
-
 static Keyword_ent the_key_tab[]
 =
 {

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 4bba3e445bd6f9e4f5fad3ef3ae4109d2fff7943..2d006f8d788894fe0c8b4407a16279d18c78a757 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -37,7 +37,6 @@
 #include "warn.hh"
 #include "program-option.hh"
 
-ADD_SMOB_INIT (Lily_parser);
 
 Lily_parser::Lily_parser (Sources *sources)
 {

diff --git a/lily/listener.cc b/lily/listener.cc
index 4194c836184d388afb609b010f5b97ee086f4a96..50f1969ecb418c4735715fc8c77bf9f08963b080 100644 (file)
--- a/lily/listener.cc
+++ b/lily/listener.cc
@@ -20,8 +20,6 @@
 #include "listener.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Listener);
-
 Listener::Listener ()
 {
   target_ = 0;

diff --git a/lily/moment.cc b/lily/moment.cc
index cd82c8a597899a1650332389b20e7484fe170f9b..9f3e8ed383837e3fb7059eebff437cac5423588a 100644 (file)
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -21,8 +21,6 @@
 
 #include "warn.hh"
 
-ADD_SMOB_INIT (Moment);
-
 Moment::Moment ()
 {
 }

diff --git a/lily/music-function.cc b/lily/music-function.cc
index a20af4d0a2a104264127956f1a827d2983330d48..35341e3c6d6fae828265b3d11f10f3e7c277daf7 100644 (file)
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -19,8 +19,6 @@
 
 #include "music-function.hh"
 
-ADD_SMOB_INIT (Music_function);
-
 const char Music_function::type_p_name_[] = "ly:music-function?";
 
 /* Print a textual represenation of the smob to a given port.  */

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ed778323b9ed1bad88beb219b91ad76120c2465a..8eb238c295bc6d95e47187e6995358e9ac4ab01d 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -30,7 +30,6 @@ using namespace std;
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
 
-ADD_SMOB_INIT (Music_iterator);
 
 Music_iterator::Music_iterator ()
 {

diff --git a/lily/music-output.cc b/lily/music-output.cc
index 8e03177bf45e764e9033f341a9771b5856296dd5..0907bf38f4d6f1707ee7087d53ed8eb822f618b2 100644 (file)
--- a/lily/music-output.cc
+++ b/lily/music-output.cc
@@ -19,7 +19,6 @@
 
 #include "music-output.hh"
 
-ADD_SMOB_INIT (Music_output);
 
 Music_output::Music_output ()
 {

diff --git a/lily/output-def.cc b/lily/output-def.cc
index 525ccd975e0a9bcc6950cc0d9cf1220e0b2c985c..af407fb70ac08465f87757fde59b59b2936db0de 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -34,8 +34,6 @@
 
 #include "string-convert.hh"
 
-ADD_SMOB_INIT (Output_def);
-
 Output_def::Output_def ()
 {
   scope_ = SCM_EOL;

diff --git a/lily/page-marker.cc b/lily/page-marker.cc
index 88eb975304ca9e980feff387ef447d87365ab5c2..1e393862e6b861b1a859602aee3b5a80e54ac927 100644 (file)
--- a/lily/page-marker.cc
+++ b/lily/page-marker.cc
@@ -19,8 +19,6 @@
 
 #include "page-marker.hh"
 
-ADD_SMOB_INIT (Page_marker);
-
 Page_marker::Page_marker ()
 {
   symbol_ = SCM_EOL;

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 00917966e5a0c121966204e81a5e07092a7d6695..7dce3a9507e7d48badcd24bca281f1f5578359ec 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -31,7 +31,6 @@
 #include "program-option.hh"
 #include "page-marker.hh"
 
-ADD_SMOB_INIT (Paper_book);
 
 Paper_book::Paper_book ()
 {

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index e8f1d821aa49201c35a6fc5f5fb78027a7dcb082..269e1e294c1ceeb18a5edc69205deb06788d4cff 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -38,7 +38,6 @@ using namespace std;
 #include "string-convert.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Paper_outputter);
 
 Paper_outputter::Paper_outputter (SCM port, const string &format)
 {

diff --git a/lily/pitch.cc b/lily/pitch.cc
index 4c5cb79e37620dfd4f347adc36c98b8f4888ebcb..0fd75129476a7a1d889d751c504e290f22c30843 100644 (file)
--- a/lily/pitch.cc
+++ b/lily/pitch.cc
@@ -26,8 +26,6 @@
 
 #include <cmath>
 
-ADD_SMOB_INIT (Pitch);
-
 Pitch::Pitch (int o, int n, Rational a)
 {
   notename_ = n;

diff --git a/lily/prob.cc b/lily/prob.cc
index 57f6b2f4d551a1e21aca2f5775596fdb8aefe426..37dad6246b34a00b2e0d3019ef0322849168ce85 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -23,7 +23,6 @@
 #include "input.hh"
 #include "profile.hh"
 
-ADD_SMOB_INIT (Prob);
 
 const char Prob::type_p_name_[] = "ly:prob?";
 

diff --git a/lily/scale.cc b/lily/scale.cc
index 57406f0af0982b11a6114b5c7b5d5a3270a40a09..a5afd41daee5f86fd466e4ac0af98c52fa641e95 100644 (file)
--- a/lily/scale.cc
+++ b/lily/scale.cc
@@ -21,7 +21,6 @@
 
 #include "scale.hh"
 
-ADD_SMOB_INIT (Scale);
 
 /*
   todo: put string <-> pitch here too.

diff --git a/lily/scheme-listener.cc b/lily/scheme-listener.cc
index 8a9e175f5c4648b5b853dc327e35d327b584e036..9df6960bdf0e2af166ba7e764b28874caf20045b 100644 (file)
--- a/lily/scheme-listener.cc
+++ b/lily/scheme-listener.cc
@@ -19,8 +19,6 @@
 
 #include "scheme-listener.hh"
 
-ADD_SMOB_INIT (Scheme_listener);
-
 IMPLEMENT_LISTENER (Scheme_listener, call)
 void
 Scheme_listener::call (SCM ev)

diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc
index c5a8959548d611b4e861996b9e8ddf123aa82b97..5eb048f6d177694dda7bb88873b5286bc6fdbd57 100644 (file)
--- a/lily/scm-hash.cc
+++ b/lily/scm-hash.cc
@@ -23,8 +23,6 @@
 #include <algorithm>
 using namespace std;
 
-ADD_SMOB_INIT (Scheme_hash_table);
-
 
 /*
   Return: number of objects.

diff --git a/lily/score.cc b/lily/score.cc
index 9210766c7760b286f596e822b17149e5798b1851..5ce7e3ba95efedf2fcd143453468601db3cd1a52 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -19,8 +19,6 @@
 
 #include "score.hh"
 
-ADD_SMOB_INIT (Score);
-
 #include <cstdio>
 
 using namespace std;

diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index 0ef57ded6ebaa3426f5db557a0b0d62f398ea0f8..b62649f06d52b28c88bfd40081ac917d771f8dce 100644 (file)
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -22,8 +22,6 @@
 
 #include "grob.hh"
 
-ADD_SMOB_INIT (Simple_closure);
-
 SCM
 evaluate_args (SCM delayed_argument, SCM args, bool pure, int start, int end)
 {

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index ce587c5fdd644080b336783f6c151a9498a488cd..ada16593aa7e6b1441360413f714cc58d2a1afc5 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -32,8 +32,6 @@
 #include "spring.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Simple_spacer);
-
 /*
   A simple spacing constraint solver. The approach:
 

diff --git a/lily/skyline-pair.cc b/lily/skyline-pair.cc
index 005b9b77cf88699a250fd2a3b0427d8e9439d3be..92ae97a342e0961571b066c0ad4b30775ea050b0 100644 (file)
--- a/lily/skyline-pair.cc
+++ b/lily/skyline-pair.cc
@@ -22,8 +22,6 @@
 
 #include "international.hh"
 
-ADD_SMOB_INIT (Skyline_pair);
-
 Skyline_pair::Skyline_pair ()
   : skylines_ (Skyline (DOWN), Skyline (UP))
 {

diff --git a/lily/skyline.cc b/lily/skyline.cc
index ef284e7131265144809fb3b2134ef11dc26d8ac7..42a028fe0a59271d4626c939f69091e35b65f8a6 100644 (file)
--- a/lily/skyline.cc
+++ b/lily/skyline.cc
@@ -65,8 +65,6 @@
    Alert to these considerations, we now accept buildings of zero-width.
 */
 
-ADD_SMOB_INIT (Skyline);
-
 static void
 print_buildings (list<Building> const &b)
 {

diff --git a/lily/source-file.cc b/lily/source-file.cc
index 67690289b97d7dc42bdef0f8c27dd2e916415cc9..1118b9d286ee29a823c6ce0b2a7d6041a9ed19aa 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -42,8 +42,6 @@ using namespace std;
 #include "misc.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Source_file);
-
 void
 Source_file::load_stdin ()
 {

diff --git a/lily/spring.cc b/lily/spring.cc
index 3d3dfff5fb155609bfa09dacb6da4dd8a0cbc94a..d1640e72b9790fb2d96991a743cfebef63f62f81 100644 (file)
--- a/lily/spring.cc
+++ b/lily/spring.cc
@@ -36,8 +36,6 @@
 
 #include "spring.hh"
 
-ADD_SMOB_INIT (Spring);
-
 Spring::Spring ()
 {
   distance_ = 1.0;

diff --git a/lily/stencil.cc b/lily/stencil.cc
index b1622808295ca0922bfe54be0e3964cfe6fda86d..980618ceaa5d965fdb8900372d77d60ff0350747 100644 (file)
--- a/lily/stencil.cc
+++ b/lily/stencil.cc
@@ -25,7 +25,6 @@
 #include "string-convert.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Stencil);
 
 Stencil::Stencil ()
 {

diff --git a/lily/translator-dispatch-list.cc b/lily/translator-dispatch-list.cc
index 02de105da9b0ff246c6150e9c00d6a79dd274113..ed968c571a5d504484cd99b1951af5b3b14b7c38 100644 (file)
--- a/lily/translator-dispatch-list.cc
+++ b/lily/translator-dispatch-list.cc
@@ -20,7 +20,6 @@
 #include "translator-dispatch-list.hh"
 #include "engraver.hh"
 
-ADD_SMOB_INIT (Engraver_dispatch_list);
 
 void
 Engraver_dispatch_list::apply (Grob_info gi)

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index f8818462c6b6ff21c29740ce48d7fa266664ed5e..2e6039a9af93a2c5c10b93535d0009a882d1f795 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -35,8 +35,6 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
-ADD_SMOB_INIT (Translator_group);
-
 void
 translator_each (SCM list, Translator_method method)
 {

diff --git a/lily/translator.cc b/lily/translator.cc
index a1053c57250f4bc697b91b44a62c1db9e48decd9..d6874ef78ca35d90a0e4a088405183961f17870c 100644 (file)
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -28,8 +28,6 @@
 
 #include "translator.icc"
 
-ADD_SMOB_INIT (Translator);
-
 Translator::~Translator ()
 {
 }

diff --git a/lily/undead.cc b/lily/undead.cc
index 9adc5e6fd072f65c27b62baa61e5d1f6a995f029..d6e3d550d1b47a9ca9a410024252c28c7b0e3dd2 100644 (file)
--- a/lily/undead.cc
+++ b/lily/undead.cc
@@ -32,8 +32,6 @@ public:
   Undead (SCM object = SCM_UNDEFINED) : object_ (object) { };
 };
 
-ADD_SMOB_INIT (Undead);
-
 SCM
 Undead::mark_smob ()
 {