X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprotected-scm.cc;h=c549f46e3c0ad6097cbdabf528ed0e65c0cc83fc;hb=7c28124df1472bc714abbf2498ada37dfafce0cf;hp=56bd2def2fef8f6a190510208cef89b45eb2baf1;hpb=a2df6d13e3d521717e372d880c4ff5dbef831d67;p=lilypond.git

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index 56bd2def2f..c549f46e3c 100644
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,13 +1,23 @@
-/*   
-  protected-scm.cc --  implement Protected_scm
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1998--2009 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"
-#include "lily-guile.hh"
 
 Protected_scm::Protected_scm ()
 {
@@ -16,7 +26,7 @@ Protected_scm::Protected_scm ()
 
 Protected_scm::Protected_scm (SCM s)
 {
-  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s): s;
+  object_ = SCM_NIMP (s) ? scm_gc_protect_object (s) : s;
 }
 
 Protected_scm::Protected_scm (Protected_scm const &s)
@@ -31,12 +41,12 @@ Protected_scm::~Protected_scm ()
     scm_gc_unprotect_object (object_);
 }
 
-Protected_scm & 
+Protected_scm &
 Protected_scm::operator = (SCM s)
 {
   if (object_ == s)
     return *this;
-  
+
   if (SCM_NIMP (object_))
     scm_gc_unprotect_object (object_);
 
@@ -44,10 +54,10 @@ Protected_scm::operator = (SCM s)
   return *this;
 }
 
-Protected_scm&
+Protected_scm &
 Protected_scm::operator = (Protected_scm const &s)
 {
-  return operator= (s.object_);
+  return operator = (s.object_);
 }
 
 Protected_scm::operator SCM () const
@@ -55,7 +65,7 @@ Protected_scm::operator SCM () const
   return object_;
 }
 
-SCM 
+SCM
 Protected_scm::to_SCM () const
 {
   return object_;