summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmail Pazarbasi <ismail.pazarbasi@gmail.com>2014-05-09 09:49:29 +0000
committerIsmail Pazarbasi <ismail.pazarbasi@gmail.com>2014-05-09 09:49:29 +0000
commit77c456be3eed0b48d13c2d0e693eed65863a87ac (patch)
treecb3ed4cd79d0c71f9c3bf45897f1410f224f96a7
parent8bbadc0383f1cb419eabe80790340da053ca6ff1 (diff)
downloadbcm5719-llvm-77c456be3eed0b48d13c2d0e693eed65863a87ac.tar.gz
bcm5719-llvm-77c456be3eed0b48d13c2d0e693eed65863a87ac.zip
Revised wording for diagnostics in r208299
llvm-svn: 208401
-rw-r--r--clang/include/clang/Basic/DiagnosticParseKinds.td2
-rw-r--r--clang/test/Parser/cxx0x-for-range.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
index 70e16ceca1c..ddf69e915e8 100644
--- a/clang/include/clang/Basic/DiagnosticParseKinds.td
+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -205,7 +205,7 @@ def err_expected_semi_after_static_assert : Error<
"expected ';' after static_assert">;
def err_expected_semi_for : Error<"expected ';' in 'for' statement specifier">;
def err_single_decl_assign_in_for_range : Error<
- "range based for statement requires ':' after range declaration">;
+ "range-based 'for' statement uses ':', not '='">;
def warn_missing_selector_name : Warning<
"%0 used as the name of the previous parameter rather than as part "
"of the selector">,
diff --git a/clang/test/Parser/cxx0x-for-range.cpp b/clang/test/Parser/cxx0x-for-range.cpp
index f75b67c486f..c3276ebeaab 100644
--- a/clang/test/Parser/cxx0x-for-range.cpp
+++ b/clang/test/Parser/cxx0x-for-range.cpp
@@ -44,18 +44,18 @@ struct Vector {
void f() {
Vector v;
int a[] = {1, 2, 3, 4};
- for (auto foo = a) // expected-error {{range based for statement requires ':' after range declaration}}
+ for (auto foo = a) // expected-error {{range-based 'for' statement uses ':', not '='}}
// CHECK: fix-it:"{{.*}}":{[[@LINE-1]]:19-[[@LINE-1]]:20}:":"
(void)foo;
for (auto i
=
- v) // expected-error@-1 {{range based for statement requires ':' after range declaration}}
+ v) // expected-error@-1 {{range-based 'for' statement uses ':', not '='}}
// CHECK: fix-it:"{{.*}}":{[[@LINE-2]]:7-[[@LINE-2]]:8}:":"
(void)i;
#define FORRANGE(v, a) for (DECLVARWITHINIT(v) a) // expected-note {{expanded from macro}}
#define DECLAUTOVAR(v) auto v
#define DECLVARWITHINIT(v) DECLAUTOVAR(v) = // expected-note {{expanded from macro}}
- FORRANGE(i, a) { // expected-error {{range based for statement requires ':' after range declaration}}
+ FORRANGE(i, a) { // expected-error {{range-based 'for' statement uses ':', not '='}}
}
}
OpenPOWER on IntegriCloud