X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Frange-set.h;h=9e665e994efae8d079cc0166129568779c9bdfb2;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=941692b40029098ea8224ea4d0a4f0e1b9026385;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git diff --git a/src/libpspp/range-set.h b/src/libpspp/range-set.h index 941692b4..9e665e99 100644 --- a/src/libpspp/range-set.h +++ b/src/libpspp/range-set.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + 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 @@ -25,7 +25,8 @@ #define LIBPSPP_RANGE_SET_H #include -#include +#include "libpspp/bt.h" +#include "libpspp/cast.h" /* A set of ranges. */ struct range_set @@ -122,7 +123,7 @@ static inline const struct range_set_node * range_set_next (const struct range_set *rs, const struct range_set_node *node) { return (node != NULL - ? range_set_next__ (rs, (struct range_set_node *) node) + ? range_set_next__ (rs, CONST_CAST (struct range_set_node *, node)) : range_set_first__ (rs)); } @@ -147,7 +148,7 @@ static inline const struct range_set_node * range_set_prev (const struct range_set *rs, const struct range_set_node *node) { return (node != NULL - ? range_set_prev__ (rs, (struct range_set_node *) node) + ? range_set_prev__ (rs, CONST_CAST (struct range_set_node *, node)) : range_set_last__ (rs)); }