Run grand replace for 2015.

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

diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc
index ada90c488a03f334097d12f7b3561b5acf77f6b8..c0235496f4ee73aa3f5cbbdbe7ba69004331fa5b 100644 (file)
--- a/lily/protected-scm.cc
+++ b/lily/protected-scm.cc
@@ -1,11 +1,21 @@
-/*   
-  protected-scm.cc --  implement Protected_scm
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  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"
 
@@ -16,13 +26,13 @@ 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)
 {
   object_ = (SCM_NIMP (s.object_) ? scm_gc_protect_object (s.object_)
-            : s.object_);
+             : s.object_);
 }
 
 Protected_scm::~Protected_scm ()
@@ -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,7 +54,7 @@ Protected_scm::operator = (SCM s)
   return *this;
 }
 
-Protected_scm&
+Protected_scm &
 Protected_scm::operator = (Protected_scm const &s)
 {
   return operator = (s.object_);
@@ -55,7 +65,7 @@ Protected_scm::operator SCM () const
   return object_;
 }
 
-SCM 
+SCM
 Protected_scm::to_SCM () const
 {
   return object_;