lilypond-0.1.7

diff --git a/lily/include/general-script-def.hh b/lily/include/general-script-def.hh
index acaa554019b557b17b01b7eeede3e99ec40d1d81..c384d4fa104be5ab64bfc9157737af2e9f180663 100644 (file)
--- 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 890ce377bc064b497978dfb752fa20f95a26b0a4..65898a0549a91f963f668b1163f755c508947391 100644 (file)
--- 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 371aeb44b8e26da5b797b2f45953cd3c922b996d..3f7d4332460d4caff2bf8e07c5797bb99941eeeb 100644 (file)
--- 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 5475ec8cf2369df2959d72d0b3613b3393d62aba..856879eed77ad451b58b4a09db8600b4c5f9f4e1 100644 (file)
--- 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