X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fpqueue.hh;h=0b15f1fef93a039a246547b6d7d159293fc4bd9e;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=fa28ca011d574eec179824653de1368fabcdda97;hpb=62f221b6b3861ff055dc0384ec3c48cc665688cd;p=lilypond.git diff --git a/flower/include/pqueue.hh b/flower/include/pqueue.hh index fa28ca011d..0b15f1fef9 100644 --- a/flower/include/pqueue.hh +++ b/flower/include/pqueue.hh @@ -1,9 +1,20 @@ /* - pqueue.hh -- declare PQueue_ent and PQueue + This file is part of LilyPond, the GNU music typesetter. - source file of the Flower Library + Copyright (C) 1997--2014 Han-Wen Nienhuys - (c) 1997--2008 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #ifndef PQUEUE_HH @@ -78,14 +89,14 @@ public: vsize j = i / 2; while (j) { - if (compare (elt (j), v) > 0) - { - elt (i) = elt (j); - i = j; - j = i / 2; - } - else - break; + if (compare (elt (j), v) > 0) + { + elt (i) = elt (j); + i = j; + j = i / 2; + } + else + break; } elt (i) = v; OK (); @@ -106,13 +117,13 @@ public: while (mini < size ()) { - if (compare (elt (mini + 1), elt (mini)) < 0) - mini++; - if (compare (last, elt (mini)) < 0) - break; - elt (lasti) = elt (mini); - lasti = mini; - mini *= 2; + if (compare (elt (mini + 1), elt (mini)) < 0) + mini++; + if (compare (last, elt (mini)) < 0) + break; + elt (lasti) = elt (mini); + lasti = mini; + mini *= 2; } elt (lasti) = last; heap_array_.pop_back ();