summaryrefslogtreecommitdiff
path: root/winaccessibility/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2022-11-23 13:11:35 +0100
committerStephan Bergmann <sbergman@redhat.com>2022-11-24 10:38:28 +0100
commit4521cb0c409036036f1340e3ffc4e8f113091ecc (patch)
tree23575753c454a46f4b54bd99803364c5b371e7f4 /winaccessibility/inc
parent6571ab41ec5ce496f151bc4c5eaa8c4a52087e7f (diff)
Drop redundant -Wnon-virtual-dtor
Inspired by <https://gcc.gnu.org/pipermail/gcc-patches/2022-November/607102.html> "[PATCH] doc: -Wdelete-non-virtual-dtor supersedes -Wnon-virtual-dtor", drop explicitly enabling -Wnon-virtual-dtor in favor of -Wdelete-non-virtual-dtor, which is already enabled by -Wall. (-Wdelete-non-virtual-dtor first appeared in Clang 3.0, <https://github.com/llvm/llvm-project/commit/8bd428574c717e68a8274739d2ba0f6dc16fd0fb> "Add new warning that warns when invoking 'delete' on a polymorphic, non-final, class without a virtual destructor", and GCC 4.7, <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=014ab419efc12a59efebd2720d79e1c055675c85> "invoke.texi: Document -Wdelete-non-virtual-dtor. [...]") Dropping the explicit setting of -Wnon-virtual-dtor (and nowhere setting it implicitly via -Weffc++) means we can get rid of lots of places that either set -Wno-non-virtual-dtor or use some pragma to ignore -Wnon-virtual-dtor. (In various places across extensions/source/activex/ and winaccessibility/, the commits f26996bd3398afa789a5491968244563ccf70908 "Silence -Werror,-Wnon-virtual-dtor in generated so_activex.h (clang-cl)" and c6086ca6535692496fbd718d174d8eb5a5dea7c7 "Silence -Werror,-Wnon-virtual-dtor in generated UAccCOM.h (clang-cl)" had singled out some includes to wrap them in pragmas. Now that those pragmas are gone again, move those includes back to where they had been prior to being singled out. And the -Wno-non-virtual-dtor in external/firebird/macos-arm64.patch.0 appeared first in ccd0e5f445d4a7d0e7aca6c23c02c61bf14510b2 "Make firebird build for macOS on arm64", which, though it doesn't state it explicitly, apparently created that patch's builds/posix/prefix.darwin_arm64 as a copy of firebird's already existing builds/posix/prefix.* files, which routinely include that warning option too, so keep it there too even if it is probably irrelevant throughout.) Change-Id: I7e4fa9f2c07e267b2ed15607905027f6b78142f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143182 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'winaccessibility/inc')
-rw-r--r--winaccessibility/inc/AccObject.hxx8
-rw-r--r--winaccessibility/inc/AccObjectWinManager.hxx8
2 files changed, 0 insertions, 16 deletions
diff --git a/winaccessibility/inc/AccObject.hxx b/winaccessibility/inc/AccObject.hxx
index 707d307242bc..3e259592e5be 100644
--- a/winaccessibility/inc/AccObject.hxx
+++ b/winaccessibility/inc/AccObject.hxx
@@ -34,15 +34,7 @@
#include <com/sun/star/accessibility/XAccessibleAction.hpp>
#include "accHelper.hxx"
-
-#if defined __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
#include <UAccCOM.h>
-#if defined __clang__
-#pragma clang diagnostic pop
-#endif
class AccEventListener;
class AccObjectManagerAgent;
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 6ca9319f82a0..76e3e548fcdf 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -26,15 +26,7 @@
#include <windows.h>
#include <rtl/ref.hxx>
#include "ResIDGenerator.hxx"
-
-#if defined __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#endif
#include <UAccCOM.h>
-#if defined __clang__
-#pragma clang diagnostic pop
-#endif
namespace com::sun::star::accessibility {
class XAccessible;