Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / ly-smobs.icc

diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc
index 45ba7ebf2d1e58d4fbf441706c3f37052c63559d..a77da17fc82733cfa708c9fc33cd13e3c0007e69 100644 (file)
--- a/lily/include/ly-smobs.icc
+++ b/lily/include/ly-smobs.icc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef LY_SMOBS_ICC
@@ -51,7 +51,7 @@
   {                                                                    \
     CL *s = (CL *) SCM_CELL_WORD_1 (ses);                              \
     delete s;                                                          \
-    scm_gc_unregister_collectable_memory (s, sizeof (CL), #CL " smob");        \
+    /*    scm_gc_unregister_collectable_memory (s, sizeof (CL), #CL " smob"); */ \
     return SMOB_FREE_RETURN_VAL (CL);                                  \
   }                                                                    \
                                                                        \
@@ -74,10 +74,21 @@
     void                                                               \
   CL::smobify_self ()                                                  \
   {                                                                    \
-    SCM s = unprotected_smobify_self ();                               \
-    scm_gc_protect_object (s);                                         \
+    protection_cons_ = SCM_EOL;                                                \
+    self_scm_ = unprotected_smobify_self ();                           \
+    protect ();                                                                \
+  }                                                                    \
+  void                                                                 \
+  CL::protect ()                                                       \
+  {                                                                    \
+    protect_smob (self_scm_, &protection_cons_);                       \
+  }                                                                    \
+  SCM                                                                  \
+  CL::unprotect ()                                                     \
+  {                                                                    \
+    unprotect_smob (self_scm_, &protection_cons_);                     \
+    return self_scm_;                                                  \
   }                                                                    \
-                                                                       \
   SCM                                                                  \
   CL::unprotected_smobify_self ()                                      \
   {                                                                    \
@@ -85,9 +96,10 @@
       This is local. We don't assign to self_scm_ directly, to assure  \
       that S isn't GC-ed from under us.                                        \
                                                                        \
-                                                                       We don't use smobbed_self () to ensure that mark_smob () doesn't have to \
-                                                                       deal half-initialized objects: scm_done_malloc ( ) might trigger GC. \
-                                                                       the warning in smobs.hh is just to be doubleplus goodly sure \
+      We don't use smobbed_self () to ensure that mark_smob () doesn't  \
+      have to deal half-initialized objects: scm_done_malloc ( ) might  \
+      trigger GC.the warning in smobs.hh is just to be doubleplus       \
+      goodly sure                                                       \
     */                                                                 \
     SCM s;                                                             \
     SCM_NEWSMOB (s, CL::smob_tag_, this);                              \