diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-14 08:28:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-14 08:32:51 +0200 |
| commit | 271c4e2fe53c6fe159789db27507804133e72814 (patch) | |
| tree | 66d7ad60e6556b3a8569f8c51c7dfe583df81d5f /cppuhelper/inc/cppuhelper/implbase12.hxx | |
| parent | 508291bab3c4bdc1d6aa43f1a0b1388ba19bd129 (diff) | |
Revert MSVC ABI incompatible URE change (public -> protected)
...the mangled names of the corresponding symbols change with MSVC if you change
a member from public to protected. This had been changed with
6e67c03dc0225fc66343546b14e902b9d238b1a3 "Enable -Wnon-virtual-dtor for GCC 4.6"
but should only be necessary for GCC, not for MSVC, so can simply be reverted
under _MSC_VER.
Change-Id: Id22aadaff3d7f30ed824f39fe22eab7ca39bd408
Diffstat (limited to 'cppuhelper/inc/cppuhelper/implbase12.hxx')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase12.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase12.hxx b/cppuhelper/inc/cppuhelper/implbase12.hxx index 934dfbe55b83..b9781690df23 100644 --- a/cppuhelper/inc/cppuhelper/implbase12.hxx +++ b/cppuhelper/inc/cppuhelper/implbase12.hxx @@ -97,7 +97,9 @@ namespace cppu virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (com::sun::star::uno::RuntimeException) { return ImplHelper_getImplementationId( cd::get() ); } +#if !defined _MSC_VER // public -> protected changes mangled names there protected: +#endif ~ImplHelper12() throw () {} }; /** Implementation helper implementing interfaces com::sun::star::lang::XTypeProvider and |