diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-25 12:40:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-01-04 08:09:48 +0100 |
| commit | 745dcdb1e7e4c070a95db7a1c52840bd65eefa63 (patch) | |
| tree | 9ed3f9529a79dc0bbddaae1b76074e518e68d5f9 /include | |
| parent | 492a64a694679bbf0fad2b7ef2a5ca0941f7eed7 (diff) | |
Drop MSVC special-casing for OWeakObject ctor
It was introduced in commit 0c38ca4412531adafdb9cbac9dfa7f6f8e0d9882
author Daniel Boelzle <dbo@openoffice.org>
date Mon Nov 18 08:59:15 2002 +0000
#104560# outlining of msvc mapfile symbols
cppuhelper/source/msvc_win32_intel.map was dropped in commit
b222aa8fff63c803781703e72366ca203f3e6a76
author Matúš Kukan <matus.kukan@gmail.com>
date Tue Aug 23 15:03:09 2011 +0200
cppuhelper: convert to gbuild
The symbol '??0OWeakObject@cppu@@QEAA@XZ' is still exported from
cppuhelper3MSC.dll (checked using dumpbin, that number and names of
exported symbols are the same), thanks to the CPPUHELPER_DLLPUBLIC
macro at the class, that expands to __declspec(dllexport) [1], [2].
Hence, this patch is expected to not cause an ABI change.
[1] https://docs.microsoft.com/en-us/cpp/cpp/dllexport-dllimport
[2] https://docs.microsoft.com/en-us/cpp/build/exporting-from-a-dll-using-declspec-dllexport
Change-Id: I895c350970f0e4e0adc1ba90f60925f8d4ba3941
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127471
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/cppuhelper/weak.hxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index ef9ed7ffa807..b8e4e9955d9b 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -95,12 +95,6 @@ public: {} /// @endcond -#ifdef _MSC_VER - /** Default Constructor. Sets the reference count to zero. - Accidentally occurs in msvc mapfile = > had to be outlined. - */ - OWeakObject(); -#else /** Default Constructor. Sets the reference count to zero. */ OWeakObject() @@ -108,7 +102,7 @@ public: , m_pWeakConnectionPoint( NULL ) , m_pReserved(NULL) {} -#endif + /** Dummy copy constructor. Set the reference count to zero. */ OWeakObject( const OWeakObject & ) |