luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use implicit casts from void * since this will get included from C++

Browse Source 
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.
This commit is contained in:
Owen Taylor 2000-10-25 23:39:32 +00:00 committed by Owen Taylor
parent 900d0ed069
commit b1278dc611
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gbsearcharray.h
View File

@ -82,7 +82,7 @@ g_bsearch_array_lookup (GBSearchArray *barray,
GBSearchCompareFunc cmp_func = barray->cmp_func; GBSearchCompareFunc cmp_func = barray->cmp_func;
gint sizeof_node = barray->sizeof_node; gint sizeof_node = barray->sizeof_node;
guint n_nodes = barray->n_nodes; guint n_nodes = barray->n_nodes;
guint8 *nodes = barray->nodes; guint8 *nodes = (guint8 *) barray->nodes;
nodes -= sizeof_node; nodes -= sizeof_node;
do do
@ -115,7 +115,7 @@ g_bsearch_array_get_nth (GBSearchArray *barray,
{ {
if (n < barray->n_nodes) if (n < barray->n_nodes)
{ {
guint8 *nodes = barray->nodes; guint8 *nodes = (guint8 *) barray->nodes;
return nodes + n * barray->sizeof_node; return nodes + n * barray->sizeof_node;
} }

6
gobject/ChangeLog
View File

@ -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> Thu Oct 26 00:30:27 2000 Tim Janik <timj@gtk.org>
* gvaluetypes.[hc]: added g_value_set_static_string(). * gvaluetypes.[hc]: added g_value_set_static_string().

4
gobject/gbsearcharray.h
View File

@ -82,7 +82,7 @@ g_bsearch_array_lookup (GBSearchArray *barray,
GBSearchCompareFunc cmp_func = barray->cmp_func; GBSearchCompareFunc cmp_func = barray->cmp_func;
gint sizeof_node = barray->sizeof_node; gint sizeof_node = barray->sizeof_node;
guint n_nodes = barray->n_nodes; guint n_nodes = barray->n_nodes;
guint8 *nodes = barray->nodes; guint8 *nodes = (guint8 *) barray->nodes;
nodes -= sizeof_node; nodes -= sizeof_node;
do do
@ -115,7 +115,7 @@ g_bsearch_array_get_nth (GBSearchArray *barray,
{ {
if (n < barray->n_nodes) if (n < barray->n_nodes)
{ {
guint8 *nodes = barray->nodes; guint8 *nodes = (guint8 *) barray->nodes;
return nodes + n * barray->sizeof_node; return nodes + n * barray->sizeof_node;
} }