r210387 - Fix my poor grammar from r210372
Richard Trieu
rtrieu at google.com
Fri Jun 6 16:56:23 PDT 2014
Author: rtrieu
Date: Fri Jun 6 18:56:22 2014
New Revision: 210387
URL: http://llvm.org/viewvc/llvm-project?rev=210387&view=rev
Log:
Fix my poor grammar from r210372
Modified:
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
cfe/trunk/test/SemaCXX/warn-undefined-bool-conversion.cpp
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=210387&r1=210386&r2=210387&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Fri Jun 6 18:56:22 2014
@@ -2402,10 +2402,10 @@ def warn_impcast_pointer_to_bool : Warni
InGroup<PointerBoolConversion>;
def warn_this_bool_conversion : Warning<
"'this' pointer cannot be null in well-defined C++ code; pointer may be "
- "assumed always converted to true">, InGroup<UndefinedBoolConversion>;
+ "assumed to always convert to true">, InGroup<UndefinedBoolConversion>;
def warn_address_of_reference_bool_conversion : Warning<
"reference cannot be bound to dereferenced null pointer in well-defined C++ "
- "code; pointer may be assumed always converted to true">,
+ "code; pointer may be assumed to always convert to true">,
InGroup<UndefinedBoolConversion>;
def warn_null_pointer_compare : Warning<
Modified: cfe/trunk/test/SemaCXX/warn-undefined-bool-conversion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-undefined-bool-conversion.cpp?rev=210387&r1=210386&r2=210387&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-undefined-bool-conversion.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-undefined-bool-conversion.cpp Fri Jun 6 18:56:22 2014
@@ -6,10 +6,10 @@
void test1(int &x) {
if (x == 1) { }
if (&x) { }
- // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true}}
if (!&x) { }
- // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true}}
}
class test2 {
@@ -17,19 +17,19 @@ class test2 {
void foo() {
if (this) { }
- // expected-warning at -1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true}}
if (!this) { }
- // expected-warning at -1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true}}
}
void bar() {
if (x == 1) { }
if (&x) { }
- // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true}}
if (!&x) { }
- // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}}
+ // expected-warning at -1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed to always convert to true}}
}
int &x;
More information about the cfe-commits
mailing list