4521cb0c40
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, <8bd428574c> "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 commitsf26996bd33"Silence -Werror,-Wnon-virtual-dtor in generated so_activex.h (clang-cl)" andc6086ca653"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 inccd0e5f445"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>
50 lines
1.4 KiB
C
50 lines
1.4 KiB
C
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
#if !defined(AFX_STDAFX_H_)
|
|
#define AFX_STDAFX_H_
|
|
|
|
#define STRICT
|
|
#define _ATL_APARTMENT_THREADED
|
|
// #define _ATL_STATIC_REGISTRY
|
|
|
|
#ifdef _MSC_VER
|
|
#if defined __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wall"
|
|
#pragma clang diagnostic ignored "-Wattributes"
|
|
#pragma clang diagnostic ignored "-Wdelete-incomplete"
|
|
#pragma clang diagnostic ignored "-Wdynamic-class-memaccess"
|
|
#pragma clang diagnostic ignored "-Wextra"
|
|
#pragma clang diagnostic ignored "-Wint-to-pointer-cast"
|
|
#pragma clang diagnostic ignored "-Winvalid-noreturn"
|
|
#pragma clang diagnostic ignored "-Wmicrosoft"
|
|
#pragma clang diagnostic ignored "-Wnon-pod-varargs"
|
|
#pragma clang diagnostic ignored "-Wnonportable-include-path"
|
|
#pragma clang diagnostic ignored "-Wsequence-point"
|
|
#pragma clang diagnostic ignored "-Wtypename-missing"
|
|
#endif
|
|
#endif
|
|
#include <atlbase.h>
|
|
#if defined max
|
|
#undef max
|
|
#endif
|
|
#if defined min
|
|
#undef min
|
|
#endif
|
|
//You may derive a class from CComModule and use it if you want to override
|
|
//something, but do not change the name of _Module
|
|
extern CComModule _Module;
|
|
#include <atlcom.h>
|
|
#include <atlctl.h>
|
|
|
|
//{{AFX_INSERT_LOCATION}}
|
|
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
|
|
|
|
#ifdef _MSC_VER
|
|
#if defined __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif
|
|
#endif
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|