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:37:00 +0200 |
| commit | 968bdedd8f8647945b1742f728a7ec7ab0733207 (patch) | |
| tree | dc110f1abd58cc8d390bfc7a043e76577f12a6f3 /sal | |
| parent | trying to fix mingw build (diff) | |
| download | core-968bdedd8f8647945b1742f728a7ec7ab0733207.tar.gz core-968bdedd8f8647945b1742f728a7ec7ab0733207.zip | |
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
(cherry picked from commit 271c4e2fe53c6fe159789db27507804133e72814)
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/inc/rtl/ref.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sal/inc/rtl/ref.hxx b/sal/inc/rtl/ref.hxx index 19c77a5f5998..f8d2a1f787a4 100644 --- a/sal/inc/rtl/ref.hxx +++ b/sal/inc/rtl/ref.hxx @@ -49,7 +49,9 @@ public: */ virtual oslInterlockedCount SAL_CALL release() = 0; +#if !defined _MSC_VER // public -> protected changes mangled names there protected: +#endif ~IReference() {} // avoid warnings about virtual members and non-virtual dtor }; |