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 /cppuhelper/unotypes | |
parent | fe4be5047988782f3143a1af505c5eecb3f2af5a (diff) |
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 'cppuhelper/unotypes')
-rw-r--r-- | cppuhelper/unotypes/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cppuhelper/unotypes/Makefile b/cppuhelper/unotypes/Makefile index fae02aeca501..c92ad45a9304 100644 --- a/cppuhelper/unotypes/Makefile +++ b/cppuhelper/unotypes/Makefile @@ -26,12 +26,12 @@ # instead of those above. gb_PARTIALBUILD:=T -include $(GBUILDDIR)/gbuild_simple.mk +include $(GBUILDDIR)/gbuild.mk all: private_types.flag unotypes.flag # private_types -private_types.flag: private_types.rdb +private_types.flag: private_types.rdb $(gb_UnoApiTarget_CPPUMAKERTARGET) $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< \ -Tcppuhelper.detail.XExceptionThrower \ @@ -48,10 +48,11 @@ XExceptionThrower.urd: $(SRCDIR)/cppuhelper/unotypes/cppuhelper/detail/XExceptio $(call gb_Helper_execute,idlc) -I. -I$(OUTDIR_FOR_BUILD)/idl -O. $<) # unotypes -unotypes.flag: +unotypes.flag: $(gb_UnoApiTarget_CPPUMAKERTARGET) $(call gb_Helper_abbreviate_dirs_native, \ $(call gb_Helper_execute,cppumaker) -O. -BUCR -C \ $(foreach type,$(UNOTYPES),-T$(type)) $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb) + touch $@ UNOTYPES := \ com.sun.star.beans.PropertyAttribute \ |