diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticParseKinds.td | 3 | ||||
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 2 | ||||
| -rw-r--r-- | clang/test/PCH/cxx-traits.h | 4 | ||||
| -rw-r--r-- | clang/test/Sema/Inputs/ms-keyword-system-header.h | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td index 22a9d64ca82..4339fbe8e5a 100644 --- a/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -59,7 +59,8 @@ def ext_integer_complex : Extension< "complex integer types are a GNU extension">, InGroup<GNUComplexInteger>; def ext_thread_before : Extension<"'__thread' before '%0'">; def ext_keyword_as_ident : ExtWarn< - "keyword '%0' will be treated as an identifier %select{here|for the remainder of the translation unit}1">, + "keyword '%0' will be made available as an identifier " + "%select{here|for the remainder of the translation unit}1">, InGroup<KeywordCompat>; def error_empty_enum : Error<"use of empty enum">; diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 34641722aff..63e9235c0d3 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -566,7 +566,7 @@ def fmsc_version : Joined<["-"], "fmsc-version=">, Group<f_Group>, Flags<[CC1Opt HelpText<"Version of the Microsoft C/C++ compiler to report in _MSC_VER (0 = don't define it (default))">; def fdelayed_template_parsing : Flag<["-"], "fdelayed-template-parsing">, Group<f_Group>, HelpText<"Parse templated function definitions at the end of the " - "translation unit ">, Flags<[CC1Option]>; + "translation unit">, Flags<[CC1Option]>; def fmodules_cache_path : Joined<["-"], "fmodules-cache-path=">, Group<i_Group>, Flags<[DriverOption, CC1Option]>, MetaVarName<"<directory>">, HelpText<"Specify the module cache path">; diff --git a/clang/test/PCH/cxx-traits.h b/clang/test/PCH/cxx-traits.h index 836804ef2c8..e6f2feb1d11 100644 --- a/clang/test/PCH/cxx-traits.h +++ b/clang/test/PCH/cxx-traits.h @@ -1,12 +1,12 @@ // Header for PCH test cxx-traits.cpp template<typename _Tp> -struct __is_pod { // expected-warning {{keyword '__is_pod' will be treated as an identifier for the remainder of the translation unit}} +struct __is_pod { // expected-warning {{keyword '__is_pod' will be made available as an identifier for the remainder of the translation unit}} enum { __value }; }; template<typename _Tp> -struct __is_empty { // expected-warning {{keyword '__is_empty' will be treated as an identifier for the remainder of the translation unit}} +struct __is_empty { // expected-warning {{keyword '__is_empty' will be made available as an identifier for the remainder of the translation unit}} enum { __value }; }; diff --git a/clang/test/Sema/Inputs/ms-keyword-system-header.h b/clang/test/Sema/Inputs/ms-keyword-system-header.h index 43a3db7a12b..dda4c2a0111 100644 --- a/clang/test/Sema/Inputs/ms-keyword-system-header.h +++ b/clang/test/Sema/Inputs/ms-keyword-system-header.h @@ -3,7 +3,7 @@ typedef union { union w *__uptr; #if defined(MS) && defined(NOT_SYSTEM) - // expected-warning@-2 {{keyword '__uptr' will be treated as an identifier here}} + // expected-warning@-2 {{keyword '__uptr' will be made available as an identifier here}} #endif int *__iptr; } WS __attribute__((__transparent_union__)); |
