chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More event_*
[disorder]
/
lib
/
heap.h
diff --git
a/lib/heap.h
b/lib/heap.h
index ebd2f60b2468f182e3878c05eaf3b3155dbb9c8b..c6504efedba2af5e1e501eca0c9048832aec6d18 100644
(file)
--- a/
lib/heap.h
+++ b/
lib/heap.h
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007
, 2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-22,6
+22,8
@@
#ifndef HEAP_H
#define HEAP_H
#ifndef HEAP_H
#define HEAP_H
+#include "vector.h"
+
/** @brief Binary heap template.
* @param NAME name of type to define
* @param ETYPE element type
/** @brief Binary heap template.
* @param NAME name of type to define
* @param ETYPE element type
@@
-85,7
+87,7
@@
} \
\
static inline NAME##_element NAME##_first(struct NAME *heap) { \
} \
\
static inline NAME##_element NAME##_first(struct NAME *heap) { \
- assert(heap->nvec > 0
);
\
+ assert(heap->nvec > 0
&& "_first");
\
return heap->vec[0]; \
} \
\
return heap->vec[0]; \
} \
\
@@
-116,7
+118,7
@@
int n = 0; \
NAME##_element r; \
\
int n = 0; \
NAME##_element r; \
\
- assert(heap->nvec > 0
);
\
+ assert(heap->nvec > 0
&& "_remove");
\
r = heap->vec[0]; \
heap->vec[0] = heap->vec[--heap->nvec]; \
while(2 * n + 1 < heap->nvec) { \
r = heap->vec[0]; \
heap->vec[0] = heap->vec[--heap->nvec]; \
while(2 * n + 1 < heap->nvec) { \