diff options
Diffstat (limited to 'test/SemaCXX/null_in_arithmetic_ops.cpp')
-rw-r--r-- | test/SemaCXX/null_in_arithmetic_ops.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/SemaCXX/null_in_arithmetic_ops.cpp b/test/SemaCXX/null_in_arithmetic_ops.cpp index fab6f10ab785..24590ce633f2 100644 --- a/test/SemaCXX/null_in_arithmetic_ops.cpp +++ b/test/SemaCXX/null_in_arithmetic_ops.cpp @@ -64,12 +64,12 @@ void f() { a |= NULL; // expected-warning{{use of NULL in arithmetic operation}} a ^= NULL; // expected-warning{{use of NULL in arithmetic operation}} - b = a < NULL || NULL < a; // expected-warning 2{{use of NULL in arithmetic operation}} - b = a > NULL || NULL > a; // expected-warning 2{{use of NULL in arithmetic operation}} - b = a <= NULL || NULL <= a; // expected-warning 2{{use of NULL in arithmetic operation}} - b = a >= NULL || NULL >= a; // expected-warning 2{{use of NULL in arithmetic operation}} - b = a == NULL || NULL == a; // expected-warning 2{{use of NULL in arithmetic operation}} - b = a != NULL || NULL != a; // expected-warning 2{{use of NULL in arithmetic operation}} + b = a < NULL || a > NULL; // expected-warning 2{{comparison between NULL and non-pointer ('int' and NULL)}} + b = NULL < a || NULL > a; // expected-warning 2{{comparison between NULL and non-pointer (NULL and 'int')}} + b = a <= NULL || a >= NULL; // expected-warning 2{{comparison between NULL and non-pointer ('int' and NULL)}} + b = NULL <= a || NULL >= a; // expected-warning 2{{comparison between NULL and non-pointer (NULL and 'int')}} + b = a == NULL || a != NULL; // expected-warning 2{{comparison between NULL and non-pointer ('int' and NULL)}} + b = NULL == a || NULL != a; // expected-warning 2{{comparison between NULL and non-pointer (NULL and 'int')}} b = &a < NULL || NULL < &a || &a > NULL || NULL > &a; b = &a <= NULL || NULL <= &a || &a >= NULL || NULL >= &a; @@ -82,7 +82,7 @@ void f() { b = NULL <= NULL || NULL >= NULL; b = NULL == NULL || NULL != NULL; - b = ((NULL)) != a; // expected-warning{{use of NULL in arithmetic operation}} + b = ((NULL)) != a; // expected-warning{{comparison between NULL and non-pointer (NULL and 'int')}} // Check that even non-standard pointers don't warn. b = c == NULL || NULL == c || c != NULL || NULL != c; |