summaryrefslogtreecommitdiffstats
path: root/vcl/unx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-13 18:13:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-13 18:16:30 +0100
commit8313f68355a7f1f51e930c74f215d823ff086457 (patch)
tree7e652866701e833d14e745b10be66b59dfd5c11f /vcl/unx
parentFilter out GCC-ism for Clang (diff)
downloadcore-8313f68355a7f1f51e930c74f215d823ff086457.tar.gz
core-8313f68355a7f1f51e930c74f215d823ff086457.zip
Work around G_DEFINE_TYPE -Werror,-Wunused-function
At least G_DEFINE_TYPE from glib2-devel-2.38.2-2.fc20.x86_64 /usr/include/glib-2.0/gobject/gtype.h defines unsed *_get_instance_private functions. Change-Id: I47211b6451d9699c7b8741555f3ad11a09e411bf
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/gtk/window/gloactiongroup.cxx14
-rw-r--r--vcl/unx/gtk/window/glomenu.cxx7
2 files changed, 21 insertions, 0 deletions
diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx
index 19187a69e793..00ce9338d32b 100644
--- a/vcl/unx/gtk/window/gloactiongroup.cxx
+++ b/vcl/unx/gtk/window/gloactiongroup.cxx
@@ -40,7 +40,14 @@ struct _GLOAction
typedef GObjectClass GLOActionClass;
typedef struct _GLOAction GLOAction;
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
GLOAction*
g_lo_action_new (void)
@@ -100,10 +107,17 @@ struct _GLOActionGroupPrivate
static void g_lo_action_group_iface_init (GActionGroupInterface *);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
g_lo_action_group, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
g_lo_action_group_iface_init));
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
static gchar **
g_lo_action_group_list_actions (GActionGroup *group)
diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx
index 8227fb1073db..e012aa0d8247 100644
--- a/vcl/unx/gtk/window/glomenu.cxx
+++ b/vcl/unx/gtk/window/glomenu.cxx
@@ -25,7 +25,14 @@ struct _GLOMenu
typedef GMenuModelClass GLOMenuClass;
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL);
+#if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE && HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
+#pragma GCC diagnostic pop
+#endif
struct item
{