lilypond-1.1.1

diff --git a/flower/axis.cc b/flower/axis.cc
index 73b8a8ec1a735af8bd147e633f2de9ce56088606..ab80403e025c403c65e59af5e382e5311cc3fe27 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -1,7 +1,7 @@
 /*
   axis.cc -- implement Axis
 
-  source file of the GNU LilyPond music typesetter
+
 
   (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */

diff --git a/lily/include/type-swallow-trans.hh b/lily/include/type-swallow-trans.hh
index 53eb7ea04ab6d6cd9240e55101b6c69c6692a883..27bac3d661e49e96302cb27088d6367bc2373bf4 100644 (file)
--- a/lily/include/type-swallow-trans.hh
+++ b/lily/include/type-swallow-trans.hh
@@ -11,11 +11,12 @@
 #define TYPESWALLOW_GRAV_HH
 
 #include "translator.hh"
+
 /// eat a certain type of request
 class Type_swallow_translator : public virtual Translator
 {
 protected:
-  const char * type_;
+  const type_info * type_;
   bool do_try_request (Request*);
 public:
   DECLARE_MY_RUNTIME_TYPEINFO;
@@ -26,7 +27,7 @@ public:
 #define DECLARE_REQUEST_SWALLOWER(TYPE)  \
 struct TYPE ## _swallow_translator : public Type_swallow_translator {\
   TYPE ## _swallow_translator() { \
-    type_ = TYPE::static_name ();\
+    type_ = &typeid (TYPE);\
   }\
   DECLARE_MY_RUNTIME_TYPEINFO;\
   TRANSLATOR_CLONE(TYPE ## _swallow_translator);\