libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx | 11 +++++++++++
libreofficekit/qa/gtktiledviewer/gtv-application.cxx | 11 +++++++++++
libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx | 11 +++++++++++
libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx | 5 +++++
libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx | 11 +++++++++++
libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx | 11 +++++++++++
libreofficekit/source/gtk/lokdocview.cxx | 5 +++++
ucb/source/ucp/gio/gio_mount.cxx | 5 +++++
vcl/unx/gtk3/gtk3gloactiongroup.cxx | 10 ++++++++++
vcl/unx/gtk3/gtk3glomenu.cxx | 5 +++++
10 files changed, 85 insertions(+)
New commits:
commit 0b3db87249652351f5a859ded1a876329ab18261
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Oct 17 12:05:49 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Oct 17 18:58:21 2019 +0200
Silence Clang 10 trunk -Wdeprecated-volatile in GLib for now
See <https://gitlab.gnome.org/GNOME/glib/merge_requests/1170> "Avoid C++20
deprecated assignment to volatile" for a potential fix in GLib (but also
see my
question at <https://github.com/llvm/llvm-project/commit/
4a6861a7e5b59be24a09b8b9782255d028e7aade#commitcomment-35540755> "[c++20]
P1152R4: warn on any simple-assignment to a volatile lvalue" whether that
Clang
warning is actually wanted here).
With glib2-devel-2.62.1-1.fc31.x86_64, the suppressed warnings looked like
> libreofficekit/source/gtk/lokdocview.cxx:327:1: error: use of result of
assignment to object of volatile-qualified type 'volatile gsize' (aka 'volatile
unsigned long') is deprecated [-Werror,-Wdeprecated-volatile]
> G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA,
> ^
> /usr/include/glib-2.0/gobject/gtype.h:1617:56: note: expanded from macro
'G_DEFINE_TYPE_WITH_CODE'
> #define G_DEFINE_TYPE_WITH_CODE(TN, t_n, T_P, _C_)
_G_DEFINE_TYPE_EXTENDED_BEGIN (TN, t_n, T_P, 0) {_C_;}
_G_DEFINE_TYPE_EXTENDED_END()
> ^
> /usr/include/glib-2.0/gobject/gtype.h:2034:3: note: expanded from macro
'_G_DEFINE_TYPE_EXTENDED_BEGIN'
> _G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER(TypeName, type_name,
TYPE_PARENT, flags) \
> ^
> /usr/include/glib-2.0/gobject/gtype.h:2005:7: note: expanded from macro
'_G_DEFINE_TYPE_EXTENDED_BEGIN_REGISTER'
> g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
> ^
> /usr/include/glib-2.0/glib/gthread.h:257:17: note: expanded from macro
'g_once_init_leave'
> (void) (0 ? *(location) = (result) : 0); \
> ^
Change-Id: If67ad04f8fb242f50b43a1d98ad2b28c4bed55a4
Reviewed-on: https://gerrit.libreoffice.org/80937
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 17f2ef77a1d3..7692b0b4a162 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -43,7 +43,18 @@ struct GtvApplicationWindowPrivate
GtvRenderingArgs* m_pRenderingArgs;
};
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE_WITH_PRIVATE(GtvApplicationWindow, gtv_application_window,
GTK_TYPE_APPLICATION_WINDOW);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
static GtvApplicationWindowPrivate*
getPrivate(GtvApplicationWindow* win)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 7481076778eb..b6598991f44b 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -19,7 +19,18 @@ struct GtvApplicationPrivate
GtvRenderingArgs* m_pRenderingArgs;
};
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE_WITH_PRIVATE(GtvApplication, gtv_application,
GTK_TYPE_APPLICATION);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
static GtvApplicationPrivate*
getPrivate(GtvApplication* app)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
index 57eba3e0efb3..9346057b7d01 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-calc-header-bar.cxx
@@ -52,7 +52,18 @@ struct GtvCalcHeaderBarPrivate
}
};
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE_WITH_PRIVATE(GtvCalcHeaderBar, gtv_calc_header_bar,
GTK_TYPE_DRAWING_AREA);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
static const int ROW_HEADER_WIDTH = 50;
static const int COLUMN_HEADER_HEIGHT = 20;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
index e28326ab3ffb..7c5bd31813e8 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-comments-sidebar.cxx
@@ -24,6 +24,11 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE(GtvCommentsSidebar, gtv_comments_sidebar, GTK_TYPE_BOX);
#ifdef __GNUC__
#pragma GCC diagnostic pop
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index 1d7a2482c069..3c9e68747074 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -54,7 +54,18 @@ struct GtvLokDialogPrivate
guint dialogid;
};
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE_WITH_PRIVATE(GtvLokDialog, gtv_lok_dialog, GTK_TYPE_DIALOG);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
enum
{
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index 4541a0c3706f..bdb1192f94da 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -66,7 +66,18 @@ struct GtvMainToolbarPrivate
}
};
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
G_DEFINE_TYPE_WITH_PRIVATE(GtvMainToolbar, gtv_main_toolbar, GTK_TYPE_BOX);
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic pop
+#endif
+#endif
static GtvMainToolbarPrivate&
getPrivate(GtvMainToolbar* toolbar)
diff --git a/libreofficekit/source/gtk/lokdocview.cxx
b/libreofficekit/source/gtk/lokdocview.cxx
index 9ece7eb4192e..122c6dcc4149 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -323,6 +323,11 @@ SAL_DLLPUBLIC_EXPORT GType lok_doc_view_get_type();
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
#endif
G_DEFINE_TYPE_WITH_CODE (LOKDocView, lok_doc_view, GTK_TYPE_DRAWING_AREA,
G_ADD_PRIVATE (LOKDocView)
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx
index be22b6d9bd3f..b78817c670e2 100644
--- a/ucb/source/ucp/gio/gio_mount.cxx
+++ b/ucb/source/ucp/gio/gio_mount.cxx
@@ -28,6 +28,11 @@
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
#endif
G_DEFINE_TYPE (OOoMountOperation, ooo_mount_operation, G_TYPE_MOUNT_OPERATION);
#ifdef __GNUC__
diff --git a/vcl/unx/gtk3/gtk3gloactiongroup.cxx
b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
index 87f99fca9f11..08ab8e90e980 100644
--- a/vcl/unx/gtk3/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
@@ -41,6 +41,11 @@ typedef GObjectClass GLOActionClass;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
#endif
G_DEFINE_TYPE (GLOAction, g_lo_action, G_TYPE_OBJECT);
#ifdef __GNUC__
@@ -107,6 +112,11 @@ static void g_lo_action_group_iface_init
(GActionGroupInterface *);
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
#endif
G_DEFINE_TYPE_WITH_CODE (GLOActionGroup,
g_lo_action_group, G_TYPE_OBJECT,
diff --git a/vcl/unx/gtk3/gtk3glomenu.cxx b/vcl/unx/gtk3/gtk3glomenu.cxx
index f20903d0bd5a..f14ab27b737b 100644
--- a/vcl/unx/gtk3/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/gtk3glomenu.cxx
@@ -24,6 +24,11 @@ typedef GMenuModelClass GLOMenuClass;
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
+#if defined __clang__
+#if __has_warning("-Wdeprecated-volatile")
+#pragma clang diagnostic ignored "-Wdeprecated-volatile"
+#endif
+#endif
#endif
G_DEFINE_TYPE (GLOMenu, g_lo_menu, G_TYPE_MENU_MODEL);
#ifdef __GNUC__
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
