From 745dcdb1e7e4c070a95db7a1c52840bd65eefa63 Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Sat, 25 Dec 2021 12:40:59 +0100 Subject: [PATCH] Drop MSVC special-casing for OWeakObject ctor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was introduced in commit 0c38ca4412531adafdb9cbac9dfa7f6f8e0d9882 author Daniel Boelzle 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 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 --- cppuhelper/source/weak.cxx | 10 ---------- include/cppuhelper/weak.hxx | 8 +------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx index 0119123aed74..f45f433e9ce2 100644 --- a/cppuhelper/source/weak.cxx +++ b/cppuhelper/source/weak.cxx @@ -205,16 +205,6 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference //-- OWeakObject ------------------------------------------------------- - -#ifdef _MSC_VER -// Accidentally occurs in msvc mapfile = > had to be outlined. -OWeakObject::OWeakObject() - : m_refCount( 0 ), - m_pWeakConnectionPoint( nullptr ) -{ -} -#endif - // XInterface Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) { 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 & )