diff options
| -rw-r--r-- | glib/gbsearcharray.h | 4 | ||||
| -rw-r--r-- | gobject/ChangeLog | 6 | ||||
| -rw-r--r-- | gobject/gbsearcharray.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h index aadaac828..3b0cf1682 100644 --- a/glib/gbsearcharray.h +++ b/glib/gbsearcharray.h @@ -82,7 +82,7 @@ g_bsearch_array_lookup (GBSearchArray *barray, GBSearchCompareFunc cmp_func = barray->cmp_func; gint sizeof_node = barray->sizeof_node; guint n_nodes = barray->n_nodes; - guint8 *nodes = barray->nodes; + guint8 *nodes = (guint8 *) barray->nodes; nodes -= sizeof_node; do @@ -115,7 +115,7 @@ g_bsearch_array_get_nth (GBSearchArray *barray, { if (n < barray->n_nodes) { - guint8 *nodes = barray->nodes; + guint8 *nodes = (guint8 *) barray->nodes; return nodes + n * barray->sizeof_node; } diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 1ee30fc56..244aa9fc2 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,9 @@ +Wed Oct 25 19:11:03 2000 Owen Taylor <otaylor@redhat.com> + + * gbsearcharray.h (g_bsearch_array_get_nth): Don't use implicit + casts from void * since this will get included from C++ too + at times. + Thu Oct 26 00:30:27 2000 Tim Janik <timj@gtk.org> * gvaluetypes.[hc]: added g_value_set_static_string(). diff --git a/gobject/gbsearcharray.h b/gobject/gbsearcharray.h index aadaac828..3b0cf1682 100644 --- a/gobject/gbsearcharray.h +++ b/gobject/gbsearcharray.h @@ -82,7 +82,7 @@ g_bsearch_array_lookup (GBSearchArray *barray, GBSearchCompareFunc cmp_func = barray->cmp_func; gint sizeof_node = barray->sizeof_node; guint n_nodes = barray->n_nodes; - guint8 *nodes = barray->nodes; + guint8 *nodes = (guint8 *) barray->nodes; nodes -= sizeof_node; do @@ -115,7 +115,7 @@ g_bsearch_array_get_nth (GBSearchArray *barray, { if (n < barray->n_nodes) { - guint8 *nodes = barray->nodes; + guint8 *nodes = (guint8 *) barray->nodes; return nodes + n * barray->sizeof_node; } |