From 547e39d5455bfd8d280c3c1df4c47ef608f926af Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:53:21 +0000 Subject: [PATCH] lilypond-0.1.7 --- lily/include/general-script-def.hh | 2 +- lily/include/script-def.hh | 2 +- lily/include/text-def.hh | 3 +-- lily/script-def.cc | 12 ++++++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh index acaa554019..c384d4fa10 100644 --- a/lily/include/general-script-def.hh +++ b/lily/include/general-script-def.hh @@ -30,7 +30,7 @@ public: virtual ~General_script_def() {} protected: - virtual bool do_equal_b(General_script_def const &)const; + virtual bool do_equal_b(General_script_def const *)const; virtual void do_print()const; }; diff --git a/lily/include/script-def.hh b/lily/include/script-def.hh index 890ce377bc..65898a0549 100644 --- a/lily/include/script-def.hh +++ b/lily/include/script-def.hh @@ -37,7 +37,7 @@ public: virtual Atom get_atom(Paper_def* p, int dir_i_)const; DECLARE_MY_RUNTIME_TYPEINFO; - virtual bool do_equal_b(General_script_def const &)const; + virtual bool do_equal_b(General_script_def const *)const; virtual void do_print() const; Script_def(); void set_from_input(String, bool, int, int ,bool,int ); diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh index 371aeb44b8..3f7d433246 100644 --- a/lily/include/text-def.hh +++ b/lily/include/text-def.hh @@ -28,10 +28,9 @@ public: String text_str_; String style_str_; - /* *************** */ virtual void do_print() const; virtual ~Text_def() {}; - bool do_equal_b(const Text_def&)const; + virtual bool do_equal_b(const General_script_def*)const; Text_def(); virtual void print() const; Interval width(Paper_def*) const; diff --git a/lily/script-def.cc b/lily/script-def.cc index 5475ec8cf2..856879eed7 100644 --- a/lily/script-def.cc +++ b/lily/script-def.cc @@ -44,13 +44,13 @@ Script_def::do_print() const } bool -Script_def::do_equal_b(General_script_def const &g)const +Script_def::do_equal_b(General_script_def const *g)const { - Script_def const & c = (Script_def const&) g; - return (symidx_str_ == c.symidx_str_ && - rel_stem_dir_i_ == c.rel_stem_dir_i_&& - staff_dir_i_ == c.staff_dir_i_&& - invertsym_b_ == c.invertsym_b_); + Script_def const * c = (Script_def const*) g; + return (symidx_str_ == c->symidx_str_ && + rel_stem_dir_i_ == c->rel_stem_dir_i_&& + staff_dir_i_ == c->staff_dir_i_&& + invertsym_b_ == c->invertsym_b_); } int -- 2.39.5