compilerplugins/clang/test/typedefparam.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 88b076c4598b48d9d7b56b1f3e417a68bec80dfd
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Mar 27 11:06:57 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Mar 27 14:17:39 2019 +0100
Adapt to Windows sal_uIntPtr/sal_uLong typedefs
Change-Id: Ic6f269f75e2b64e0c2a53455e9ee4ccf9891cfb0
Reviewed-on: https://gerrit.libreoffice.org/69807
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/compilerplugins/clang/test/typedefparam.cxx
b/compilerplugins/clang/test/typedefparam.cxx
index 63609347dda8..777a5128db0f 100644
--- a/compilerplugins/clang/test/typedefparam.cxx
+++ b/compilerplugins/clang/test/typedefparam.cxx
@@ -18,12 +18,12 @@ class Foo
};
void Foo::bar(sal_uLong)
-// expected-error@-1 {{function param 1 at definition site does not match
function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs
'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+// expected-error-re@-1 {{function param 1 at definition site does not match
function param at declaration site, 'sal_uLong' (aka 'unsigned {{.+}}') vs
'sal_uIntPtr' (aka 'unsigned {{.+}}') [loplugin:typedefparam]}}
{
}
sal_uLong Foo::bar()
-// expected-error@-1 {{function return type at definition site does not match
function param at declaration site, 'sal_uLong' (aka 'unsigned long') vs
'sal_uIntPtr' (aka 'unsigned long') [loplugin:typedefparam]}}
+// expected-error-re@-1 {{function return type at definition site does not
match function param at declaration site, 'sal_uLong' (aka 'unsigned {{.+}}')
vs 'sal_uIntPtr' (aka 'unsigned {{.+}}') [loplugin:typedefparam]}}
{
return 1;
}
@@ -71,9 +71,9 @@ struct Struct1
struct Struct2 : public Struct1
{
virtual sal_uLong foo1() override;
- // expected-error@-1 {{method return type does not match overridden method
'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long')
[loplugin:typedefparam]}}
+ // expected-error-re@-1 {{method return type does not match overridden
method 'sal_uLong' (aka 'unsigned {{.+}}') vs 'sal_uIntPtr' (aka 'unsigned
{{.+}}') [loplugin:typedefparam]}}
virtual void foo2(sal_uLong) override;
- // expected-error@-1 {{method param 1 does not match overridden method
param 'sal_uLong' (aka 'unsigned long') vs 'sal_uIntPtr' (aka 'unsigned long')
[loplugin:typedefparam]}}
+ // expected-error-re@-1 {{method param 1 does not match overridden method
param 'sal_uLong' (aka 'unsigned {{.+}}') vs 'sal_uIntPtr' (aka 'unsigned
{{.+}}') [loplugin:typedefparam]}}
};
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
