GCC 4 fix.

diff --git a/ChangeLog b/ChangeLog
index 872388ba4e28adcf93c5692b31f2a3da623e8cfb..7b1564894c5d4f2ede982b5c9f55a414cadef144 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-04  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/include/constrained-breaking.hh: GCC 4 fix.
+
 2006-05-04  Joe Neeman  <joeneeman@gmail.com>
 
        * lily/simple-spacer.cc: Remove class Simple_spacer_wrapper.

diff --git a/lily/include/constrained-breaking.hh b/lily/include/constrained-breaking.hh
index 91baa4421c94141974f8248d46d3fa6d92c6deb2..a475a9ef15c0b8950616a06b96969bd11631a78c 100644 (file)
--- a/lily/include/constrained-breaking.hh
+++ b/lily/include/constrained-breaking.hh
@@ -20,7 +20,7 @@ enum Fordfor {
 
 struct Line_details {
   Real force_;
-  Real extent_;   /* Y-exent of the system */
+  Real extent_;   /* Y-extent of the system */
   Real padding_;  /* compulsory space after this system (if we're not last on a page) */
   Real space_;    /* spring length (stretches over extent_ but not over padding_) */
   Real inverse_hooke_;
@@ -32,7 +32,7 @@ struct Line_details {
   Real page_penalty_;
   Real turn_penalty_;
 
-  Line_details::Line_details ()
+  Line_details ()
   {
     force_ = infinity_f;
     extent_ = 0;