X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=3a8b19a9d07397e90ca998c990f416054e5600ad;hb=207dd9350ecbcea14ebc5d45dadf45076ffc557f;hp=356bbf2121510dcd5fe7ea9dec6a6ad1305f3a27;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 356bbf2121..3a8b19a9d0 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,52 +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"
-extern "C"
-{
-#include <libguile/gc.h>
-};
 
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "protected-scm.hh"
 
 Protected_scm::Protected_scm ()
 {
-  object_ = 0;
+  object_ = SCM_UNDEFINED;
 }
 
 Protected_scm::Protected_scm (SCM s)
 {
-  object_ = s  ? scm_protect_object (s): 0;
+  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s) : s;
 }
 
 Protected_scm::Protected_scm (Protected_scm const &s)
 {
-  object_ = s.object_ ? scm_protect_object (s.object_) : 0;
+  object_ = (SCM_NIMP (s.object_) ? scm_gc_protect_object (s.object_)
+	     : s.object_);
 }
 
-Protected_scm & 
-Protected_scm::operator =(Protected_scm const &s)
+Protected_scm::~Protected_scm ()
 {
-  if (this == &s)
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
+}
+
+Protected_scm &
+Protected_scm::operator = (SCM s)
+{
+  if (object_ == s)
     return *this;
-  if (object_)
-    scm_unprotect_object(object_);
 
-  object_ = (s.object_) ? scm_protect_object (s.object_): 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 &
+Protected_scm::operator = (Protected_scm const &s)
 {
-  if  (object_)
-    {
-      scm_unprotect_object (object_);
-      object_ =0L;		// be nice to conservative GC
-    }
+  return operator = (s.object_);
 }
 
 Protected_scm::operator SCM () const
@@ -54,7 +54,7 @@ Protected_scm::operator SCM () const
   return object_;
 }
 
-SCM 
+SCM
 Protected_scm::to_SCM () const
 {
   return object_;