From c0749e7762ac0f01c33dd7c00bddd88f551e1c9a Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Thu, 25 Aug 2011 22:05:26 +0200 Subject: [PATCH] trace: add GST_ALLOC_TRACE_NONE for consistency and use it Fixes warning #188: enumerated type mixed with another type reported by ICC. --- gst/gsttrace.c | 2 +- gst/gsttrace.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gst/gsttrace.c b/gst/gsttrace.c index 0a176c32d0..b857458b81 100644 --- a/gst/gsttrace.c +++ b/gst/gsttrace.c @@ -262,7 +262,7 @@ _gst_trace_add_entry (GstTrace * trace, guint32 seq, guint32 data, gchar * msg) /* global flags */ -static GstAllocTraceFlags _gst_trace_flags = 0; +static GstAllocTraceFlags _gst_trace_flags = GST_ALLOC_TRACE_NONE; /* list of registered tracers */ static GList *_gst_alloc_tracers = NULL; diff --git a/gst/gsttrace.h b/gst/gsttrace.h index 1de63faaeb..1882762339 100644 --- a/gst/gsttrace.h +++ b/gst/gsttrace.h @@ -30,13 +30,15 @@ G_BEGIN_DECLS /** * GstAllocTraceFlags: - * @GST_ALLOC_TRACE_LIVE: Trace number of non-freed memory - * @GST_ALLOC_TRACE_MEM_LIVE: trace pointers of unfreed memory + * @GST_ALLOC_TRACE_NONE: No tracing specified or desired. + * @GST_ALLOC_TRACE_LIVE: Trace number of non-freed memory. + * @GST_ALLOC_TRACE_MEM_LIVE: Trace pointers of unfreed memory. * * Flags indicating which tracing feature to enable. */ typedef enum { - GST_ALLOC_TRACE_LIVE = (1 << 0), + GST_ALLOC_TRACE_NONE = 0, + GST_ALLOC_TRACE_LIVE = (1 << 0), GST_ALLOC_TRACE_MEM_LIVE = (1 << 1) } GstAllocTraceFlags; -- 2.34.1