From: David Kastrup <dak@gnu.org>
Date: Wed, 1 Jun 2016 18:57:26 +0000 (+0200)
Subject: Issue 4873/2: Give add_acknowledger SCM &, not Protected_scm &
X-Git-Tag: release/2.19.43-1~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=014fe25e13112b1e215e2fec5d1a466f6a8ac255;p=lilypond.git

Issue 4873/2: Give add_acknowledger SCM &, not Protected_scm &
---

diff --git a/lily/include/translator.icc b/lily/include/translator.icc
index 1d45061578..01fff8d7c3 100644
--- a/lily/include/translator.icc
+++ b/lily/include/translator.icc
@@ -95,7 +95,7 @@
 
 void add_acknowledger (SCM ptr,
                        char const *func_name,
-                       Protected_scm &ack_hash);
+                       SCM &ack_hash);
 
 #define ADD_ACKNOWLEDGER(CLASS, NAME)                                   \
   add_acknowledger (CLASS::ack_finder<&CLASS::acknowledge_ ## NAME> (), \
diff --git a/lily/translator.cc b/lily/translator.cc
index 4a234e2817..5cd42703a1 100644
--- a/lily/translator.cc
+++ b/lily/translator.cc
@@ -232,9 +232,9 @@ Translator::print_smob (SCM port, scm_print_state *) const
 void
 add_acknowledger (SCM ptr,
                   char const *func_name,
-                  Protected_scm &ack_hash)
+                  SCM &ack_hash)
 {
-  if (SCM_UNBNDP (SCM (ack_hash)))
+  if (SCM_UNBNDP (ack_hash))
     ack_hash = Scheme_hash_table::make_smob ();
 
   string interface_name (func_name);