[gtkmm/gtkmm-2-24] Pixbuf: Avoid deprecations warnings that break --enable-warnings=fatal.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm/gtkmm-2-24] Pixbuf: Avoid deprecations warnings that break --enable-warnings=fatal.
- Date: Fri, 14 Aug 2015 12:27:54 +0000 (UTC)
commit 33f4ecd007b2e4bd3511b36add8734b362c80d40
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Aug 14 14:25:57 2015 +0200
Pixbuf: Avoid deprecations warnings that break --enable-warnings=fatal.
Such as during distcheck.
gdk/src/pixbuf.ccg | 5 +++++
gdk/src/pixbuf.hg | 3 +++
2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/gdk/src/pixbuf.ccg b/gdk/src/pixbuf.ccg
index 946d600..f1a19c4 100644
--- a/gdk/src/pixbuf.ccg
+++ b/gdk/src/pixbuf.ccg
@@ -21,6 +21,11 @@
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+//Turn off all deprecation warnings, to avoid the warning about
+//gdk_pixbuf_new_from_inline() in the generated code.
+//We don't bother using G_GNUC_END_IGNORE_DEPRECATIONS
+//because we are happy to keep it active for the whole file.
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
namespace
{
diff --git a/gdk/src/pixbuf.hg b/gdk/src/pixbuf.hg
index 5f33591..994aa83 100644
--- a/gdk/src/pixbuf.hg
+++ b/gdk/src/pixbuf.hg
@@ -17,6 +17,9 @@
#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
#undef GDK_DISABLE_DEPRECATED
+#define GDK_DISABLE_DEPRECATION_WARNINGS 1
+#undef GDK_PIXBUF_DISABLE_DEPRECATED
+#define GDK_PIXBUF_DISABLE_DEPRECATION_WARNINGS 1
#m4 _POP()
// This is for including the config header before any code (such as
// the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]