diff options
127 files changed, 20 insertions, 426 deletions
diff --git a/bin/gen-boost-headers b/bin/gen-boost-headers index 0e25365fa917..784cf60f3442 100755 --- a/bin/gen-boost-headers +++ b/bin/gen-boost-headers @@ -49,7 +49,6 @@ cat <(cd ${SRCDIR} && git grep -h '^# *include') \ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx index b5604c755da5..0a84b92c2cbe 100644 --- a/embedserv/source/inc/embeddocaccess.hxx +++ b/embedserv/source/inc/embeddocaccess.hxx @@ -32,7 +32,6 @@ #pragma clang diagnostic ignored "-Wall" #pragma clang diagnostic ignored "-Wextra" #pragma clang diagnostic ignored "-Wmicrosoft" -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif #include <atldbcli.h> #if defined __clang__ diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index 9ec4fffcabee..44b79de4e600 100644 --- a/embedserv/source/inc/stdafx.h +++ b/embedserv/source/inc/stdafx.h @@ -18,7 +18,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" #pragma clang diagnostic ignored "-Wnonportable-include-path" #pragma clang diagnostic ignored "-Wsequence-point" #pragma clang diagnostic ignored "-Wtypename-missing" diff --git a/extensions/source/activex/SOActionsApproval.cxx b/extensions/source/activex/SOActionsApproval.cxx index 3ea4ac8dcf33..833e220ae183 100644 --- a/extensions/source/activex/SOActionsApproval.cxx +++ b/extensions/source/activex/SOActionsApproval.cxx @@ -25,18 +25,10 @@ #include "StdAfx2.h" +#include <so_activex.h> #include "SOActionsApproval.h" #include <sal/macros.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif -#include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif - COM_DECLSPEC_NOTHROW STDMETHODIMP SOActionsApproval::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = { diff --git a/extensions/source/activex/SOActionsApproval.h b/extensions/source/activex/SOActionsApproval.h index 2484e74620dd..9b8f4c1e992e 100644 --- a/extensions/source/activex/SOActionsApproval.h +++ b/extensions/source/activex/SOActionsApproval.h @@ -32,14 +32,7 @@ #include <atlctl.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif #include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif // SOActionsApproval diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 88b3ad7691ca..b72ab0d66ca0 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -20,21 +20,13 @@ // SOActiveX.cpp : Implementation of CSOActiveX #include "StdAfx2.h" +#include <so_activex.h> #include "SOActiveX.h" #include "SOComWindowPeer.h" #include "SODispatchInterceptor.h" #include "SOActionsApproval.h" #include "com_uno_helper.h" -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif -#include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif - #define STAROFFICE_WINDOWCLASS L"SOParentWindow" diff --git a/extensions/source/activex/SOActiveX.h b/extensions/source/activex/SOActiveX.h index 37d983ae91d5..49f33d796047 100644 --- a/extensions/source/activex/SOActiveX.h +++ b/extensions/source/activex/SOActiveX.h @@ -29,14 +29,7 @@ #include <atlctl.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif #include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif class SODispatchInterceptor; diff --git a/extensions/source/activex/SOComWindowPeer.cxx b/extensions/source/activex/SOComWindowPeer.cxx index dbd2bcc3e662..6973bc173984 100644 --- a/extensions/source/activex/SOComWindowPeer.cxx +++ b/extensions/source/activex/SOComWindowPeer.cxx @@ -24,18 +24,10 @@ #include <cstddef> #include "StdAfx2.h" +#include <so_activex.h> #include "SOComWindowPeer.h" #include <sal/macros.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif -#include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif - COM_DECLSPEC_NOTHROW STDMETHODIMP SOComWindowPeer::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = { diff --git a/extensions/source/activex/SOComWindowPeer.h b/extensions/source/activex/SOComWindowPeer.h index 379ca767a66a..58136e813637 100644 --- a/extensions/source/activex/SOComWindowPeer.h +++ b/extensions/source/activex/SOComWindowPeer.h @@ -32,14 +32,7 @@ #include <atlctl.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif #include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif // SOComWindowPeer diff --git a/extensions/source/activex/SODispatchInterceptor.cxx b/extensions/source/activex/SODispatchInterceptor.cxx index 14c42a774393..af3d69e02ea9 100644 --- a/extensions/source/activex/SODispatchInterceptor.cxx +++ b/extensions/source/activex/SODispatchInterceptor.cxx @@ -25,20 +25,12 @@ #include <stdio.h> #include "StdAfx2.h" +#include <so_activex.h> #include "SOActiveX.h" #include "SODispatchInterceptor.h" #include "com_uno_helper.h" #include <sal/macros.h> -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif -#include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif - COM_DECLSPEC_NOTHROW STDMETHODIMP SODispatchInterceptor::InterfaceSupportsErrorInfo(REFIID riid) { static const IID* arr[] = diff --git a/extensions/source/activex/StdAfx2.h b/extensions/source/activex/StdAfx2.h index 56bd75b8ac32..ed889271aed8 100644 --- a/extensions/source/activex/StdAfx2.h +++ b/extensions/source/activex/StdAfx2.h @@ -41,7 +41,6 @@ #pragma clang diagnostic ignored "-Wmicrosoft" #pragma clang diagnostic ignored "-Wmissing-field-initializers" #pragma clang diagnostic ignored "-Wnon-pod-varargs" -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #pragma clang diagnostic ignored "-Wnonportable-include-path" #pragma clang diagnostic ignored "-Wsequence-point" #pragma clang diagnostic ignored "-Wsign-compare" diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index 70682a416b53..a4ce480613dc 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -27,15 +27,7 @@ #include "StdAfx2.h" #include "resource.h" #include <initguid.h> - -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif #include <so_activex.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif #if defined __clang__ #pragma clang diagnostic push diff --git a/extensions/source/ole/oledll.cxx b/extensions/source/ole/oledll.cxx index 1275f4dc60c5..9ed73a33042d 100644 --- a/extensions/source/ole/oledll.cxx +++ b/extensions/source/ole/oledll.cxx @@ -30,7 +30,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> diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 28286bddb1e3..936e049b147a 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -41,7 +41,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" #pragma clang diagnostic ignored "-Wnonportable-include-path" #pragma clang diagnostic ignored "-Wsequence-point" #pragma clang diagnostic ignored "-Wtypename-missing" diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx index 4da57d53c173..3c8417cf929a 100644 --- a/extensions/source/ole/wincrap.hxx +++ b/extensions/source/ole/wincrap.hxx @@ -43,7 +43,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 // from oleobjw.hxx diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx index edf3c1d45ab8..d9c4cb31436d 100644 --- a/extensions/source/ole/windata.hxx +++ b/extensions/source/ole/windata.hxx @@ -29,7 +29,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> diff --git a/external/boost/include/boost/algorithm/string.hpp b/external/boost/include/boost/algorithm/string.hpp index c0ce49aca968..791fdb2309c3 100644 --- a/external/boost/include/boost/algorithm/string.hpp +++ b/external/boost/include/boost/algorithm/string.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/algorithm/string/predicate.hpp b/external/boost/include/boost/algorithm/string/predicate.hpp index 9d7a980cfa95..d67e07cf935d 100644 --- a/external/boost/include/boost/algorithm/string/predicate.hpp +++ b/external/boost/include/boost/algorithm/string/predicate.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/archive/iterators/base64_from_binary.hpp b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp index 9d702e888fe4..6f717c89ccc4 100644 --- a/external/boost/include/boost/archive/iterators/base64_from_binary.hpp +++ b/external/boost/include/boost/archive/iterators/base64_from_binary.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/archive/iterators/binary_from_base64.hpp b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp index f7d3adb4cc25..a12b0fb1b234 100644 --- a/external/boost/include/boost/archive/iterators/binary_from_base64.hpp +++ b/external/boost/include/boost/archive/iterators/binary_from_base64.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/archive/iterators/remove_whitespace.hpp b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp index 4963a71cdc3b..8a3909ec3307 100644 --- a/external/boost/include/boost/archive/iterators/remove_whitespace.hpp +++ b/external/boost/include/boost/archive/iterators/remove_whitespace.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/archive/iterators/transform_width.hpp b/external/boost/include/boost/archive/iterators/transform_width.hpp index f49e26ba1538..5ffa69741c04 100644 --- a/external/boost/include/boost/archive/iterators/transform_width.hpp +++ b/external/boost/include/boost/archive/iterators/transform_width.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/bind.hpp b/external/boost/include/boost/bind.hpp index c48766c84ceb..10312f125338 100644 --- a/external/boost/include/boost/bind.hpp +++ b/external/boost/include/boost/bind.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/cast.hpp b/external/boost/include/boost/cast.hpp index 743954c14204..f0d932072836 100644 --- a/external/boost/include/boost/cast.hpp +++ b/external/boost/include/boost/cast.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/circular_buffer.hpp b/external/boost/include/boost/circular_buffer.hpp index 116793053edc..ca246bb11558 100644 --- a/external/boost/include/boost/circular_buffer.hpp +++ b/external/boost/include/boost/circular_buffer.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/container/flat_map.hpp b/external/boost/include/boost/container/flat_map.hpp index 7ef7f3af8208..32bcfddd7714 100644 --- a/external/boost/include/boost/container/flat_map.hpp +++ b/external/boost/include/boost/container/flat_map.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/container/small_vector.hpp b/external/boost/include/boost/container/small_vector.hpp index f10d2e0f3fd9..64329c24f39f 100644 --- a/external/boost/include/boost/container/small_vector.hpp +++ b/external/boost/include/boost/container/small_vector.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/cstdint.hpp b/external/boost/include/boost/cstdint.hpp index 0e27cb69da2f..3ac17c91e18c 100644 --- a/external/boost/include/boost/cstdint.hpp +++ b/external/boost/include/boost/cstdint.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/current_function.hpp b/external/boost/include/boost/current_function.hpp index 6cd422ec0123..f8e044e4e6a8 100644 --- a/external/boost/include/boost/current_function.hpp +++ b/external/boost/include/boost/current_function.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/date_time.hpp b/external/boost/include/boost/date_time.hpp index c733dd41bb3d..e99ef34d23f6 100644 --- a/external/boost/include/boost/date_time.hpp +++ b/external/boost/include/boost/date_time.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/date_time/posix_time/posix_time.hpp b/external/boost/include/boost/date_time/posix_time/posix_time.hpp index ececd1cb4671..b8f2e564c8cf 100644 --- a/external/boost/include/boost/date_time/posix_time/posix_time.hpp +++ b/external/boost/include/boost/date_time/posix_time/posix_time.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/filesystem.hpp b/external/boost/include/boost/filesystem.hpp index 2fbb461409c0..702766e04d40 100644 --- a/external/boost/include/boost/filesystem.hpp +++ b/external/boost/include/boost/filesystem.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/filesystem/path.hpp b/external/boost/include/boost/filesystem/path.hpp index a943b351b911..c713c721d2de 100644 --- a/external/boost/include/boost/filesystem/path.hpp +++ b/external/boost/include/boost/filesystem/path.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/functional/hash.hpp b/external/boost/include/boost/functional/hash.hpp index 4f79983d828b..9b0741dce22e 100644 --- a/external/boost/include/boost/functional/hash.hpp +++ b/external/boost/include/boost/functional/hash.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/fusion/adapted/std_pair.hpp b/external/boost/include/boost/fusion/adapted/std_pair.hpp index 3124e0b73836..a0f70a517676 100644 --- a/external/boost/include/boost/fusion/adapted/std_pair.hpp +++ b/external/boost/include/boost/fusion/adapted/std_pair.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/fusion/include/adapt_struct.hpp b/external/boost/include/boost/fusion/include/adapt_struct.hpp index f4fcab6ff562..88ec1e174b89 100644 --- a/external/boost/include/boost/fusion/include/adapt_struct.hpp +++ b/external/boost/include/boost/fusion/include/adapt_struct.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/intrusive/circular_list_algorithms.hpp b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp index 66ab5cc615e7..33d02eff9627 100644 --- a/external/boost/include/boost/intrusive/circular_list_algorithms.hpp +++ b/external/boost/include/boost/intrusive/circular_list_algorithms.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/intrusive_ptr.hpp b/external/boost/include/boost/intrusive_ptr.hpp index 42f244f2aa78..bc64b6365b83 100644 --- a/external/boost/include/boost/intrusive_ptr.hpp +++ b/external/boost/include/boost/intrusive_ptr.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/io/ios_state.hpp b/external/boost/include/boost/io/ios_state.hpp index b6d09e7648a0..93b536e24c0e 100644 --- a/external/boost/include/boost/io/ios_state.hpp +++ b/external/boost/include/boost/io/ios_state.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/iostreams/filter/gzip.hpp b/external/boost/include/boost/iostreams/filter/gzip.hpp index da69d27444bc..1c9c50eb7c04 100644 --- a/external/boost/include/boost/iostreams/filter/gzip.hpp +++ b/external/boost/include/boost/iostreams/filter/gzip.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/iostreams/filtering_stream.hpp b/external/boost/include/boost/iostreams/filtering_stream.hpp index 0a6ef2c54f05..34ae39ea8abb 100644 --- a/external/boost/include/boost/iostreams/filtering_stream.hpp +++ b/external/boost/include/boost/iostreams/filtering_stream.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/iterator/iterator_facade.hpp b/external/boost/include/boost/iterator/iterator_facade.hpp index b3d1de873124..e0cac196dd76 100644 --- a/external/boost/include/boost/iterator/iterator_facade.hpp +++ b/external/boost/include/boost/iterator/iterator_facade.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/lexical_cast.hpp b/external/boost/include/boost/lexical_cast.hpp index c6db696f18ce..05316296cc6d 100644 --- a/external/boost/include/boost/lexical_cast.hpp +++ b/external/boost/include/boost/lexical_cast.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/locale.hpp b/external/boost/include/boost/locale.hpp index d7e201109947..e02e9a437384 100644 --- a/external/boost/include/boost/locale.hpp +++ b/external/boost/include/boost/locale.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/locale/gnu_gettext.hpp b/external/boost/include/boost/locale/gnu_gettext.hpp index 137b84096720..e3f44ec482b6 100644 --- a/external/boost/include/boost/locale/gnu_gettext.hpp +++ b/external/boost/include/boost/locale/gnu_gettext.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/make_shared.hpp b/external/boost/include/boost/make_shared.hpp index e96423973d68..54ddad0386cc 100644 --- a/external/boost/include/boost/make_shared.hpp +++ b/external/boost/include/boost/make_shared.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/math/common_factor_rt.hpp b/external/boost/include/boost/math/common_factor_rt.hpp index 2f3704752814..c54f0ada0671 100644 --- a/external/boost/include/boost/math/common_factor_rt.hpp +++ b/external/boost/include/boost/math/common_factor_rt.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/math/special_functions/expm1.hpp b/external/boost/include/boost/math/special_functions/expm1.hpp index 1c80d0bf3b73..cfcb0e57bef3 100644 --- a/external/boost/include/boost/math/special_functions/expm1.hpp +++ b/external/boost/include/boost/math/special_functions/expm1.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/math/special_functions/sinc.hpp b/external/boost/include/boost/math/special_functions/sinc.hpp index a90f020883de..a2a9384e4fa6 100644 --- a/external/boost/include/boost/math/special_functions/sinc.hpp +++ b/external/boost/include/boost/math/special_functions/sinc.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_array.hpp b/external/boost/include/boost/multi_array.hpp index feb2abf74584..52ad818447a8 100644 --- a/external/boost/include/boost/multi_array.hpp +++ b/external/boost/include/boost/multi_array.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index/composite_key.hpp b/external/boost/include/boost/multi_index/composite_key.hpp index 9f56d16cb9d2..ff987096ccd2 100644 --- a/external/boost/include/boost/multi_index/composite_key.hpp +++ b/external/boost/include/boost/multi_index/composite_key.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index/identity.hpp b/external/boost/include/boost/multi_index/identity.hpp index c817b893b7d4..5c994a42cfae 100644 --- a/external/boost/include/boost/multi_index/identity.hpp +++ b/external/boost/include/boost/multi_index/identity.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index/mem_fun.hpp b/external/boost/include/boost/multi_index/mem_fun.hpp index c682a26d1875..69ac0c4ca309 100644 --- a/external/boost/include/boost/multi_index/mem_fun.hpp +++ b/external/boost/include/boost/multi_index/mem_fun.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index/ordered_index.hpp b/external/boost/include/boost/multi_index/ordered_index.hpp index e5fb993f756a..74885794dc3b 100644 --- a/external/boost/include/boost/multi_index/ordered_index.hpp +++ b/external/boost/include/boost/multi_index/ordered_index.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index/random_access_index.hpp b/external/boost/include/boost/multi_index/random_access_index.hpp index a4276515a72b..71dd53c5c188 100644 --- a/external/boost/include/boost/multi_index/random_access_index.hpp +++ b/external/boost/include/boost/multi_index/random_access_index.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/multi_index_container.hpp b/external/boost/include/boost/multi_index_container.hpp index f55b980ad752..bb0c3e2f39af 100644 --- a/external/boost/include/boost/multi_index_container.hpp +++ b/external/boost/include/boost/multi_index_container.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/noncopyable.hpp b/external/boost/include/boost/noncopyable.hpp index 053e01256496..3d35a993b1f5 100644 --- a/external/boost/include/boost/noncopyable.hpp +++ b/external/boost/include/boost/noncopyable.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/none.hpp b/external/boost/include/boost/none.hpp index fbff008016d1..f8018cf053e4 100644 --- a/external/boost/include/boost/none.hpp +++ b/external/boost/include/boost/none.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/numeric/conversion/cast.hpp b/external/boost/include/boost/numeric/conversion/cast.hpp index 5f194f6960a9..5b1ad9fe4459 100644 --- a/external/boost/include/boost/numeric/conversion/cast.hpp +++ b/external/boost/include/boost/numeric/conversion/cast.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/operators.hpp b/external/boost/include/boost/operators.hpp index d8f71d7f31cb..bff38b721c75 100644 --- a/external/boost/include/boost/operators.hpp +++ b/external/boost/include/boost/operators.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/optional.hpp b/external/boost/include/boost/optional.hpp index cf3f46da697e..4f3f9c38f3c2 100644 --- a/external/boost/include/boost/optional.hpp +++ b/external/boost/include/boost/optional.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/program_options.hpp b/external/boost/include/boost/program_options.hpp index 75e2805be5ec..570da5a94c34 100644 --- a/external/boost/include/boost/program_options.hpp +++ b/external/boost/include/boost/program_options.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/property_tree/json_parser.hpp b/external/boost/include/boost/property_tree/json_parser.hpp index 3d35a3e101f8..104243cd8ca8 100644 --- a/external/boost/include/boost/property_tree/json_parser.hpp +++ b/external/boost/include/boost/property_tree/json_parser.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/property_tree/ptree.hpp b/external/boost/include/boost/property_tree/ptree.hpp index bceb495d6971..7ad884aa8a11 100644 --- a/external/boost/include/boost/property_tree/ptree.hpp +++ b/external/boost/include/boost/property_tree/ptree.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/property_tree/ptree_fwd.hpp b/external/boost/include/boost/property_tree/ptree_fwd.hpp index d31a11743941..93ff95d8af69 100644 --- a/external/boost/include/boost/property_tree/ptree_fwd.hpp +++ b/external/boost/include/boost/property_tree/ptree_fwd.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/range/adaptor/reversed.hpp b/external/boost/include/boost/range/adaptor/reversed.hpp index 97956c684279..e8da5c1e8fb4 100644 --- a/external/boost/include/boost/range/adaptor/reversed.hpp +++ b/external/boost/include/boost/range/adaptor/reversed.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/range/iterator_range.hpp b/external/boost/include/boost/range/iterator_range.hpp index 7839e4384d0e..011304764ed8 100644 --- a/external/boost/include/boost/range/iterator_range.hpp +++ b/external/boost/include/boost/range/iterator_range.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/rational.hpp b/external/boost/include/boost/rational.hpp index 58bae713bd77..cc5a6550d425 100644 --- a/external/boost/include/boost/rational.hpp +++ b/external/boost/include/boost/rational.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/scoped_ptr.hpp b/external/boost/include/boost/scoped_ptr.hpp index 7179074a6689..f96846917463 100644 --- a/external/boost/include/boost/scoped_ptr.hpp +++ b/external/boost/include/boost/scoped_ptr.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/shared_ptr.hpp b/external/boost/include/boost/shared_ptr.hpp index ea2de7f83738..a57ac3c248a9 100644 --- a/external/boost/include/boost/shared_ptr.hpp +++ b/external/boost/include/boost/shared_ptr.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/classic.hpp b/external/boost/include/boost/spirit/include/classic.hpp index 4299522fa2bb..5fb9db446efe 100644 --- a/external/boost/include/boost/spirit/include/classic.hpp +++ b/external/boost/include/boost/spirit/include/classic.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/classic_core.hpp b/external/boost/include/boost/spirit/include/classic_core.hpp index 2921c5539d5f..8ad07162bb9a 100644 --- a/external/boost/include/boost/spirit/include/classic_core.hpp +++ b/external/boost/include/boost/spirit/include/classic_core.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/classic_error_handling.hpp b/external/boost/include/boost/spirit/include/classic_error_handling.hpp index 613f89ac099e..ad7da30b4196 100644 --- a/external/boost/include/boost/spirit/include/classic_error_handling.hpp +++ b/external/boost/include/boost/spirit/include/classic_error_handling.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/classic_file_iterator.hpp b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp index d0b88315f1fd..3fa37af9625c 100644 --- a/external/boost/include/boost/spirit/include/classic_file_iterator.hpp +++ b/external/boost/include/boost/spirit/include/classic_file_iterator.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/classic_utility.hpp b/external/boost/include/boost/spirit/include/classic_utility.hpp index 022f1fd7a859..528be00f5213 100644 --- a/external/boost/include/boost/spirit/include/classic_utility.hpp +++ b/external/boost/include/boost/spirit/include/classic_utility.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/phoenix.hpp b/external/boost/include/boost/spirit/include/phoenix.hpp index feff0183af98..2aa62dfd5bc6 100644 --- a/external/boost/include/boost/spirit/include/phoenix.hpp +++ b/external/boost/include/boost/spirit/include/phoenix.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi.hpp b/external/boost/include/boost/spirit/include/qi.hpp index d6e2a39ee1d9..26f96c74af0f 100644 --- a/external/boost/include/boost/spirit/include/qi.hpp +++ b/external/boost/include/boost/spirit/include/qi.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_attr.hpp b/external/boost/include/boost/spirit/include/qi_attr.hpp index 6271839a8dec..caa36eb0f472 100644 --- a/external/boost/include/boost/spirit/include/qi_attr.hpp +++ b/external/boost/include/boost/spirit/include/qi_attr.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_lit.hpp b/external/boost/include/boost/spirit/include/qi_lit.hpp index e6fb1ee413c1..9754acc12436 100644 --- a/external/boost/include/boost/spirit/include/qi_lit.hpp +++ b/external/boost/include/boost/spirit/include/qi_lit.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_optional.hpp b/external/boost/include/boost/spirit/include/qi_optional.hpp index be87648809aa..b9f785e3d374 100644 --- a/external/boost/include/boost/spirit/include/qi_optional.hpp +++ b/external/boost/include/boost/spirit/include/qi_optional.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_parse_attr.hpp b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp index 0c86ac201cff..cf6e076ecf4c 100644 --- a/external/boost/include/boost/spirit/include/qi_parse_attr.hpp +++ b/external/boost/include/boost/spirit/include/qi_parse_attr.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_sequence.hpp b/external/boost/include/boost/spirit/include/qi_sequence.hpp index e72e7b3f5ecc..710a0e9a5af8 100644 --- a/external/boost/include/boost/spirit/include/qi_sequence.hpp +++ b/external/boost/include/boost/spirit/include/qi_sequence.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/spirit/include/qi_symbols.hpp b/external/boost/include/boost/spirit/include/qi_symbols.hpp index 908271949caa..f109d7dfccb6 100644 --- a/external/boost/include/boost/spirit/include/qi_symbols.hpp +++ b/external/boost/include/boost/spirit/include/qi_symbols.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/unordered_map.hpp b/external/boost/include/boost/unordered_map.hpp index 1d3c0eada318..d8a88013461e 100644 --- a/external/boost/include/boost/unordered_map.hpp +++ b/external/boost/include/boost/unordered_map.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/uuid/uuid_generators.hpp b/external/boost/include/boost/uuid/uuid_generators.hpp index f2069f39d36e..6489b6a16070 100644 --- a/external/boost/include/boost/uuid/uuid_generators.hpp +++ b/external/boost/include/boost/uuid/uuid_generators.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/uuid/uuid_io.hpp b/external/boost/include/boost/uuid/uuid_io.hpp index d4004deb3425..61f947614c30 100644 --- a/external/boost/include/boost/uuid/uuid_io.hpp +++ b/external/boost/include/boost/uuid/uuid_io.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/variant.hpp b/external/boost/include/boost/variant.hpp index 2aa4201872da..36113d3bcc87 100644 --- a/external/boost/include/boost/variant.hpp +++ b/external/boost/include/boost/variant.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/variant/recursive_variant.hpp b/external/boost/include/boost/variant/recursive_variant.hpp index c229b4b2de3a..f0a81ac10bf4 100644 --- a/external/boost/include/boost/variant/recursive_variant.hpp +++ b/external/boost/include/boost/variant/recursive_variant.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/external/boost/include/boost/version.hpp b/external/boost/include/boost/version.hpp index f924ede7f2d6..47797f163a92 100644 --- a/external/boost/include/boost/version.hpp +++ b/external/boost/include/boost/version.hpp @@ -14,7 +14,6 @@ #pragma GCC diagnostic ignored "-Winvalid-constexpr" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmicrosoft-unqualified-friend" -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #pragma GCC diagnostic ignored "-Wnonnull" #pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wplacement-new" diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index dc82a730886a..916ca757fc98 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -93,14 +93,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper1() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index e3938563dce8..671745d585c7 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -103,14 +103,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper10() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 02fad9040b3a..68b4b7327eb3 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -104,14 +104,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper11() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index df90f2b645fe..3782ad3780dc 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -105,14 +105,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper12() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 5ed1245976bf..02cbfa890cdf 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -106,14 +106,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper13() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index d6b326122ec5..5f2a400e5283 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -94,14 +94,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper2() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 7c95ef596daa..4c043d54ea7d 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -95,14 +95,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper3() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index 61bce672200e..8e24adbcbab3 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -97,14 +97,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper4() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 993c71a174c0..4a8c15dd1c9b 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -98,14 +98,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper5() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 8adb7549d3de..57495a160956 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -99,14 +99,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper6() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 305c94d4ba60..b855c48bad27 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -100,14 +100,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper7() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index a0903f1b539d..56006a413159 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -101,14 +101,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper8() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index 75840ec8045b..d5a9b96a134d 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -102,14 +102,8 @@ namespace cppu #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~ImplHelper9() SAL_NOEXCEPT {} -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; /** Implementation helper implementing interfaces css::lang::XTypeProvider and css::uno::XInterface which supports weak mechanism to be held weakly diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index e25f3f738bfd..cee7b657e5b7 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -67,10 +67,6 @@ namespace cppu { @since UDK 3.2.1 */ -#if defined __GNUC__ && !defined __clang__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wnon-virtual-dtor" -#endif class CPPUHELPER_DLLPUBLIC PropertySetMixinImpl: public css::beans::XPropertySet, public css::beans::XFastPropertySet, @@ -412,9 +408,6 @@ private: PropertySetMixin( const PropertySetMixin&) SAL_DELETED_FUNCTION; void operator=( const PropertySetMixin&) SAL_DELETED_FUNCTION; }; -#if defined __GNUC__ && !defined __clang__ -#pragma GCC diagnostic pop -#endif } diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index d2e73d70770d..48e68c77349b 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -335,15 +335,9 @@ public: #if !defined _MSC_VER // public -> protected changes mangled names there protected: -#elif defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" #endif ~IEventNotificationHook() {} // avoid warnings about virtual members and non-virtual dtor -#if defined _MSC_VER && defined __clang__ -#pragma clang diagnostic pop -#endif }; @@ -660,23 +654,11 @@ public: #else protected: #endif -// Suppress warning about virtual functions but non-virtual destructor: -#if defined _MSC_VER -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif -#endif /** You must call disposing before destruction. */ ~OPropertySetHelper(); }; -#if defined _MSC_VER -#if defined __clang__ -#pragma clang diagnostic pop -#endif -#endif /** OPropertySetHelper plus XPropertySetOption diff --git a/shell/inc/spsupp/COMOpenDocuments.hpp b/shell/inc/spsupp/COMOpenDocuments.hpp index 44089dd40672..07cc8c3d36a5 100644 --- a/shell/inc/spsupp/COMOpenDocuments.hpp +++ b/shell/inc/spsupp/COMOpenDocuments.hpp @@ -10,14 +10,7 @@ #ifndef INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP #define INCLUDED_SHELL_INC_SPSUPP_COMOPENDOCUMENTS_HPP -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wnon-virtual-dtor" -#endif #include <spsupp_h.h> -#if defined __clang__ -#pragma clang diagnostic pop -#endif #include "COMRefCounted.hpp" #include <Objsafe.h> #include <assert.h> diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 443ff10eaae1..87231a57196f 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -80,7 +80,6 @@ gb_CFLAGS_COMMON := \ gb_CXXFLAGS_COMMON := \ -Wall \ -Wno-missing-braces \ - -Wnon-virtual-dtor \ -Wendif-labels \ -Wextra \ -Wundef \ @@ -184,7 +183,7 @@ gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \ -Wno-deprecated-declarations else gb_CXX03FLAGS := -std=gnu++98 -Wno-long-long \ - -Wno-variadic-macros -Wno-non-virtual-dtor -Wno-deprecated-declarations + -Wno-variadic-macros -Wno-deprecated-declarations endif # On Windows MSVC only supports C90 so force gnu89 (especially in clang) to diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 5b6094b560cf..928fd3400af1 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -290,7 +290,6 @@ gb_CXXFLAGS += \ -Wendif-labels \ -Wimplicit-fallthrough \ -Wno-missing-braces \ - -Wnon-virtual-dtor \ -Woverloaded-virtual \ -Wshadow \ -Wundef \ 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; 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; |