release: 1.3.25

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

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 0304d91f9133033f5b8e1881e6ad59a30afea76f..71d6b48273684b30c6844e8604b3f4feb4b54b5f 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -3,15 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 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 ()
 {
@@ -29,24 +26,39 @@ Protected_scm::Protected_scm (Protected_scm const &s)
 }
 
 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_);
 
-  object_ = (s.object_) ? scm_protect_object (s.object_): 0;
+  object_ =  s ? scm_protect_object (s): 0;
   return *this;
 }
 
+Protected_scm&
+Protected_scm::operator = (Protected_scm const &s)
+{
+  return operator= (s.object_);
+}
+
+
 Protected_scm::~Protected_scm ()
 {
   if  (object_)
-    scm_unprotect_object (object_);
+    {
+      scm_unprotect_object (object_);
+    }
+}
+
+Protected_scm::operator SCM () const
+{
+  return object_;
 }
 
-Protected_scm::operator SCM ()
+SCM 
+Protected_scm::to_SCM () const
 {
   return object_;
 }