From: Owen Taylor <otaylor@redhat.com>
Date: Wed, 25 Oct 2000 23:39:32 +0000 (+0000)
Subject: Don't use implicit casts from void * since this will get included from C++
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=b1278dc6119d598020a9f8292ef861c99562fc7d;p=dana%2Fcg-glib.git

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 aadaac82..3b0cf168 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 1ee30fc5..244aa9fc 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 aadaac82..3b0cf168 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;
     }