diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-10-25 23:39:32 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-10-25 23:39:32 +0000 |
| commit | b1278dc6119d598020a9f8292ef861c99562fc7d (patch) | |
| tree | 4e0c8a4e41308a6eb940f3f77d57efaf235428ae /gobject | |
| parent | 900d0ed069fe09201d0c58813d1560b6845cef1d (diff) | |
Don't use implicit casts from void * since this will get included from C++
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.
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/ChangeLog | 6 | ||||
| -rw-r--r-- | gobject/gbsearcharray.h | 4 |
2 files changed, 8 insertions, 2 deletions
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; } |