Cast away const from GstMetaInfo in *_get_meta_info() functions

MSVC warns about the const in the implicit argument conversion in the
calls to g_once_init_{enter,leave}. It's OK so explicitly cast it.

https://bugzilla.gnome.org/show_bug.cgi?id=774293

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 14a8825a8800ec732ec0a332e0464f91f9c76982..84e1e536c97830401738566a2755ef2f2cf0b3be 100644 (file)
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -2481,7 +2481,7 @@ gst_parent_buffer_meta_get_info (void)
 {
   static const GstMetaInfo *meta_info = NULL;
 
-  if (g_once_init_enter (&meta_info)) {
+  if (g_once_init_enter ((GstMetaInfo **) & meta_info)) {
     const GstMetaInfo *meta =
         gst_meta_register (gst_parent_buffer_meta_api_get_type (),
         "GstParentBufferMeta",
@@ -2489,7 +2489,7 @@ gst_parent_buffer_meta_get_info (void)
         (GstMetaInitFunction) _gst_parent_buffer_meta_init,
         (GstMetaFreeFunction) _gst_parent_buffer_meta_free,
         _gst_parent_buffer_meta_transform);
-    g_once_init_leave (&meta_info, meta);
+    g_once_init_leave ((GstMetaInfo **) & meta_info, (GstMetaInfo *) meta);
   }
 
   return meta_info;

diff --git a/gst/gstprotection.c b/gst/gstprotection.c
index 8ee52eabea0da38fbc1805f40dbbca3487e95f3f..01b17a5d91cf165561e39fc74d4959e596a17d87 100644 (file)
--- a/gst/gstprotection.c
+++ b/gst/gstprotection.c
@@ -111,13 +111,14 @@ gst_protection_meta_get_info (void)
 {
   static const GstMetaInfo *protection_meta_info = NULL;
 
-  if (g_once_init_enter (&protection_meta_info)) {
+  if (g_once_init_enter ((GstMetaInfo **) & protection_meta_info)) {
     const GstMetaInfo *meta =
         gst_meta_register (GST_PROTECTION_META_API_TYPE, "GstProtectionMeta",
         sizeof (GstProtectionMeta), gst_protection_meta_init,
         gst_protection_meta_free, gst_protection_meta_transform);
 
-    g_once_init_leave (&protection_meta_info, meta);
+    g_once_init_leave ((GstMetaInfo **) & protection_meta_info,
+        (GstMetaInfo *) meta);
   }
   return protection_meta_info;
 }

diff --git a/libs/gst/net/gstnetaddressmeta.c b/libs/gst/net/gstnetaddressmeta.c
index e54d0c8582c30261efdb9b080e4c8cfa54dfae5f..ae10071eaec7a9306f6d06b34375bc6c57daa8b6 100644 (file)
--- a/libs/gst/net/gstnetaddressmeta.c
+++ b/libs/gst/net/gstnetaddressmeta.c
@@ -83,13 +83,13 @@ gst_net_address_meta_get_info (void)
 {
   static const GstMetaInfo *meta_info = NULL;
 
-  if (g_once_init_enter (&meta_info)) {
+  if (g_once_init_enter ((GstMetaInfo **) & meta_info)) {
     const GstMetaInfo *mi = gst_meta_register (GST_NET_ADDRESS_META_API_TYPE,
         "GstNetAddressMeta",
         sizeof (GstNetAddressMeta),
         net_address_meta_init,
         net_address_meta_free, net_address_meta_transform);
-    g_once_init_leave (&meta_info, mi);
+    g_once_init_leave ((GstMetaInfo **) & meta_info, (GstMetaInfo *) mi);
   }
   return meta_info;
 }

diff --git a/libs/gst/net/gstnetcontrolmessagemeta.c b/libs/gst/net/gstnetcontrolmessagemeta.c
index ff9b8084add2b70eb332b5691c80bedd634a5a6f..d5b0c533a7773c3fcbf84f18a7c098bdc12ca654 100644 (file)
--- a/libs/gst/net/gstnetcontrolmessagemeta.c
+++ b/libs/gst/net/gstnetcontrolmessagemeta.c
@@ -87,7 +87,7 @@ gst_net_control_message_meta_get_info (void)
 {
   static const GstMetaInfo *meta_info = NULL;
 
-  if (g_once_init_enter (&meta_info)) {
+  if (g_once_init_enter ((GstMetaInfo **) & meta_info)) {
     const GstMetaInfo *mi =
         gst_meta_register (GST_NET_CONTROL_MESSAGE_META_API_TYPE,
         "GstNetControlMessageMeta",
@@ -95,7 +95,7 @@ gst_net_control_message_meta_get_info (void)
         net_control_message_meta_init,
         net_control_message_meta_free,
         net_control_message_meta_transform);
-    g_once_init_leave (&meta_info, mi);
+    g_once_init_leave ((GstMetaInfo **) & meta_info, (GstMetaInfo *) mi);
   }
   return meta_info;
 }