From d368bd858f56f7f7ef19dc12e8f967f63abece3a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:15:02 +0000 Subject: [PATCH] lilypond-1.1.1 --- flower/axis.cc | 2 +- lily/include/type-swallow-trans.hh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flower/axis.cc b/flower/axis.cc index 73b8a8ec1a..ab80403e02 100644 --- 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 */ diff --git a/lily/include/type-swallow-trans.hh b/lily/include/type-swallow-trans.hh index 53eb7ea04a..27bac3d661 100644 --- 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);\ -- 2.39.5