mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-12 09:15:29 +00:00
memory: Fix compiler warnings in unit test
gst/gstmemory.c:570:38: error: implicit conversion from enumeration type 'GstMapFlags' to different enumeration type 'GstLockFlags' [-Werror,-Wenum-conversion] fail_unless (gst_memory_lock (mem, GST_MAP_WRITE)); ~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
This commit is contained in:
parent
64773fee9c
commit
c1393aff5c
1 changed files with 21 additions and 18 deletions
|
@ -565,30 +565,33 @@ GST_START_TEST (test_lock)
|
||||||
fail_unless (mem != NULL);
|
fail_unless (mem != NULL);
|
||||||
|
|
||||||
/* test exclusivity */
|
/* test exclusivity */
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_WRITE | GST_LOCK_FLAG_EXCLUSIVE));
|
fail_unless (gst_memory_lock (mem,
|
||||||
|
GST_LOCK_FLAG_WRITE | GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
fail_if (gst_memory_lock (mem, GST_LOCK_FLAG_EXCLUSIVE));
|
fail_if (gst_memory_lock (mem, GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_WRITE));
|
fail_unless (gst_memory_lock (mem, GST_LOCK_FLAG_WRITE));
|
||||||
gst_memory_unlock (mem, GST_MAP_WRITE | GST_LOCK_FLAG_EXCLUSIVE);
|
gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE | GST_LOCK_FLAG_EXCLUSIVE);
|
||||||
gst_memory_unlock (mem, GST_MAP_WRITE);
|
gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE);
|
||||||
|
|
||||||
/* no lock here */
|
|
||||||
|
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
|
||||||
gst_memory_unlock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE);
|
|
||||||
gst_memory_unlock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE);
|
|
||||||
|
|
||||||
/* no lock here */
|
/* no lock here */
|
||||||
|
|
||||||
fail_unless (gst_memory_lock (mem,
|
fail_unless (gst_memory_lock (mem,
|
||||||
GST_MAP_READWRITE | GST_LOCK_FLAG_EXCLUSIVE));
|
GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_READ));
|
fail_unless (gst_memory_lock (mem,
|
||||||
fail_if (gst_memory_lock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
|
gst_memory_unlock (mem, GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE);
|
||||||
|
gst_memory_unlock (mem, GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE);
|
||||||
|
|
||||||
|
/* no lock here */
|
||||||
|
|
||||||
|
fail_unless (gst_memory_lock (mem,
|
||||||
|
GST_LOCK_FLAG_READWRITE | GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
|
fail_unless (gst_memory_lock (mem, GST_LOCK_FLAG_READ));
|
||||||
|
fail_if (gst_memory_lock (mem, GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
fail_if (gst_memory_lock (mem, GST_LOCK_FLAG_EXCLUSIVE));
|
fail_if (gst_memory_lock (mem, GST_LOCK_FLAG_EXCLUSIVE));
|
||||||
fail_unless (gst_memory_lock (mem, GST_MAP_WRITE));
|
fail_unless (gst_memory_lock (mem, GST_LOCK_FLAG_WRITE));
|
||||||
gst_memory_unlock (mem, GST_MAP_WRITE);
|
gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE);
|
||||||
gst_memory_unlock (mem, GST_MAP_READ);
|
gst_memory_unlock (mem, GST_LOCK_FLAG_READ);
|
||||||
gst_memory_unlock (mem, GST_MAP_READWRITE | GST_LOCK_FLAG_EXCLUSIVE);
|
gst_memory_unlock (mem, GST_LOCK_FLAG_READWRITE | GST_LOCK_FLAG_EXCLUSIVE);
|
||||||
|
|
||||||
gst_memory_unref (mem);
|
gst_memory_unref (mem);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue