summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-11-27 09:52:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-11-28 08:44:53 +0100
commit80c0767b98c656e844b86bcc4bde93c232ee7bab (patch)
tree74b0d23c67497e381c5cccfb308decb714fc3b0f
parentSilence clang-cl warnings in gperf-generated code (diff)
downloadcore-80c0767b98c656e844b86bcc4bde93c232ee7bab.tar.gz
core-80c0767b98c656e844b86bcc4bde93c232ee7bab.zip
Work around clang-cl PR25641
"defaultbootstrap.o : error LNK2001: unresolved external symbol '[thunk]:private: virtual class com::sun::star::uno::Sequence<class rtl::OUString> __cdecl cppuhelper::ServiceManager::getAvailableServiceNames`adjustor{24}' (void)' (?getAvailableServiceNames@ServiceManager@cppuhelper@@GBI@EAA?AV?$Sequence@VOUString@rtl@@@uno@star@sun@com@@XZ)" Change-Id: I04b7353305ffeeb316d70ab8408aeb52ea0f7186
-rw-r--r--cppuhelper/source/servicemanager.cxx2
-rw-r--r--cppuhelper/source/servicemanager.hxx2
2 files changed, 3 insertions, 1 deletions
diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx
index 9f93d70e12c2..2d824d4aaa3f 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -1353,6 +1353,8 @@ sal_Bool cppuhelper::ServiceManager::hasPropertyByName(
return Name == "DefaultContext";
}
+cppuhelper::ServiceManager::~ServiceManager() {}
+
void cppuhelper::ServiceManager::disposing(
css::lang::EventObject const & Source)
throw (css::uno::RuntimeException, std::exception)
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx
index d7f8f9056c17..c217cbce39f5 100644
--- a/cppuhelper/source/servicemanager.hxx
+++ b/cppuhelper/source/servicemanager.hxx
@@ -204,7 +204,7 @@ public:
std::shared_ptr< Data::Implementation > & implementation);
private:
- virtual ~ServiceManager() {}
+ virtual ~ServiceManager();
virtual void SAL_CALL disposing() override;