diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2011-02-19 00:13:59 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2011-02-19 00:13:59 +0000 |
| commit | 9c9127eacea4d58bf328de90d7da3245a552b9c4 (patch) | |
| tree | ecfb4845d782535e7b16b00a289f97b4fe691018 /clang/test/SemaCXX/nullptr.cpp | |
| parent | fc1ad1f3713e65b5c2773341d31a3ae12f9258a7 (diff) | |
| download | bcm5719-llvm-9c9127eacea4d58bf328de90d7da3245a552b9c4.tar.gz bcm5719-llvm-9c9127eacea4d58bf328de90d7da3245a552b9c4.zip | |
Fix a missed case in the NULL operand to conditional operator
diagnostics.
Patch by Stephen Hines.
llvm-svn: 125998
Diffstat (limited to 'clang/test/SemaCXX/nullptr.cpp')
| -rw-r--r-- | clang/test/SemaCXX/nullptr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/test/SemaCXX/nullptr.cpp b/clang/test/SemaCXX/nullptr.cpp index 7385fd42ad3..1c454771aaa 100644 --- a/clang/test/SemaCXX/nullptr.cpp +++ b/clang/test/SemaCXX/nullptr.cpp @@ -44,7 +44,7 @@ nullptr_t f(nullptr_t null) (void)(1 > nullptr); // expected-error {{invalid operands to binary expression}} (void)(1 != nullptr); // expected-error {{invalid operands to binary expression}} (void)(1 + nullptr); // expected-error {{invalid operands to binary expression}} - (void)(0 ? nullptr : 0); // expected-error {{incompatible operand types}} + (void)(0 ? nullptr : 0); // expected-error {{non-pointer operand type 'int' incompatible with nullptr}} (void)(0 ? nullptr : (void*)0); (void)(0 ? nullptr : A()); // expected-error {{non-pointer operand type 'A' incompatible with nullptr}} (void)(0 ? A() : nullptr); // expected-error {{non-pointer operand type 'A' incompatible with nullptr}} |
