(outside_slur_callback): Use int in for loop;

avoids g++-3.4.0 bug.

diff --git a/ChangeLog b/ChangeLog
index 925cb60a787a3d9643712431c46c480815de7db1..505bcd1112307a617516df785a738141c6a52817 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-15  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/slur.cc (outside_slur_callback): Use int in for loop;
+       avoids g++-3.4.0 bug.
+
 2004-10-13  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/examples.itely: added lilypond-book template.

diff --git a/cygwin/mknetrel.cross b/cygwin/mknetrel.cross
index c22a48b094df6d49dfd29064d0039578be71c94c..ba673cb18e287f58b45b3da0a213f17cc8fdf860 100644 (file)
--- a/cygwin/mknetrel.cross
+++ b/cygwin/mknetrel.cross
@@ -52,6 +52,11 @@ ac_cv_exeext=\${ac_cv_exeext=}
 #    sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
 lt_cv_dlopen=\${lt_cv_dlopen="dlopen"}
 lt_cv_dlopen_libs=\${lt_cv_dlopen_libs="none required"}
+## -- will this work?
+##libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"/lib /usr/lib"'"}
+libltdl_cv_sys_search_path=\${libltdl_cv_sys_search_path="'"$cygwin_prefix/lib"'"}
+lt_cv_sys_max_cmd_len=${lt_cv_sys_max_cmd_len=8192}
+##ac_cv_header_strings_h=${ac_cv_header_strings_h=yes}
 ac_cv_lib_dld_shl_load=\${ac_cv_lib_dld_shl_load=no}
 ac_cv_lib_dl_dlopen=\${ac_cv_lib_dl_dlopen=no}
 EOF

diff --git a/lily/slur.cc b/lily/slur.cc
index 15ebe93eac582efcdd7a21286080593035ea96f8..cde26695784ce002592e4a4630ece622ab41c044 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -165,21 +165,21 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
   int k = 0;
   bool do_shift = false;
 
-  for (Direction d = LEFT ;  d <= RIGHT; d = Direction (d + 1))
+  for (int d = LEFT; d <= RIGHT; d++)
     {
-      Real x = xext.linear_combination (d);
+      Real x = xext.linear_combination ((Direction) d);
       consider[k] = bezext.contains (x);
 
       if (consider[k])
        {
-         ys[k] =
-           (fabs(bezext[LEFT] - x) < EPS)
+         ys[k]
+           = (fabs(bezext[LEFT] - x) < EPS)
            ? curve.control_[0][Y_AXIS]
            : ((fabs(bezext[RIGHT] - x) < EPS)
               ? curve.control_[3][Y_AXIS]
               : curve.get_other_coordinate (X_AXIS, x));
          consider[k] = true;
-
+         
          if (yext.contains (ys[k]))
            do_shift = true;
        }
@@ -189,11 +189,10 @@ Slur::outside_slur_callback (SCM grob, SCM axis)
     {
       k = 0;
       Direction dir = get_grob_direction (script);
-      for (Direction d = LEFT ;  d <= RIGHT; d = Direction (d + 1))
+      for (int d = LEFT; d <= RIGHT; d++)
        {
-         offset = 
-           dir * (dir * offset >? dir * (ys[k]
-                                         - yext[-dir] + dir * slur_padding));
+         offset = dir * (dir * offset >? dir
+                         * (ys[k] - yext[-dir] + dir * slur_padding));
          k++;
        }
     }