diff options
| author | Aaron Ballman <aaron@aaronballman.com> | 2012-08-29 12:35:14 +0000 |
|---|---|---|
| committer | Aaron Ballman <aaron@aaronballman.com> | 2012-08-29 12:35:14 +0000 |
| commit | a14f400e4c4239b92137fc8aab1ac4700a209591 (patch) | |
| tree | d5f2a95dfb8289ee6dc6d872ec858876f3f59592 | |
| parent | 29f431b3e310ae6bd367dccf5a2794ad1cac9592 (diff) | |
Reversing the logic since C99 mode is actually not an extension. Also, changing the group to the singular to match the diagnostic better.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162838 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 2 | ||||
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 4 | ||||
| -rw-r--r-- | lib/Sema/DeclSpec.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 5f48cc7e12..de90f73ccb 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -197,7 +197,7 @@ def StringPlusInt : DiagGroup<"string-plus-int">; def StrncatSize : DiagGroup<"strncat-size">; def TautologicalCompare : DiagGroup<"tautological-compare">; def HeaderHygiene : DiagGroup<"header-hygiene">; -def DuplicateDeclSpecifiers : DiagGroup<"duplicate-decl-specifiers">; +def DuplicateDeclSpecifier : DiagGroup<"duplicate-decl-specifier">; // Preprocessor warnings. def : DiagGroup<"builtin-macro-redefined">; diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index feae2d0a5e..f88a9dd4a6 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -44,9 +44,9 @@ def warn_extra_semi_after_mem_fn_def : Warning< InGroup<ExtraSemi>, DefaultIgnore; def ext_duplicate_declspec : ExtWarn<"duplicate '%0' declaration specifier">, - InGroup<DuplicateDeclSpecifiers>; + InGroup<DuplicateDeclSpecifier>; def warn_duplicate_declspec : Warning<"duplicate '%0' declaration specifier">, - InGroup<DuplicateDeclSpecifiers>; + InGroup<DuplicateDeclSpecifier>; def ext_plain_complex : ExtWarn< "plain '_Complex' requires a type specifier; assuming '_Complex double'">; def ext_integer_complex : Extension< diff --git a/lib/Sema/DeclSpec.cpp b/lib/Sema/DeclSpec.cpp index e8ce9ac01c..8fdb07029a 100644 --- a/lib/Sema/DeclSpec.cpp +++ b/lib/Sema/DeclSpec.cpp @@ -681,9 +681,9 @@ bool DeclSpec::SetTypeQual(TQ T, SourceLocation Loc, const char *&PrevSpec, // not what the user intended, we will always warn. We do not need to set the // qualifier's location since we already have it. if (TypeQualifiers & T) { - bool IsExtension = false; + bool IsExtension = true; if (Lang.C99 || (Lang.CPlusPlus0x && !IsTypeSpec)) - IsExtension = true; + IsExtension = false; return BadSpecifier(T, T, PrevSpec, DiagID, IsExtension); } TypeQualifiers |= T; |