From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 4 May 2006 11:15:12 +0000 (+0000)
Subject: GCC 4 fix.
X-Git-Tag: release/2.9.4~21
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b4242f976cf1245bfbbdf2b42dc4e98800dc40b5;p=lilypond.git

GCC 4 fix.
---

diff --git a/ChangeLog b/ChangeLog
index 872388ba4e..7b1564894c 100644
--- 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 91baa4421c..a475a9ef15 100644
--- 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;