diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2022-11-23 13:11:35 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2022-11-24 10:38:28 +0100 |
commit | 4521cb0c409036036f1340e3ffc4e8f113091ecc (patch) | |
tree | 23575753c454a46f4b54bd99803364c5b371e7f4 /winaccessibility/source | |
parent | 6571ab41ec5ce496f151bc4c5eaa8c4a52087e7f (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/source')
18 files changed, 15 insertions, 151 deletions
diff --git a/winaccessibility/source/UAccCOM/AccAction.cxx b/winaccessibility/source/UAccCOM/AccAction.cxx index 97bfc4f40aed..094e102519f8 100644 --- a/winaccessibility/source/UAccCOM/AccAction.cxx +++ b/winaccessibility/source/UAccCOM/AccAction.cxx @@ -21,16 +21,8 @@ * AccAction.cpp : Implementation of CAccAction */ #include "stdafx.h" -#include "AccAction.h" - -#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 +#include "AccAction.h" using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; diff --git a/winaccessibility/source/UAccCOM/AccComponent.cxx b/winaccessibility/source/UAccCOM/AccComponent.cxx index 2ca64cd7df1c..e1e7af6abfdb 100644 --- a/winaccessibility/source/UAccCOM/AccComponent.cxx +++ b/winaccessibility/source/UAccCOM/AccComponent.cxx @@ -21,16 +21,8 @@ * AccComponent.cpp : Implementation of CUAccCOMApp and DLL registration. */ #include "stdafx.h" -#include "AccComponent.h" - -#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 +#include "AccComponent.h" /** * Returns the location of the upper left corner of the object's bounding diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx index 2bfd843660e1..3dd1883b9fb3 100644 --- a/winaccessibility/source/UAccCOM/AccEditableText.cxx +++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx @@ -21,16 +21,8 @@ * AccEditableText.cpp : Implementation of CUAccCOMApp and DLL registration. */ #include "stdafx.h" -#include "AccEditableText.h" - -#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 +#include "AccEditableText.h" #include <vcl/svapp.hxx> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.cxx b/winaccessibility/source/UAccCOM/AccHyperLink.cxx index 6857540c321c..5546c93e5804 100644 --- a/winaccessibility/source/UAccCOM/AccHyperLink.cxx +++ b/winaccessibility/source/UAccCOM/AccHyperLink.cxx @@ -18,16 +18,8 @@ */ #include "stdafx.h" -#include "AccHyperLink.h" - -#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 +#include "AccHyperLink.h" #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/AccHypertext.cxx b/winaccessibility/source/UAccCOM/AccHypertext.cxx index 722f13b5cf5e..75d816112e85 100644 --- a/winaccessibility/source/UAccCOM/AccHypertext.cxx +++ b/winaccessibility/source/UAccCOM/AccHypertext.cxx @@ -18,19 +18,11 @@ */ #include "stdafx.h" +#include <UAccCOM.h> #include "AccHypertext.h" #include "AccHyperLink.h" #include "acccommon.h" -#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 - #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/AccImage.cxx b/winaccessibility/source/UAccCOM/AccImage.cxx index 666524a71192..a8d27a81cc78 100644 --- a/winaccessibility/source/UAccCOM/AccImage.cxx +++ b/winaccessibility/source/UAccCOM/AccImage.cxx @@ -18,16 +18,8 @@ */ #include "stdafx.h" -#include "AccImage.h" - -#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 +#include "AccImage.h" #include <vcl/svapp.hxx> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index 543a5b1aebe6..ef3265000bab 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -18,16 +18,8 @@ */ #include "stdafx.h" -#include "AccRelation.h" - -#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 +#include "AccRelation.h" #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index 472f0d8f23ca..2022eb7e24eb 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -21,16 +21,8 @@ * AccTable.cpp : Implementation of CAccTable. */ #include "stdafx.h" -#include "AccTable.h" - -#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 +#include "AccTable.h" #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/AccText.cxx b/winaccessibility/source/UAccCOM/AccText.cxx index fc6c39285a80..0cddc52a8fc5 100644 --- a/winaccessibility/source/UAccCOM/AccText.cxx +++ b/winaccessibility/source/UAccCOM/AccText.cxx @@ -18,16 +18,8 @@ */ #include "stdafx.h" -#include "AccText.h" - -#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 +#include "AccText.h" using namespace com::sun::star::accessibility; using namespace com::sun::star::uno; diff --git a/winaccessibility/source/UAccCOM/AccValue.cxx b/winaccessibility/source/UAccCOM/AccValue.cxx index c18440e6558f..8465fb5718f7 100644 --- a/winaccessibility/source/UAccCOM/AccValue.cxx +++ b/winaccessibility/source/UAccCOM/AccValue.cxx @@ -18,18 +18,10 @@ */ #include "stdafx.h" +#include <UAccCOM.h> #include "AccValue.h" #include "MAccessible.h" -#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 - #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index 885a1ebc3cb8..e5d2b9524657 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -18,18 +18,10 @@ */ #include "stdafx.h" +#include <UAccCOM.h> #include "EnumVariant.h" #include "MAccessible.h" -#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 - #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h index bf7a45feb155..49822d529621 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.h +++ b/winaccessibility/source/UAccCOM/EnumVariant.h @@ -22,16 +22,8 @@ #include "Resource.h" // main symbols #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleSelection.hpp> -#include <AccObjectManagerAgent.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 +#include <AccObjectManagerAgent.hxx> /** * CEnumVariant implements IEnumVARIANT interface. diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index a1b24aa0d62e..cf53ec077973 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -17,16 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "MAccessible.h" - -#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 +#include "MAccessible.h" #include <algorithm> #include <cstddef> diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx index 944db5c94c10..2914e16c36f7 100644 --- a/winaccessibility/source/UAccCOM/UAccCOM.cxx +++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx @@ -20,16 +20,8 @@ #include "stdafx.h" #include "Resource.h" #include <initguid.h> -#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 +#include <accHelper.hxx> #if defined __clang__ #pragma clang diagnostic push diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx index c009a005e4d1..df55dc09a43c 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.cxx +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.cxx @@ -17,16 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "UNOXWrapper.h" - -#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 +#include "UNOXWrapper.h" using namespace ::com::sun::star; diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.h b/winaccessibility/source/UAccCOM/UNOXWrapper.h index 42983f88ace6..b319d4e2b66f 100644 --- a/winaccessibility/source/UAccCOM/UNOXWrapper.h +++ b/winaccessibility/source/UAccCOM/UNOXWrapper.h @@ -23,15 +23,7 @@ #include "Resource.h" // main symbols #include <com/sun/star/accessibility/XAccessible.hpp> - -#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 /** * CUNOXWrapper implements IUNOXWrapper interface. diff --git a/winaccessibility/source/UAccCOM/stdafx.h b/winaccessibility/source/UAccCOM/stdafx.h index 53044645f326..6a68376a8ee5 100644 --- a/winaccessibility/source/UAccCOM/stdafx.h +++ b/winaccessibility/source/UAccCOM/stdafx.h @@ -45,7 +45,6 @@ #pragma clang diagnostic ignored "-Winvalid-noreturn" #pragma clang diagnostic ignored "-Wmicrosoft" #pragma clang diagnostic ignored "-Wnon-pod-varargs" -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif #include <atlbase.h> // You may derive a class from CComModule and use it if you want to override diff --git a/winaccessibility/source/service/AccObjectManagerAgent.cxx b/winaccessibility/source/service/AccObjectManagerAgent.cxx index e60b3a56992c..3ed3984c8828 100644 --- a/winaccessibility/source/service/AccObjectManagerAgent.cxx +++ b/winaccessibility/source/service/AccObjectManagerAgent.cxx @@ -20,14 +20,7 @@ #include <AccObjectManagerAgent.hxx> #include <AccObjectWinManager.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 using namespace com::sun::star::uno; using namespace com::sun::star::accessibility; |