/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
}
void OK () const
{
-#ifndef NDEBUG
+#ifdef DEBUG
for (vsize i = 2; i <= size (); i++)
assert (compare (elt (i / 2), elt (i)) <= 0);
#endif
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 ();
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 ();