Make C++ - compilable. Mostly remove pointer casting problems. Fix a few places where C++ is stricter than C.

(bzr r1954)

1 files changed, 3 insertions, 5 deletions

diff --git a/src/libcroco/cr-doc-handler.c b/src/libcroco/cr-doc-handler.c
index 2780b6a20..00357c0f0 100644
--- a/src/libcroco/cr-doc-handler.c
+++ b/src/libcroco/cr-doc-handler.c
@@ -65,15 +65,13 @@ struct _CRDocHandlerPriv {
 CRDocHandler *
 cr_doc_handler_new (void)
 {
-        CRDocHandler *result = NULL;
-
-        result = g_try_malloc (sizeof (CRDocHandler));
+        CRDocHandler *result = ( CRDocHandler *)g_try_malloc (sizeof (CRDocHandler));
 
         g_return_val_if_fail (result, NULL);
 
         memset (result, 0, sizeof (CRDocHandler));
 
-        result->priv = g_try_malloc (sizeof (CRDocHandlerPriv));
+        result->priv =  (CRDocHandlerPriv *)g_try_malloc (sizeof (CRDocHandlerPriv));
         if (!result->priv) {
                 cr_utils_trace_info ("Out of memory exception");
                 g_free (result);
@@ -248,5 +246,5 @@ cr_doc_handler_associate_a_parser (CRDocHandler *a_this,
 	g_return_if_fail (a_this && PRIVATE (a_this) 
 			  && a_parser) ;
 
-	PRIVATE (a_this)->parser = a_parser ;
+	PRIVATE (a_this)->parser = (CRParser *)a_parser ;
 }