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

[lilypond.git] / lily / beaming-info.cc

diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc
index 50b94a6fb9d24b3e3aa7f56e6f43767a03cccc35..1165148b9415e729fc9ca56709c8a9d6d9d9d948 100644 (file)
--- a/lily/beaming-info.cc
+++ b/lily/beaming-info.cc
@@ -56,7 +56,7 @@ Beaming_info_list::beam_extend_count (Direction d) const
   Beaming_info thisbeam = infos_.boundary (d, 0);
   Beaming_info next = infos_.boundary (d, 1);
 
-  return thisbeam.beams_i_drul_[-d] <? next.beams_i_drul_[d];
+  return min (thisbeam.beams_i_drul_[-d], next.beams_i_drul_[d]);
 }
 
 void
@@ -80,8 +80,8 @@ Beaming_info_list::beamify (Moment &beat_length, bool subdivide)
   while (flip (&d) != LEFT);
 
   int middle_beams = (split ? 1
-                     : splits[RIGHT].beam_extend_count (LEFT) <?
-                     splits[LEFT].beam_extend_count (RIGHT));
+                     : min (splits[RIGHT].beam_extend_count (LEFT),
+                            splits[LEFT].beam_extend_count (RIGHT)));
 
   do
     {