diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-01-14 09:55:41 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-01-14 20:22:35 +0100 |
commit | 9013666c5ad32c5733be7ae27e872ff0d1b3db7b (patch) | |
tree | ad2f75a7cd34960ed3d993a77257c670a3c813ab /compilerplugins | |
parent | 3831aa8114906e17fcc2d4d0ea689d11f37c4407 (diff) |
cid#1471346 Uncaught exception
Change-Id: I535affd6597636aa32e1cf9c6005238f9503ef6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109266
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'compilerplugins')
-rw-r--r-- | compilerplugins/clang/unusedvariableplus.cxx | 3 | ||||
-rw-r--r-- | compilerplugins/clang/useuniqueptr.cxx | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/compilerplugins/clang/unusedvariableplus.cxx b/compilerplugins/clang/unusedvariableplus.cxx index e3e5000d0627..596dc7978f8a 100644 --- a/compilerplugins/clang/unusedvariableplus.cxx +++ b/compilerplugins/clang/unusedvariableplus.cxx @@ -432,7 +432,8 @@ public: "vcl::ScopedAntialiasing", "vcl::WizardTravelSuspension", "VerbExecutionControllerGuard", - "VersionCompat", + "VersionCompatRead", + "VersionCompatWrite", "SlideShowImpl::WaitSymbolLock", "webdav_ucp::NeonHeadRequest", "webdav_ucp::NeonPropFindRequest", diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx index 3445510a206d..a25b016c6799 100644 --- a/compilerplugins/clang/useuniqueptr.cxx +++ b/compilerplugins/clang/useuniqueptr.cxx @@ -344,7 +344,9 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C if (fn == SRCDIR "/vcl/source/gdi/regband.cxx") return; // this thing relies on explicit delete - if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("VersionCompat").GlobalNamespace()) + if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("VersionCompatRead").GlobalNamespace()) + return; + if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("VersionCompatWrite").GlobalNamespace()) return; if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("IMapCompat").GlobalNamespace()) return; |