From: David Kastrup <dak@gnu.org>
Date: Wed, 18 Feb 2015 14:31:27 +0000 (+0100)
Subject: Issue 4293/2: Remove Music_function::mark_smob with ASSERT_LIVE_IS_ALLOWED
X-Git-Tag: release/2.19.16-1~2^2~7
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=10337721ab366a01a364497ec7cc1489547671ef;p=lilypond.git

Issue 4293/2: Remove Music_function::mark_smob with ASSERT_LIVE_IS_ALLOWED

GUILEv2's garbage collection is too asynchronous to make this work.
---

diff --git a/lily/include/music-function.hh b/lily/include/music-function.hh
index 99c6c8f157..aacb646e0d 100644
--- a/lily/include/music-function.hh
+++ b/lily/include/music-function.hh
@@ -28,7 +28,6 @@ class Music_function : public Smob2<Music_function>
 {
 public:
   static const char type_p_name_[];
-  SCM mark_smob ();
   int print_smob (SCM, scm_print_state *);
   SCM get_signature () { return scm1 (); }
   SCM get_function () { return scm2 (); }
diff --git a/lily/music-function.cc b/lily/music-function.cc
index c485a2989c..35341e3c6d 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -32,10 +32,3 @@ Music_function::print_smob (SCM port, scm_print_state *)
   /* Non-zero means success.  */
   return 1;
 }
-
-SCM
-Music_function::mark_smob ()
-{
-  ASSERT_LIVE_IS_ALLOWED (self_scm ());
-  return Smob2<Music_function>::mark_smob ();
-}