[beast] SFI: compile sfiustore as C++ source

[Tim Janik <timj src gnome org>]

commit 2dcb04ae07c4b3d93cf998ffba324364fe46f3ae
Author: Tim Janik <timj gtk org>
Date:   Tue May 17 00:30:56 2011 +0200

    SFI: compile sfiustore as C++ source

 sfi/Makefile.am                   |    2 +-
 sfi/{sfiustore.c => sfiustore.cc} |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/sfi/Makefile.am b/sfi/Makefile.am
index 762bcd3..e956183 100644
--- a/sfi/Makefile.am
+++ b/sfi/Makefile.am
@@ -22,7 +22,7 @@ sfi_all_sources = $(strip \
 	glib-extra.c			sfiwrapper.cc	sfiprimitives.cc \
 	sfivmarshal.c	sfiglue.c	sfigluecodec.c	sfiglueproxy.c	\
 	sfinote.cc	sfiparams.cc			sfiserial.cc	\
-	sfitime.cc	sfitypes.cc	sfivalues.cc	sfiustore.c	\
+	sfitime.cc	sfitypes.cc	sfivalues.cc	sfiustore.cc	\
 	sficxx.cc	sfiring.cc	sfimemory.cc	sficomport.cc	\
 	$(conditional_toyprof_sources)	\
 )
diff --git a/sfi/sfiustore.c b/sfi/sfiustore.cc
similarity index 96%
rename from sfi/sfiustore.c
rename to sfi/sfiustore.cc
index 226cb48..645db86 100644
--- a/sfi/sfiustore.c
+++ b/sfi/sfiustore.cc
@@ -89,7 +89,7 @@ foreach_wrapper (gpointer key,
 		 gpointer value,
 		 gpointer data)
 {
-  FData *fdata = data;
+  FData *fdata = (FData*) data;
   /* iterate as long as SfiUStoreForeach() returns TRUE */
   return !fdata->foreach (fdata->data, (gulong) key, value);
 }
@@ -176,7 +176,7 @@ static gboolean
 upool_enlist (gpointer        data,
               gulong          unique_id)
 {
-  UPoolList *list = data;
+  UPoolList *list = (UPoolList*) data;
   guint i = list->n_ids++;
   if (list->n_ids > list->capacity)
     {
@@ -224,8 +224,8 @@ static gint
 ppool_cmp (gconstpointer a,
            gconstpointer b)
 {
-  const gchar *c1 = a;
-  const gchar *c2 = b;
+  const char *c1 = (const char*) a;
+  const char *c2 = (const char*) b;
   return c1 < c2 ? -1 : c1 != c2;
 }
 
@@ -269,7 +269,7 @@ ppool_foreach_wrapper (gpointer key,
                        gpointer value,
                        gpointer data)
 {
-  PPoolData *pdata = data;
+  PPoolData *pdata = (PPoolData*) data;
   /* iterate as long as SfiPPoolForeach() returns TRUE */
   return !pdata->foreach (pdata->data, key);
 }
@@ -291,7 +291,7 @@ ppool_foreach_slist (gpointer key,
                      gpointer value,
                      gpointer data)
 {
-  GSList **slist_p = data;
+  GSList **slist_p = (GSList**) data;
   *slist_p = g_slist_prepend (*slist_p, key);
   return FALSE; /* always continue */
 }