From c1393aff5c042d14edae384a59e6f049a7ef185a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Sun, 7 Jun 2015 09:08:35 +0200
Subject: [PATCH] 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));
~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~
---
tests/check/gst/gstmemory.c | 39 ++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 18 deletions(-)
diff --git a/tests/check/gst/gstmemory.c b/tests/check/gst/gstmemory.c
index 6600e1227c..079174ded3 100644
--- a/tests/check/gst/gstmemory.c
+++ b/tests/check/gst/gstmemory.c
@@ -565,30 +565,33 @@ GST_START_TEST (test_lock)
fail_unless (mem != NULL);
/* 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_unless (gst_memory_lock (mem, GST_MAP_WRITE));
- gst_memory_unlock (mem, GST_MAP_WRITE | GST_LOCK_FLAG_EXCLUSIVE);
- gst_memory_unlock (mem, GST_MAP_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);
+ fail_unless (gst_memory_lock (mem, GST_LOCK_FLAG_WRITE));
+ gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE | GST_LOCK_FLAG_EXCLUSIVE);
+ gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE);
/* no lock here */
fail_unless (gst_memory_lock (mem,
- GST_MAP_READWRITE | GST_LOCK_FLAG_EXCLUSIVE));
- fail_unless (gst_memory_lock (mem, GST_MAP_READ));
- fail_if (gst_memory_lock (mem, GST_MAP_READ | GST_LOCK_FLAG_EXCLUSIVE));
+ GST_LOCK_FLAG_READ | GST_LOCK_FLAG_EXCLUSIVE));
+ fail_unless (gst_memory_lock (mem,
+ 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_unless (gst_memory_lock (mem, GST_MAP_WRITE));
- gst_memory_unlock (mem, GST_MAP_WRITE);
- gst_memory_unlock (mem, GST_MAP_READ);
- gst_memory_unlock (mem, GST_MAP_READWRITE | GST_LOCK_FLAG_EXCLUSIVE);
+ fail_unless (gst_memory_lock (mem, GST_LOCK_FLAG_WRITE));
+ gst_memory_unlock (mem, GST_LOCK_FLAG_WRITE);
+ gst_memory_unlock (mem, GST_LOCK_FLAG_READ);
+ gst_memory_unlock (mem, GST_LOCK_FLAG_READWRITE | GST_LOCK_FLAG_EXCLUSIVE);
gst_memory_unref (mem);
}