diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /cppuhelper | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/component_context.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/macro_expander.cxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.cxx | 6 | ||||
-rw-r--r-- | cppuhelper/source/servicemanager.hxx | 2 | ||||
-rw-r--r-- | cppuhelper/source/typemanager.cxx | 50 | ||||
-rw-r--r-- | cppuhelper/source/typemanager.hxx | 2 |
7 files changed, 33 insertions, 33 deletions
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx index 097ad9bf33a9..b1f7ff7722ed 100644 --- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx +++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx @@ -48,7 +48,7 @@ class ContainerListener : public ::cppu::WeakImplHelper1< XEventListener > public: explicit ContainerListener(ContainerStats *pStats) : m_pStats(pStats) { m_pStats->m_nAlive++; } - virtual ~ContainerListener() { m_pStats->m_nAlive--; } + virtual ~ContainerListener() override { m_pStats->m_nAlive--; } virtual void SAL_CALL disposing( const EventObject& ) throw (RuntimeException, std::exception) override { diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index 8e75d5f4dd68..5dfb0714e1d7 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -153,7 +153,7 @@ public: ComponentContext( ContextEntry_Init const * pEntries, sal_Int32 nEntries, Reference< XComponentContext > const & xDelegate ); - virtual ~ComponentContext(); + virtual ~ComponentContext() override; // XComponentContext virtual Any SAL_CALL getValueByName( OUString const & rName ) diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx index df55a0625131..8a4a2e223721 100644 --- a/cppuhelper/source/macro_expander.cxx +++ b/cppuhelper/source/macro_expander.cxx @@ -129,7 +129,7 @@ public: inline Bootstrap_MacroExpander() : t_uno_impl( m_mutex ) {} - virtual ~Bootstrap_MacroExpander(); + virtual ~Bootstrap_MacroExpander() override; // XMacroExpander impl virtual OUString SAL_CALL expandMacros( OUString const & exp ) diff --git a/cppuhelper/source/servicemanager.cxx b/cppuhelper/source/servicemanager.cxx index 75894244e96e..a4267f9d8442 100644 --- a/cppuhelper/source/servicemanager.cxx +++ b/cppuhelper/source/servicemanager.cxx @@ -449,7 +449,7 @@ public: const ContentEnumeration& operator=(const ContentEnumeration&) = delete; private: - virtual ~ContentEnumeration() {} + virtual ~ContentEnumeration() override {} virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; @@ -508,7 +508,7 @@ public: const SingletonFactory& operator=(const SingletonFactory&) = delete; private: - virtual ~SingletonFactory() {} + virtual ~SingletonFactory() override {} virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( @@ -564,7 +564,7 @@ public: const ImplementationWrapper& operator=(const ImplementationWrapper&) = delete; private: - virtual ~ImplementationWrapper() {} + virtual ~ImplementationWrapper() override {} virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index 8c81fd087522..6f235040de1b 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -219,7 +219,7 @@ public: std::shared_ptr< Data::Implementation > & implementation); private: - virtual ~ServiceManager(); + virtual ~ServiceManager() override; virtual void SAL_CALL disposing() override; diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index 8fbee37ddcab..f232c6c1c68f 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -89,7 +89,7 @@ public: {} private: - virtual ~SimpleTypeDescription() {} + virtual ~SimpleTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -113,7 +113,7 @@ public: { assert(manager.is()); } private: - virtual ~SequenceTypeDescription() {} + virtual ~SequenceTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -137,7 +137,7 @@ class PublishableDescription: protected: explicit PublishableDescription(bool published): published_(published) {} - virtual ~PublishableDescription() {} + virtual ~PublishableDescription() override {} private: virtual sal_Bool SAL_CALL isPublished() throw (css::uno::RuntimeException, std::exception) override @@ -158,7 +158,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~ModuleDescription() {} + virtual ~ModuleDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -210,7 +210,7 @@ public: { assert(entity.is()); } private: - virtual ~EnumTypeDescription() {} + virtual ~EnumTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -272,7 +272,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~PlainStructTypeDescription() {} + virtual ~PlainStructTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -348,7 +348,7 @@ public: {} private: - virtual ~ParameterizedMemberTypeDescription() {} + virtual ~ParameterizedMemberTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -378,7 +378,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~PolymorphicStructTypeTemplateDescription() {} + virtual ~PolymorphicStructTypeTemplateDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -476,7 +476,7 @@ public: } private: - virtual ~InstantiatedPolymorphicStructTypeDescription() {} + virtual ~InstantiatedPolymorphicStructTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -581,7 +581,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~ExceptionTypeDescription() {} + virtual ~ExceptionTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -649,7 +649,7 @@ public: { assert(manager.is()); } private: - virtual ~AttributeDescription() {} + virtual ~AttributeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -733,7 +733,7 @@ public: { assert(manager.is()); } private: - virtual ~MethodParameter() {} + virtual ~MethodParameter() override {} virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } @@ -781,7 +781,7 @@ public: { assert(manager.is()); } private: - virtual ~MethodDescription() {} + virtual ~MethodDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -916,7 +916,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~InterfaceTypeDescription() {} + virtual ~InterfaceTypeDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1020,7 +1020,7 @@ public: unoidl::ConstantGroupEntity::Member const & member); private: - virtual ~ConstantDescription() {} + virtual ~ConstantDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1092,7 +1092,7 @@ public: { assert(entity.is()); } private: - virtual ~ConstantGroupDescription() {} + virtual ~ConstantGroupDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1138,7 +1138,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~TypedefDescription() {} + virtual ~TypedefDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1169,7 +1169,7 @@ public: { assert(manager.is()); } private: - virtual ~ConstructorParameter() {} + virtual ~ConstructorParameter() override {} virtual rtl::OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) override { return parameter_.name; } @@ -1210,7 +1210,7 @@ public: { assert(manager.is()); } private: - virtual ~ConstructorDescription() {} + virtual ~ConstructorDescription() override {} virtual sal_Bool SAL_CALL isDefaultConstructor() throw (css::uno::RuntimeException, std::exception) override @@ -1279,7 +1279,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~SingleInterfaceBasedServiceDescription() {} + virtual ~SingleInterfaceBasedServiceDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1382,7 +1382,7 @@ public: { assert(manager.is()); } private: - virtual ~PropertyDescription() {} + virtual ~PropertyDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1421,7 +1421,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~AccumulationBasedServiceDescription() {} + virtual ~AccumulationBasedServiceDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1591,7 +1591,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~InterfaceBasedSingletonDescription() {} + virtual ~InterfaceBasedSingletonDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1637,7 +1637,7 @@ public: { assert(manager.is()); assert(entity.is()); } private: - virtual ~ServiceBasedSingletonDescription() {} + virtual ~ServiceBasedSingletonDescription() override {} virtual css::uno::TypeClass SAL_CALL getTypeClass() throw (css::uno::RuntimeException, std::exception) override @@ -1683,7 +1683,7 @@ public: } private: - virtual ~Enumeration() {} + virtual ~Enumeration() override {} virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override diff --git a/cppuhelper/source/typemanager.hxx b/cppuhelper/source/typemanager.hxx index c47fb6f6e489..945438a2802d 100644 --- a/cppuhelper/source/typemanager.hxx +++ b/cppuhelper/source/typemanager.hxx @@ -64,7 +64,7 @@ public: rtl::OUString const & name); private: - virtual ~TypeManager() throw (); + virtual ~TypeManager() throw () override; virtual void SAL_CALL disposing() override; |