X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=36e527a2a1c147979b50eac9131cbb656ea48752;hb=913f4a33e9b60b94e673ae48c1fb299f1465b4ad;hp=cf06c84a5d94ba56683dde3ce246c798c520fc64;hpb=8f58f4428d70961938e9151097886d861b3faeb3;p=lilypond.git

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index cf06c84a5d..36e527a2a1 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,64 +1,52 @@
-/*   
-  protected-scm.cc --  implement Protected_scm
-  
+/*
+  protected-scm.cc -- implement Protected_scm
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "protected-scm.hh"
-#include "lily-guile.hh"
-#include "main.hh"
 
-#ifdef LYPROT
-#define PROTECT   ly_protect_scm
-#define UNPROTECT ly_unprotect_scm
-#else
-#define PROTECT   scm_protect_object 
-#define UNPROTECT scm_unprotect_object
-#endif
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "protected-scm.hh"
 
 Protected_scm::Protected_scm ()
 {
-  object_ = 0;
+  object_ = SCM_UNDEFINED;
 }
 
 Protected_scm::Protected_scm (SCM s)
 {
-  object_ = s  ? PROTECT (s): 0;
+  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s) : s;
 }
 
 Protected_scm::Protected_scm (Protected_scm const &s)
 {
-  object_ = s.object_ ? PROTECT (s.object_) : 0;
+  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 (object_)
-    UNPROTECT(object_);
 
-  object_ =  s ? PROTECT (s): 0;
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
+
+  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  (object_)
-    {
-      UNPROTECT (object_);
-      object_ =0L;		// be nice to conservative GC
-    }
+  return operator = (s.object_);
 }
 
 Protected_scm::operator SCM () const
@@ -66,7 +54,7 @@ Protected_scm::operator SCM () const
   return object_;
 }
 
-SCM 
+SCM
 Protected_scm::to_SCM () const
 {
   return object_;