Run grand replace for 2015.

[lilypond.git] / lily / include / protected-scm.hh

diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh
index f02ced787bda655c9d33d51238e0315f10e8c20f..03f61e318ec38fe8592d31b71c6b18d37c045bf1 100644 (file)
--- a/lily/include/protected-scm.hh
+++ b/lily/include/protected-scm.hh
@@ -1,20 +1,30 @@
-/*   
-  protected-scm.hh -- declare Protected_scm
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 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/>.
+*/
 
 #ifndef PROTECTED_SCM_HH
 #define PROTECTED_SCM_HH
 
-#include <guile/gh.h>
+#include "lily-guile.hh"
 
 /*
-  Mix GUILE GC with C++ ctors and dtors. 
- */
+  Mix GUILE GC with C++ ctors and dtors.
+*/
 class Protected_scm
 {
   SCM object_;
@@ -23,8 +33,9 @@ public:
   Protected_scm (SCM);
   Protected_scm (Protected_scm const &);
   ~Protected_scm ();
+  Protected_scm &operator = (SCM);
   Protected_scm &operator = (Protected_scm const &);
-  operator SCM ();
+  operator SCM () const;
   SCM to_SCM () const;
 };