From 5300a5e73b1c20958e3a348003e750d5be50930c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 12 Mar 2011 16:58:01 +0000 Subject: [PATCH] bytereader, bytewriter: fix up inline functions to make g++ happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gstbytereader.h: In function ‘guint8* gst_byte_reader_dup_data_unchecked(GstByteReader*, guint)’: gstbytereader.h:249:75: error: invalid conversion from ‘void*’ to ‘guint8*’ gstbytewriter.h: In function ‘gboolean _gst_byte_writer_ensure_free_space_inline(GstByteWriter*, guint)’: gstbytewriter.h:196:75: error: invalid conversion from ‘void*’ to ‘guint8*’ https://bugzilla.gnome.org/show_bug.cgi?id=645595 --- libs/gst/base/gstbytereader.h | 3 ++- libs/gst/base/gstbytewriter.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/gstbytereader.h b/libs/gst/base/gstbytereader.h index f25c3b54ef..8ce76df334 100644 --- a/libs/gst/base/gstbytereader.h +++ b/libs/gst/base/gstbytereader.h @@ -246,7 +246,8 @@ gst_byte_reader_get_data_unchecked (GstByteReader * reader, guint size) static inline guint8 * gst_byte_reader_dup_data_unchecked (GstByteReader * reader, guint size) { - return g_memdup (gst_byte_reader_get_data_unchecked (reader, size), size); + gconstpointer data = gst_byte_reader_get_data_unchecked (reader, size); + return (guint8 *) g_memdup (data, size); } /* Unchecked variants that should not be used */ diff --git a/libs/gst/base/gstbytewriter.h b/libs/gst/base/gstbytewriter.h index 186480d6cd..8fcd53da6f 100644 --- a/libs/gst/base/gstbytewriter.h +++ b/libs/gst/base/gstbytewriter.h @@ -183,7 +183,7 @@ _gst_byte_writer_next_pow2 (guint n) static inline gboolean _gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size) { - guint8 *data; + gpointer data; if (G_LIKELY (size <= writer->alloc_size - writer->parent.byte)) return TRUE; @@ -197,7 +197,7 @@ _gst_byte_writer_ensure_free_space_inline (GstByteWriter * writer, guint size) if (G_UNLIKELY (data == NULL)) return FALSE; - writer->parent.data = data; + writer->parent.data = (guint8 *) data; return TRUE; }