diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-14 13:27:56 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-14 13:32:02 +0100 |
| commit | 6e67c03dc0225fc66343546b14e902b9d238b1a3 (patch) | |
| tree | 6e078783d65e280a721b4e46f0ae0ca6b950f121 /connectivity/source/drivers/mozab/pre_include_mozilla.h | |
| parent | fdo#47246: dtrans: fix multiply linked ImplHelper (diff) | |
| download | core-6e67c03dc0225fc66343546b14e902b9d238b1a3.tar.gz core-6e67c03dc0225fc66343546b14e902b9d238b1a3.zip | |
Enable -Wnon-virtual-dtor for GCC 4.6
...which has the necessary features to support it.
Change a lot of classes to either contain a protected non-virtual dtor
(which is backwards compatible, so even works for cppumaker-generated
UNO headers) or a public virtual one.
cppuhelper/propertysetmixin.hxx still needs to disable the warning, as
the relevant class has a non-virtual dtor but friends, which would still
cause GCC to warn.
Includes a patch for libcmis, intended to be upstreamed.
Diffstat (limited to 'connectivity/source/drivers/mozab/pre_include_mozilla.h')
| -rwxr-xr-x | connectivity/source/drivers/mozab/pre_include_mozilla.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 7e2c5fe6607d..81e407ba37d4 100755 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -55,8 +55,9 @@ #endif #endif -#if defined __GNUC__ - #pragma GCC system_header +#if defined __GNUC__ && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wnon-virtual-dtor" #elif defined __SUNPRO_CC #pragma disable_warn #elif defined _MSC_VER |