From 42a8ffcd39e0f39d94c950d377b1482b5fb145ec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 5 Apr 2017 14:45:00 +0300 Subject: [PATCH] gst: Cast combined-flags constants to their respective target types This makes C++ compilers a bit more happy without having the user of the constants cast. It also provides the correct type information to GI. https://bugzilla.gnome.org/show_bug.cgi?id=780923 --- gst/gstbuffer.h | 4 ++-- gst/gstmemory.h | 2 +- gst/gstminiobject.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 3188cb4..916f947 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -432,8 +432,8 @@ typedef enum { * Combination of all possible metadata fields that can be copied with * gst_buffer_copy_into(). */ -#define GST_BUFFER_COPY_METADATA (GST_BUFFER_COPY_FLAGS | GST_BUFFER_COPY_TIMESTAMPS |\ - GST_BUFFER_COPY_META) +#define GST_BUFFER_COPY_METADATA ((GstBufferCopyFlags) (GST_BUFFER_COPY_FLAGS |\ + GST_BUFFER_COPY_TIMESTAMPS | GST_BUFFER_COPY_META)) /** * GST_BUFFER_COPY_ALL: (value 15) (type GstBufferCopyFlags) diff --git a/gst/gstmemory.h b/gst/gstmemory.h index 1d3d1a7..a69dd96 100644 --- a/gst/gstmemory.h +++ b/gst/gstmemory.h @@ -183,7 +183,7 @@ typedef enum { * * GstMapFlags value alias for GST_MAP_READ | GST_MAP_WRITE */ -#define GST_MAP_READWRITE (GST_MAP_READ | GST_MAP_WRITE) +#define GST_MAP_READWRITE ((GstMapFlags) (GST_MAP_READ | GST_MAP_WRITE)) /** diff --git a/gst/gstminiobject.h b/gst/gstminiobject.h index 0e3b2cb..b8af1c7 100644 --- a/gst/gstminiobject.h +++ b/gst/gstminiobject.h @@ -171,7 +171,7 @@ typedef enum { * * GstLockFlags value alias for GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE */ -#define GST_LOCK_FLAG_READWRITE (GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE) +#define GST_LOCK_FLAG_READWRITE ((GstLockFlags) (GST_LOCK_FLAG_READ | GST_LOCK_FLAG_WRITE)) /** * GST_MINI_OBJECT_REFCOUNT: -- 2.7.4