release: 1.5.29

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

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 356bbf2121510dcd5fe7ea9dec6a6ad1305f3a27..1b6918bcf603d31d47c0f1ca4f76edc715cef054 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -3,49 +3,53 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 #include "protected-scm.hh"
-extern "C"
-{
-#include <libguile/gc.h>
-};
-
+#include "lily-guile.hh"
+#include "main.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::operator = (SCM s)
 {
-  if (this == &s)
+  if (object_ == s)
     return *this;
-  if (object_)
-    scm_unprotect_object(object_);
+  
+  if (SCM_NIMP (object_))
+    scm_gc_unprotect_object (object_);
 
-  object_ = (s.object_) ? scm_protect_object (s.object_): 0;
+  object_ =  SCM_NIMP (s) ? scm_gc_protect_object (s): s;
   return *this;
 }
 
+Protected_scm&
+Protected_scm::operator = (Protected_scm const &s)
+{
+  return operator= (s.object_);
+}
+
+
 Protected_scm::~Protected_scm ()
 {
-  if  (object_)
+  if (SCM_NIMP (object_))
     {
-      scm_unprotect_object (object_);
-      object_ =0L;             // be nice to conservative GC
+      scm_gc_unprotect_object (object_);
     }
 }