X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fheap.h;h=c24c763277d53fde92c03f3e8360fc90e509f61d;hb=refs%2Fbuilds%2F20130812030507%2Fpspp;hp=70401c9c456bf91955617224057836a33b393209;hpb=756e3feab0a2dab6be0a96164079fce2a2d8f9b4;p=pspp
diff --git a/src/libpspp/heap.h b/src/libpspp/heap.h
index 70401c9c45..c24c763277 100644
--- a/src/libpspp/heap.h
+++ b/src/libpspp/heap.h
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2007 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
- 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program 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.
+ This program 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 this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
/* Embedded priority queue, implemented as a heap.
@@ -59,7 +57,7 @@
heap and delete it:
struct heap *h = ...;
- if (!heap_is_empty (h))
+ if (!heap_is_empty (h))
{
struct foo *foo = heap_data (heap_minimum (h), struct foo, node);
printf ("Minimum is %d.\n", foo->x);
@@ -72,6 +70,7 @@
#ifndef LIBPSPP_HEAP_H
#define LIBPSPP_HEAP_H 1
+#include "libpspp/cast.h"
#include
#include
@@ -80,8 +79,9 @@ struct pool;
/* Returns the data structure corresponding to the given heap
NODE, assuming that NODE is embedded as the given MEMBER name
in data type STRUCT. */
-#define heap_data(NODE, STRUCT, MEMBER) \
- ((STRUCT *) ((char *) (NODE) - offsetof (STRUCT, MEMBER)))
+#define heap_data(NODE, STRUCT, MEMBER) \
+ (CHECK_POINTER_HAS_TYPE (NODE, struct heap_node *), \
+ UP_CAST (NODE, STRUCT, MEMBER))
/* A node in a heap. Opaque.
One of these structures must be embedded in your heap node. */