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 /include/tools/errinf.hxx | |
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 'include/tools/errinf.hxx')
-rw-r--r-- | include/tools/errinf.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index e7777eb72173..ededffb5f77a 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -60,7 +60,7 @@ private: public: DynamicErrorInfo(sal_uIntPtr lUserId, sal_uInt16 nMask); - virtual ~DynamicErrorInfo(); + virtual ~DynamicErrorInfo() override; operator sal_uIntPtr() const; sal_uInt16 GetDialogMask() const; @@ -91,7 +91,7 @@ public: const OUString & rTheArg2, sal_uInt16 nMask = 0): DynamicErrorInfo(nUserID, nMask), aArg1(rTheArg1), aArg2(rTheArg2) {} - virtual ~TwoStringErrorInfo() {} + virtual ~TwoStringErrorInfo() override {} const OUString& GetArg1() const { return aArg1; } const OUString& GetArg2() const { return aArg2; } |