Kaydet (Commit) dcd77e78 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

external/liborcus: silence -Werror=deprecated-copy (GCC trunk towards GCC 9)

Change-Id: I520b19e2486bf1622206c74649f7105148b7bd87
Reviewed-on: https://gerrit.libreoffice.org/58047
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 6b128853
...@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus)) ...@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,liborcus))
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \ external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \ external/liborcus/rpath.patch.0 \
external/liborcus/gcc9.patch.0 \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
......
--- include/orcus/types.hpp
+++ include/orcus/types.hpp
@@ -7,6 +7,13 @@
#ifndef INCLUDED_ORCUS_TYPES_HPP
#define INCLUDED_ORCUS_TYPES_HPP
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpragmas" // for old GCC
+#pragma GCC diagnostic ignored "-Wunknown-warning-option" // for Clang
+#pragma GCC diagnostic ignored "-Wdeprecated-copy"
+#endif
#include <cstdlib>
#include <vector>
@@ -145,6 +152,10 @@
typedef ::std::vector<xml_token_attr_t> xml_attrs_t;
}
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment