ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.308 by root, Sun Jul 19 20:39:54 2009 UTC vs.
Revision 1.310 by root, Sun Jul 26 04:43:03 2009 UTC

1057 1057
1058 for (;;) 1058 for (;;)
1059 { 1059 {
1060 int c = k << 1; 1060 int c = k << 1;
1061 1061
1062 if (c > N + HEAP0 - 1) 1062 if (c >= N + HEAP0)
1063 break; 1063 break;
1064 1064
1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1]) 1065 c += c + 1 < N + HEAP0 && ANHE_at (heap [c]) > ANHE_at (heap [c + 1])
1066 ? 1 : 0; 1066 ? 1 : 0;
1067 1067
1103 1103
1104/* move an element suitably so it is in a correct place */ 1104/* move an element suitably so it is in a correct place */
1105inline_size void 1105inline_size void
1106adjustheap (ANHE *heap, int N, int k) 1106adjustheap (ANHE *heap, int N, int k)
1107{ 1107{
1108 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 1108 if (k > HEAP0 && ANHE_at (heap [k]) <= ANHE_at (heap [HPARENT (k)]))
1109 upheap (heap, k); 1109 upheap (heap, k);
1110 else 1110 else
1111 downheap (heap, N, k); 1111 downheap (heap, N, k);
1112} 1112}
1113 1113

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines