From d93f200b402bf71709fc3426132e4a27c56ec684 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Sat, 27 Sep 2014 13:27:45 +0200 Subject: [PATCH] Issue 4135/1: Don't use ASSERT_LIVE_IS_ALLOWED in simple smobs When replacing mark_smob with a proper member function, use of ASSERT_LIVE_IS_ALLOWED would require access to self_scm () or similar, and simple smobs don't link back to their SCM cell. This only concerns Skyline and Context_mod, so the loss is not all that large. --- lily/context-mod.cc | 2 -- lily/include/skyline.hh | 1 - lily/skyline.cc | 7 ------- 3 files changed, 10 deletions(-) diff --git a/lily/context-mod.cc b/lily/context-mod.cc index 398735900c..329bb092dc 100644 --- a/lily/context-mod.cc +++ b/lily/context-mod.cc @@ -50,8 +50,6 @@ Context_mod::print_smob (SCM smob, SCM port, scm_print_state *) SCM Context_mod::mark_smob (SCM smob) { - ASSERT_LIVE_IS_ALLOWED (smob); - Context_mod *me = (Context_mod *) SCM_CELL_WORD_1 (smob); return me->mods_; diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh index c3309700e6..dd65bec147 100644 --- a/lily/include/skyline.hh +++ b/lily/include/skyline.hh @@ -53,7 +53,6 @@ class Skyline : public Simple_smob { public: static int print_smob (SCM, SCM, scm_print_state *); - static SCM mark_smob (SCM); static const char type_p_name_[]; private: list buildings_; diff --git a/lily/skyline.cc b/lily/skyline.cc index 6d6b58ca10..40e43ab9ef 100644 --- a/lily/skyline.cc +++ b/lily/skyline.cc @@ -863,13 +863,6 @@ Skyline::clear () const char Skyline::type_p_name_[] = "ly:skyline?"; -SCM -Skyline::mark_smob (SCM s) -{ - ASSERT_LIVE_IS_ALLOWED (s); - return SCM_EOL; -} - int Skyline::print_smob (SCM s, SCM port, scm_print_state *) { -- 2.39.5