compilerplugins/clang/stringconcat.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 1028e5192c5e131513b6f2df02d39e7ed5e4dcb5 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Feb 1 15:38:17 2017 +0100 More ctor check fixes Change-Id: Ifcce63b975fb7c4ac7e7545e3eadcc6f7f12e466 diff --git a/compilerplugins/clang/stringconcat.cxx b/compilerplugins/clang/stringconcat.cxx index 670d892..1efdea8 100644 --- a/compilerplugins/clang/stringconcat.cxx +++ b/compilerplugins/clang/stringconcat.cxx @@ -28,8 +28,11 @@ Expr const * stripCtor(Expr const * expr) { return expr; } auto qt = loplugin::DeclCheck(e3->getConstructor()); - if (!qt.Function("OString").Class("OString").Namespace("rtl").GlobalNamespace() && - !qt.Function("OUString").Class("OUString").Namespace("rtl").GlobalNamespace()) { + if (!((qt.MemberFunction().Class("OString").Namespace("rtl") + .GlobalNamespace()) + || (qt.MemberFunction().Class("OUString").Namespace("rtl") + .GlobalNamespace()))) + { return expr; } if (e3->getNumArgs() != 2) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits