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.

diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
index aadaac82885ebb1891a770599b0b2b44ebacc920..3b0cf168299d28e29d11d5bcc725cf81b631f435 100644 (file)
--- 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 1ee30fc56a25221b01bed04e37bc72f142d0cec3..244aa9fc22256b2384b0f5a496ba0b70bf605d52 100644 (file)
--- 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 aadaac82885ebb1891a770599b0b2b44ebacc920..3b0cf168299d28e29d11d5bcc725cf81b631f435 100644 (file)
--- 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;
     }