*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 05722518d9c747c4c6dc61eb7c68a4a523b91d45..498b6dd2b3a7f57ab13bb3e9ca0944893b35be4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 21b731ea7b365b0dc6997a0f067ab6c62381d5dd..5f28885f6e10ba22de6d2f11d45098278945c067 100644 (file)
--- 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 424ac1afa2063ce3f8986693040a6f18d459769d..6c6e48306681713c4b5de49be6c08708808aa92b 100644 (file)
--- 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 bc57ee15e769c59d3b0888d7cb53427d908e2900..b72f186a0f56789e59ad5523fcfcd8e351072eb3 100644 (file)
--- 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;