X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=c0235496f4ee73aa3f5cbbdbe7ba69004331fa5b;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0304d91f9133033f5b8e1881e6ad59a30afea76f;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 0304d91f91..c0235496f4 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,52 +1,72 @@
-/*   
-  protected-scm.cc --  implement Protected_scm
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "protected-scm.hh"
-extern "C"
-{
-#include <libguile/gc.h>
-};
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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_);
+  return operator = (s.object_);
+}
+
+Protected_scm::operator SCM () const
+{
+  return object_;
 }
 
-Protected_scm::operator SCM ()
+SCM
+Protected_scm::to_SCM () const
 {
   return object_;
 }