From: fred Date: Tue, 26 Mar 2002 21:28:40 +0000 (+0000) Subject: lilypond-1.1.1 X-Git-Tag: release/1.5.59~2798 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c9653fe6a1a96a9b8875009f8cccc68d5584e15d;p=lilypond.git lilypond-1.1.1 --- diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 75bc165155..54147f74e1 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -35,6 +35,8 @@ it() GNU C++ version 2.7 or newer (2.8 and egcs are also fine). it() Python 1.5 (Strictly speaking, you shouldn't need Python for compiling and installing, but you'll need it to regenerate the font tables, e.g.). + +it() GUILE 1.3 (no, GUILE 1.2 won't work) ) sect(RUNNING) diff --git a/VERSION b/VERSION index ef23e353b8..deeabc172b 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=0 +PATCH_LEVEL=1 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/flower/include/array.hh b/flower/include/array.hh index c40e639817..c9c146e9f1 100644 --- a/flower/include/array.hh +++ b/flower/include/array.hh @@ -66,12 +66,23 @@ public: {setsize_} */ int size() const - { return size_; } + { + return size_; + } /// POST: size() == 0 - void clear() - { size_ = 0; } + void clear() + { + size_ = 0; + } + Array (T *tp, int n) + { + array_p_ = new T[n]; + max_ =size_ = n; + arrcpy (array_p_, tp, n); + } + Array() { array_p_ = 0; max_ =0; size_ =0; } diff --git a/lily/command-request.cc b/lily/command-request.cc index e407f30661..5a67560e45 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -33,8 +33,7 @@ bool Cadenza_req::do_equal_b (Request*r) const { Cadenza_req*cad = dynamic_cast (r); - - return cad->on_b_ == on_b_; + return cad && cad->on_b_ == on_b_; } Cadenza_req::Cadenza_req (bool b) @@ -48,7 +47,7 @@ bool Bar_req::do_equal_b (Request*r) const { Bar_req * b = dynamic_cast (r); - return type_str_ == b->type_str_; + return b && type_str_ == b->type_str_; } @@ -83,7 +82,7 @@ Partial_measure_req::do_equal_b (Request* r) const { Partial_measure_req *p = dynamic_cast (r); - return p->duration_ == duration_; + return p&& p->duration_ == duration_; } @@ -104,9 +103,10 @@ void Barcheck_req::do_print() const{} bool -Barcheck_req::do_equal_b (Request*) const +Barcheck_req::do_equal_b (Request*r) const { - return true; + Barcheck_req *b = dynamic_cast (r); + return r; } @@ -152,7 +152,7 @@ Time_signature_change_req::do_equal_b (Request * r) const { Time_signature_change_req * m = dynamic_cast (r); - return m->beats_i_ == beats_i_ + return m && m->beats_i_ == beats_i_ && one_beat_i_ == m->one_beat_i_; } @@ -181,7 +181,7 @@ Tempo_req::do_equal_b (Request *r) const { Tempo_req *t = dynamic_cast (r); - return t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_; + return t&& t->dur_.length()== dur_.length () && metronome_i_ == t->metronome_i_; }