inserted casts for C++.

Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>

        * glib/gbsearcharray.h: inserted casts for C++.

diff --git a/ChangeLog b/ChangeLog
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5f70f6c5b7e486d87cdbb43a0cc40266e09f2338..0dd6877deceacb6a45ddf017ecf281727dd0cf92 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Mon Sep  8 00:31:10 2003  Stefan Westerfeld  <stefan@space.twc.de>
+
+        * glib/gbsearcharray.h: inserted casts for C++.
+
 2003-08-28  Matthias Clasen  <maclas@gmx.de>
 
        * tests/patterntest.c (verbose): Fix a C99ism.  (#120821, Thomas 

diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
index 858a4a4a4a3dd238fdbb4441d50cea08d43f3f01..4fb1b1574765ea64643ceabc62858f2f3e8bc83c 100644 (file)
--- a/glib/gbsearcharray.h
+++ b/glib/gbsearcharray.h
@@ -133,7 +133,7 @@ g_bsearch_array_create (const GBSearchConfig *bconfig)
   size = sizeof (GBSearchArray) + bconfig->sizeof_node;
   if (bconfig->flags & G_BSEARCH_ARRAY_ALIGN_POWER2)
     size = G_BSEARCH_UPPER_POWER2 (size);
-  barray = g_realloc (NULL, size);
+  barray = (GBSearchArray *) g_realloc (NULL, size);
   memset (barray, 0, sizeof (GBSearchArray));
 
   return barray;
@@ -210,10 +210,10 @@ g_bsearch_array_grow (GBSearchArray        *barray,
       new_size = G_BSEARCH_UPPER_POWER2 (sizeof (GBSearchArray) + new_size);
       old_size = G_BSEARCH_UPPER_POWER2 (sizeof (GBSearchArray) + old_size);
       if (old_size != new_size)
-        barray = g_realloc (barray, new_size);
+        barray = (GBSearchArray *) g_realloc (barray, new_size);
     }
   else
-    barray = g_realloc (barray, sizeof (GBSearchArray) + new_size);
+    barray = (GBSearchArray *) g_realloc (barray, sizeof (GBSearchArray) + new_size);
   node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node;
   g_memmove (node + bconfig->sizeof_node, node, (barray->n_nodes - index) * bconfig->sizeof_node);
   barray->n_nodes += 1;
@@ -233,7 +233,7 @@ g_bsearch_array_insert (GBSearchArray        *barray,
     }
   else
     {
-      node = g_bsearch_array_lookup_insertion (barray, bconfig, key_node);
+      node = (guint8 *) g_bsearch_array_lookup_insertion (barray, bconfig, key_node);
       if (G_LIKELY (node))
         {
           guint index = g_bsearch_array_get_index (barray, bconfig, node);
@@ -253,7 +253,7 @@ g_bsearch_array_replace (GBSearchArray        *barray,
                          const GBSearchConfig *bconfig,
                          gconstpointer         key_node)
 {
-  guint8 *node = g_bsearch_array_lookup (barray, bconfig, key_node);
+  guint8 *node = (guint8 *) g_bsearch_array_lookup (barray, bconfig, key_node);
   if (G_LIKELY (node))  /* expected path */
     memcpy (node, key_node, bconfig->sizeof_node);
   else                  /* revert to insertion */
@@ -282,10 +282,10 @@ g_bsearch_array_remove (GBSearchArray        *barray,
           new_size = G_BSEARCH_UPPER_POWER2 (sizeof (GBSearchArray) + new_size);
           old_size = G_BSEARCH_UPPER_POWER2 (sizeof (GBSearchArray) + old_size);
           if (old_size != new_size)
-            barray = g_realloc (barray, new_size);
+            barray = (GBSearchArray *) g_realloc (barray, new_size);
         }
       else
-        barray = g_realloc (barray, sizeof (GBSearchArray) + new_size);
+        barray = (GBSearchArray *) g_realloc (barray, sizeof (GBSearchArray) + new_size);
     }
   return barray;
 }