summaryrefslogtreecommitdiff
path: root/compilerplugins
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-01 15:38:17 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-01 15:38:50 +0100
commit1028e5192c5e131513b6f2df02d39e7ed5e4dcb5 (patch)
treefe9b91e7568788105b52fc056b43c54727a52884 /compilerplugins
parenta4d5d69eb4a1f5f889c933e5a801582f31c6ad80 (diff)
More ctor check fixes
Change-Id: Ifcce63b975fb7c4ac7e7545e3eadcc6f7f12e466
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/stringconcat.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/compilerplugins/clang/stringconcat.cxx b/compilerplugins/clang/stringconcat.cxx
index 670d8929016a..1efdea8875da 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) {