Run `make grand-replace'.

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

diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh
index f02ced787bda655c9d33d51238e0315f10e8c20f..cb43afa7292a046d75d0cc3c2a6f0f8f98b32fa7 100644 (file)
--- a/lily/include/protected-scm.hh
+++ b/lily/include/protected-scm.hh
@@ -1,20 +1,19 @@
-/*   
+/*
   protected-scm.hh -- declare Protected_scm
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #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 +22,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;
 };