release: 1.5.29

[lilypond.git] / lily / protected-scm.cc

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 2878e9c9a8aa9032f0c311644522b98d6dcf0963..1b6918bcf603d31d47c0f1ca4f76edc715cef054 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "protected-scm.hh"
@@ -17,24 +17,24 @@ Protected_scm::Protected_scm ()
 
 Protected_scm::Protected_scm (SCM s)
 {
-  object_ = SCM_NIMP(s)  ? scm_protect_object (s): s;
+  object_ = SCM_NIMP (s)  ? scm_gc_protect_object (s): s;
 }
 
 Protected_scm::Protected_scm (Protected_scm const &s)
 {
-  object_ = SCM_NIMP(s.object_) ? scm_protect_object (s.object_) : s.object_;
+  object_ = SCM_NIMP (s.object_) ? scm_gc_protect_object (s.object_) : s.object_;
 }
 
 Protected_scm & 
-Protected_scm::operator =(SCM s)
+Protected_scm::operator = (SCM s)
 {
   if (object_ == s)
     return *this;
   
   if (SCM_NIMP (object_))
-    scm_unprotect_object(object_);
+    scm_gc_unprotect_object (object_);
 
-  object_ =  SCM_NIMP (s) ? scm_protect_object (s): s;
+  object_ =  SCM_NIMP (s) ? scm_gc_protect_object (s): s;
   return *this;
 }
 
@@ -47,9 +47,9 @@ Protected_scm::operator = (Protected_scm const &s)
 
 Protected_scm::~Protected_scm ()
 {
-  if  (SCM_NIMP (object_))
+  if (SCM_NIMP (object_))
     {
-      scm_unprotect_object (object_);
+      scm_gc_unprotect_object (object_);
     }
 }