From 731b501981fac1e5d78f97b9b67bf86abeb2f02b Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Fri, 6 Jun 2014 23:56:22 +0000 Subject: [PATCH] Fix my poor grammar from r210372 llvm-svn: 210387 --- clang/include/clang/Basic/DiagnosticSemaKinds.td | 4 ++-- clang/test/SemaCXX/warn-undefined-bool-conversion.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 9ef0877f..7a37eff 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -2402,10 +2402,10 @@ def warn_impcast_pointer_to_bool : Warning< InGroup; 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; + "assumed to always convert to true">, InGroup; 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; def warn_null_pointer_compare : Warning< diff --git a/clang/test/SemaCXX/warn-undefined-bool-conversion.cpp b/clang/test/SemaCXX/warn-undefined-bool-conversion.cpp index c56b6bc..40bbbd8 100644 --- a/clang/test/SemaCXX/warn-undefined-bool-conversion.cpp +++ b/clang/test/SemaCXX/warn-undefined-bool-conversion.cpp @@ -6,10 +6,10 @@ void test1(int &x) { if (x == 1) { } if (&x) { } - // expected-warning@-1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-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@-1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-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@-1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed to always convert to true}} if (!this) { } - // expected-warning@-1{{'this' pointer cannot be null in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-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@-1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-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@-1{{reference cannot be bound to dereferenced null pointer in well-defined C++ code; pointer may be assumed always converted to true}} + // expected-warning@-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; -- 2.7.4