X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=d7a8498a928c8313f12ac899f97e1b9919ae64e7;hb=744614ec4497e540fbaa6ad9bf6e842f4b99442a;hp=3628ef7078c3263b3f173991d099866bdd00c4ad;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 3628ef7078..d7a8498a92 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,14 +1,12 @@
-/*   
-  protected-scm.cc --  implement Protected_scm
-  
+/*
+  protected-scm.cc -- implement Protected_scm
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "protected-scm.hh"
-#include "lily-guile.hh"
-#include "main.hh"
 
 Protected_scm::Protected_scm ()
 {
@@ -17,40 +15,38 @@ 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 ()
+{
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
 }
 
-Protected_scm & 
-Protected_scm::operator =(SCM s)
+Protected_scm &
+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;
 }
 
-Protected_scm&
+Protected_scm &
 Protected_scm::operator = (Protected_scm const &s)
 {
-  return operator= (s.object_);
-}
-
-
-Protected_scm::~Protected_scm ()
-{
-  if  (SCM_NIMP (object_))
-    {
-      scm_unprotect_object (object_);
-    }
+  return operator = (s.object_);
 }
 
 Protected_scm::operator SCM () const
@@ -58,7 +54,7 @@ Protected_scm::operator SCM () const
   return object_;
 }
 
-SCM 
+SCM
 Protected_scm::to_SCM () const
 {
   return object_;