summaryrefslogtreecommitdiff
path: root/include/unoidl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/unoidl
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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 'include/unoidl')
-rw-r--r--include/unoidl/unoidl.hxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 8837c6d961a6..4ab5d31e0047 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -92,7 +92,7 @@ public:
protected:
explicit SAL_DLLPRIVATE Entity(Sort sort): sort_(sort) {}
- virtual SAL_DLLPRIVATE ~Entity() throw ();
+ virtual SAL_DLLPRIVATE ~Entity() throw () override;
private:
Sort sort_;
@@ -106,7 +106,7 @@ public:
protected:
SAL_DLLPRIVATE MapCursor() {}
- virtual SAL_DLLPRIVATE ~MapCursor() throw();
+ virtual SAL_DLLPRIVATE ~MapCursor() throw() override;
};
class LO_DLLPUBLIC_UNOIDL ModuleEntity: public Entity {
@@ -120,7 +120,7 @@ public:
protected:
SAL_DLLPRIVATE ModuleEntity(): Entity(SORT_MODULE) {}
- virtual SAL_DLLPRIVATE ~ModuleEntity() throw ();
+ virtual SAL_DLLPRIVATE ~ModuleEntity() throw () override;
};
class LO_DLLPUBLIC_UNOIDL PublishableEntity: public Entity {
@@ -137,7 +137,7 @@ protected:
Entity(sort), published_(published), annotations_(annotations)
{}
- virtual SAL_DLLPRIVATE ~PublishableEntity() throw ();
+ virtual SAL_DLLPRIVATE ~PublishableEntity() throw () override;
private:
bool published_;
@@ -171,7 +171,7 @@ public:
std::vector< Member > const & getMembers() const { return members_; }
private:
- virtual SAL_DLLPRIVATE ~EnumTypeEntity() throw ();
+ virtual SAL_DLLPRIVATE ~EnumTypeEntity() throw () override;
std::vector< Member > members_;
};
@@ -205,7 +205,7 @@ public:
{ return directMembers_; }
private:
- virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw ();
+ virtual SAL_DLLPRIVATE ~PlainStructTypeEntity() throw () override;
rtl::OUString directBase_;
std::vector< Member > directMembers_;
@@ -248,7 +248,7 @@ public:
std::vector< Member > const & getMembers() const { return members_; }
private:
- virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw ();
+ virtual SAL_DLLPRIVATE ~PolymorphicStructTypeTemplateEntity() throw () override;
std::vector< rtl::OUString > typeParameters_;
std::vector< Member > members_;
@@ -284,7 +284,7 @@ public:
{ return directMembers_; }
private:
- virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw ();
+ virtual SAL_DLLPRIVATE ~ExceptionTypeEntity() throw () override;
rtl::OUString directBase_;
std::vector< Member > directMembers_;
@@ -382,7 +382,7 @@ public:
{ return directMethods_; }
private:
- virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw ();
+ virtual SAL_DLLPRIVATE ~InterfaceTypeEntity() throw () override;
std::vector< AnnotatedReference > directMandatoryBases_;
std::vector< AnnotatedReference > directOptionalBases_;
@@ -401,7 +401,7 @@ public:
const rtl::OUString& getType() const { return type_; }
private:
- virtual SAL_DLLPRIVATE ~TypedefEntity() throw ();
+ virtual SAL_DLLPRIVATE ~TypedefEntity() throw () override;
rtl::OUString type_;
};
@@ -480,7 +480,7 @@ public:
std::vector< Member > const & getMembers() const { return members_; }
private:
- virtual SAL_DLLPRIVATE ~ConstantGroupEntity() throw ();
+ virtual SAL_DLLPRIVATE ~ConstantGroupEntity() throw () override;
std::vector< Member > members_;
};
@@ -541,7 +541,7 @@ public:
{ return constructors_; }
private:
- virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw ();
+ virtual SAL_DLLPRIVATE ~SingleInterfaceBasedServiceEntity() throw () override;
rtl::OUString base_;
std::vector< Constructor > constructors_;
@@ -618,7 +618,7 @@ public:
{ return directProperties_; }
private:
- virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw ();
+ virtual SAL_DLLPRIVATE ~AccumulationBasedServiceEntity() throw () override;
std::vector< AnnotatedReference > directMandatoryBaseServices_;
std::vector< AnnotatedReference > directOptionalBaseServices_;
@@ -642,7 +642,7 @@ public:
const rtl::OUString& getBase() const { return base_; }
private:
- virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw ();
+ virtual SAL_DLLPRIVATE ~InterfaceBasedSingletonEntity() throw () override;
rtl::OUString base_;
};
@@ -660,7 +660,7 @@ public:
const rtl::OUString& getBase() const { return base_; }
private:
- virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw ();
+ virtual SAL_DLLPRIVATE ~ServiceBasedSingletonEntity() throw () override;
rtl::OUString base_;
};
@@ -677,7 +677,7 @@ public:
protected:
SAL_DLLPRIVATE Provider() {}
- virtual SAL_DLLPRIVATE ~Provider() throw ();
+ virtual SAL_DLLPRIVATE ~Provider() throw () override;
};
class LO_DLLPUBLIC_UNOIDL Manager: public salhelper::SimpleReferenceObject {
@@ -694,7 +694,7 @@ public:
rtl::Reference< MapCursor > createCursor(rtl::OUString const & name) const;
private:
- virtual SAL_DLLPRIVATE ~Manager() throw ();
+ virtual SAL_DLLPRIVATE ~Manager() throw () override;
SAL_DLLPRIVATE rtl::Reference< Provider > loadProvider(
rtl::OUString const & uri);