* flower/*.cc: remove <? and >?

[lilypond.git] / lily / note-spacing.cc

diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc
index 9e34006967f78a9429317ade4ebd8ada16f0803f..82640d4d626c9db8841537815756c68498fe9263 100644 (file)
--- a/lily/note-spacing.cc
+++ b/lily/note-spacing.cc
@@ -317,7 +317,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
              Real chord_start = hp[sd];
              Real stem_end = Stem::stem_end_position (stem);
 
-             stem_posns[d] = Interval (chord_start <? stem_end, chord_start>? stem_end);
+             stem_posns[d] = Interval (min (chord_start, stem_end), max (chord_start,  stem_end));
              head_posns[d].unite (hp);
            }
        }
@@ -383,7 +383,7 @@ Note_spacing::stem_dir_correction (Grob *me, Item *rcolumn,
              /*
                Ugh. 7 is hardcoded.
              */
-             correction = (correction / 7) <? 1.0;
+             correction = min (correction / 7, 1.0);
              correction *= stem_dirs[LEFT];
              correction
                *= robust_scm2double (me->get_property ("stem-spacing-correction"), 0);