diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 12:05:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-10-17 18:58:21 +0200 |
| commit | 0b3db87249652351f5a859ded1a876329ab18261 (patch) | |
| tree | e798af8250da5898912256cf59d26f96966cdf32 /ucb/source | |
| parent | 393a3413ea8e8b459465655820d21d7c39b31fbd (diff) | |
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 <sbergman@redhat.com>
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
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__ |