* lily/tie.cc (get_configuration): Replace fabs -> abs for integer

	arguments. Fixes compilation error with gcc 3.3.

diff --git a/ChangeLog b/ChangeLog
index 8c18998397fe86c73e181938f28b68203080293b..8e2f4bb5afd9cc74b033fa2ac0caad404facce76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-15  Mats Bengtsson  <mabe@drongo.s3.kth.se>
+
+       * lily/tie.cc (get_configuration): Replace fabs -> abs for integer
+       arguments. Fixes compilation error with gcc 3.3.
+
 2005-09-13  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * stepmake/stepmake/python-module-rules.make

diff --git a/lily/tie.cc b/lily/tie.cc
index 236845405a5bfa508980857877c19d920abef327..ee2af5fb0b2e7816f8b92c05503ec901e300ff8a 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -325,7 +325,7 @@ Tie::get_configuration (Grob *me_grob, Grob *common,
    */
   if (conf->position_ == conf->head_position_
       && in_space
-      && Staff_symbol_referencer::staff_radius (me) > fabs (conf->position_) / 2
+      && Staff_symbol_referencer::staff_radius (me) > abs (conf->position_) / 2
       && dy > 0.3 * staff_space)
     {
       conf->position_ += 2 * conf->dir_; 
@@ -333,13 +333,13 @@ Tie::get_configuration (Grob *me_grob, Grob *common,
 
   if (!in_between
       && in_space
-      && fabs (conf->position_ - conf->head_position_) <= 1)
+      && abs (conf->position_ - conf->head_position_) <= 1)
     conf->position_ += 2*conf->dir_;
   
   
   if (in_space)
     {
-      if ((fabs (conf->position_ - conf->head_position_) <= 1
+      if ((abs (conf->position_ - conf->head_position_) <= 1
           && fabs (dy) < 0.45 * staff_space)
          || fabs (dy) < 0.6 * staff_space)
        {
@@ -366,7 +366,7 @@ Tie::get_configuration (Grob *me_grob, Grob *common,
                 + conf->delta_y_) <
          conf->dir_ * conf->head_position_ * 0.5 * staff_space)
        {
-         if (Staff_symbol_referencer::staff_radius (me) >  fabs (conf->head_position_) / 2)
+         if (Staff_symbol_referencer::staff_radius (me) >  abs (conf->head_position_) / 2)
            conf->position_ +=  2 * conf->dir_;
          else
            conf->position_ += conf->dir_;