diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 09:56:01 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 09:56:01 +0200 |
| commit | df8d092c3a3c65bc23bc3c1da281cc4cb10a1e3d (patch) | |
| tree | ea5daefc9c1665ab14aeeedc0de4298c7c85a8b1 /compilerplugins/clang/stringconstant.cxx | |
| parent | 33cbc99fea5a3e4b87e883fd60ec97d4503109f3 (diff) | |
Adapt pathname checks to mixed usage of \ and / on Windows
Change-Id: I91bc89a9076c6642e06b238f65f2d31a1d20c6b5
Diffstat (limited to 'compilerplugins/clang/stringconstant.cxx')
| -rw-r--r-- | compilerplugins/clang/stringconstant.cxx | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx index 8616096a4f8c..a5ea9506f153 100644 --- a/compilerplugins/clang/stringconstant.cxx +++ b/compilerplugins/clang/stringconstant.cxx @@ -320,7 +320,9 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) { // u.equalsIngoreAsciiCase("foo"): auto file = compiler.getSourceManager().getFilename( compiler.getSourceManager().getSpellingLoc(expr->getLocStart())); - if (file == SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx") { + if (loplugin::isSamePathname( + file, SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx")) + { return true; } handleChar( @@ -336,7 +338,9 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) { // u.equalsIngoreAsciiCase("foo"): auto file = compiler.getSourceManager().getFilename( compiler.getSourceManager().getSpellingLoc(expr->getLocStart())); - if (file == SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx") { + if (loplugin::isSamePathname( + file, SRCDIR "/sal/qa/rtl/strings/test_oustring_compare.cxx")) + { return true; } handleCharLen( @@ -702,8 +706,9 @@ bool StringConstant::VisitCallExpr(CallExpr const * expr) { auto file = compiler.getSourceManager().getFilename( compiler.getSourceManager().getSpellingLoc( expr->getLocStart())); - if (file - == SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx") + if (loplugin::isSamePathname( + file, + SRCDIR "/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx")) { return true; } @@ -990,12 +995,14 @@ bool StringConstant::VisitCXXConstructExpr(CXXConstructExpr const * expr) { compiler.getSourceManager() .getSpellingLoc( expr->getLocStart())); - if (file - == (SRCDIR - "/sal/qa/rtl/strings/test_ostring_concat.cxx") - || (file - == (SRCDIR - "/sal/qa/rtl/strings/test_oustring_concat.cxx"))) + if (loplugin::isSamePathname( + file, + (SRCDIR + "/sal/qa/rtl/strings/test_ostring_concat.cxx")) + || loplugin::isSamePathname( + file, + (SRCDIR + "/sal/qa/rtl/strings/test_oustring_concat.cxx"))) { return true; } |