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 /libcmis | |
| 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 'libcmis')
| -rw-r--r-- | libcmis/libcmis-0.1.0-non-virtual-dtor.patch | 11 | ||||
| -rw-r--r-- | libcmis/makefile.mk | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libcmis/libcmis-0.1.0-non-virtual-dtor.patch b/libcmis/libcmis-0.1.0-non-virtual-dtor.patch new file mode 100644 index 000000000000..764c7b2f6322 --- /dev/null +++ b/libcmis/libcmis-0.1.0-non-virtual-dtor.patch @@ -0,0 +1,11 @@ +--- misc/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2011-09-30 20:35:37.000000000 +0200 ++++ misc/build/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2012-03-13 21:46:03.985188599 +0100 +@@ -39,6 +39,8 @@ + class CmisObject + { + public: ++ virtual ~CmisObject() {} ++ + virtual std::string getId( ) = 0; + virtual std::string getName( ) = 0; + diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk index 4e20948e1f37..855a67f62d79 100644 --- a/libcmis/makefile.mk +++ b/libcmis/makefile.mk @@ -48,6 +48,7 @@ ADDITIONAL_FILES=src$/libcmis$/makefile.mk PATCH_FILES=$(TARFILE_NAME).patch #https://sourceforge.net/p/libcmis/tickets/1/ PATCH_FILES+=libcmis-0001-virtualdtor.patch +PATCH_FILES+=libcmis-0.1.0-non-virtual-dtor.patch BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/libcmis |