diff options
| author | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-01-18 13:41:06 +0000 |
|---|---|---|
| committer | Han-Wen Nienhuys <hanwen@xs4all.nl> | 2006-01-18 13:41:06 +0000 |
| commit | 3b7eb398f096a9291de36d7f8716c3cf43614a7f (patch) | |
| tree | 5bf9327461e425e7ee69959cd6400f7fe8367cc6 | |
| parent | bf499a5f36b9da3fc42ee51e2e3bf4430c5a2d27 (diff) | |
*** empty log message ***
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lily/include/accidental-interface.hh | 2 | ||||
| -rw-r--r-- | lily/include/side-position-interface.hh | 2 | ||||
| -rw-r--r-- | lily/include/slur-scoring.hh | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2006-01-18 Han-Wen Nienhuys <hanwen@xs4all.nl> + + * lily/include/*.hh: GCC 4.1 fixes. + 006-01-16 Erlend Aasland <erlenda@gmail.com> * Documentation/user/global.itely: fix typos; @bugs -> @refbugs diff --git a/lily/include/accidental-interface.hh b/lily/include/accidental-interface.hh index 21b731ea7b..5f28885f6e 100644 --- a/lily/include/accidental-interface.hh +++ b/lily/include/accidental-interface.hh @@ -21,7 +21,7 @@ public: static bool has_interface (Grob *); static String get_fontcharname (String style, int alteration); - static Array<Box> Accidental_interface::accurate_boxes (Grob *me, + static Array<Box> accurate_boxes (Grob *me, Grob **common); }; diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index 424ac1afa2..6c6e483066 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -25,7 +25,7 @@ public: DECLARE_SCHEME_CALLBACK (x_aligned_side, (SCM element)); DECLARE_SCHEME_CALLBACK (y_aligned_side, (SCM element)); - static SCM Side_position_interface::aligned_side (Grob*me, Axis a); + static SCM aligned_side (Grob*me, Axis a); static SCM general_side_position (Grob *, Axis, bool); static Axis get_axis (Grob *); diff --git a/lily/include/slur-scoring.hh b/lily/include/slur-scoring.hh index bc57ee15e7..b72f186a0f 100644 --- a/lily/include/slur-scoring.hh +++ b/lily/include/slur-scoring.hh @@ -123,7 +123,7 @@ struct Slur_score_state void fill (Grob *); void set_next_direction (); - Array<Offset> Slur_score_state::generate_avoid_offsets () const; + Array<Offset> generate_avoid_offsets () const; Drul_array<Bound_info> get_bound_info () const; void generate_curves () const; Link_array<Slur_configuration> enumerate_attachments (Drul_array<Real> end_ys) const; |