g_steal_pointer: make it C++ clean

We have a test that #includes our headers from a C++ program to make
sure we don't throw any errors or warnings as a result of that.

The new inline implementation of g_steal_pointer() does an implicit
conversion from (void *), which is not valid in C++.

Add a cast to avoid the problem.

Thanks to Ignacio Casal Quinteiro for the report.

diff --git a/glib/gmem.h b/glib/gmem.h
index 82507b5..8358f86 100644 (file)
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -183,7 +183,7 @@ gpointer g_try_realloc_n  (gpointer  mem,
 static inline gpointer
 (g_steal_pointer) (gpointer pp)
 {
-  gpointer *ptr = pp;
+  gpointer *ptr = (gpointer *) pp;
   gpointer ref;
 
   ref = *ptr;