release: 1.5.19

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

diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh
index f02ced787bda655c9d33d51238e0315f10e8c20f..7a13b24b1fd485037d67850950953838f3149c0a 100644 (file)
--- a/lily/include/protected-scm.hh
+++ b/lily/include/protected-scm.hh
@@ -3,14 +3,15 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2001 Han-Wen Nienhuys <hanwen@cs.uu.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. 
@@ -23,8 +24,9 @@ public:
   Protected_scm (SCM);
   Protected_scm (Protected_scm const &);
   ~Protected_scm ();
-  Protected_scm &operator = (Protected_scm const &);
-  operator SCM ();
+  Protected_scm &operator = (SCM);
+  Protected_scm &operator = ( Protected_scm const&);
+  operator SCM () const;
   SCM to_SCM () const;
 };