summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitri Gribenko <gribozavr@gmail.com>2012-09-24 19:05:10 +0000
committerDmitri Gribenko <gribozavr@gmail.com>2012-09-24 19:05:10 +0000
commit61b4b7f0f3b61c20c52892c9ac9c36e97b7d9eef (patch)
tree149a93adf11c5032df7feb75f4e32b7678dc64f3
parent1cd230570394513774b42158e7d69ca2439f11ca (diff)
downloadbcm5719-llvm-61b4b7f0f3b61c20c52892c9ac9c36e97b7d9eef.tar.gz
bcm5719-llvm-61b4b7f0f3b61c20c52892c9ac9c36e97b7d9eef.zip
Include 'long long' extension warning in the LongLong group so that it can be
silenced by -Wno-long-long. Thanks Richard Smith for the fix idea! llvm-svn: 164546
-rw-r--r--clang/include/clang/Basic/DiagnosticCommonKinds.td2
-rw-r--r--clang/include/clang/Basic/DiagnosticGroups.td6
2 files changed, 5 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td
index 999c6d26186..a6ce9d4a2d2 100644
--- a/clang/include/clang/Basic/DiagnosticCommonKinds.td
+++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td
@@ -83,7 +83,7 @@ def ext_c99_longlong : Extension<
InGroup<LongLong>;
def ext_cxx11_longlong : Extension<
"'long long' is a C++11 extension">,
- InGroup<CXX11>;
+ InGroup<CXX11LongLong>;
def warn_cxx98_compat_longlong : Warning<
"'long long' is incompatible with C++98">,
InGroup<CXX98CompatPedantic>, DefaultIgnore;
diff --git a/clang/include/clang/Basic/DiagnosticGroups.td b/clang/include/clang/Basic/DiagnosticGroups.td
index a4e9231daa8..32c03f7364d 100644
--- a/clang/include/clang/Basic/DiagnosticGroups.td
+++ b/clang/include/clang/Basic/DiagnosticGroups.td
@@ -143,7 +143,8 @@ def : DiagGroup<"missing-noreturn">;
def MultiChar : DiagGroup<"multichar">;
def : DiagGroup<"nested-externs">;
def : DiagGroup<"newline-eof">;
-def LongLong : DiagGroup<"long-long">;
+def CXX11LongLong : DiagGroup<"c++11-long-long">;
+def LongLong : DiagGroup<"long-long", [CXX11LongLong]>;
def MismatchedTags : DiagGroup<"mismatched-tags">;
def MissingFieldInitializers : DiagGroup<"missing-field-initializers">;
def ModuleBuild : DiagGroup<"module-build">;
@@ -428,7 +429,8 @@ def NonGCC : DiagGroup<"non-gcc",
// A warning group for warnings about using C++11 features as extensions in
// earlier C++ versions.
-def CXX11 : DiagGroup<"c++11-extensions", [CXX11ExtraSemi]>;
+def CXX11 : DiagGroup<"c++11-extensions", [CXX11ExtraSemi, CXX11LongLong]>;
+
def : DiagGroup<"c++0x-extensions", [CXX11]>;
def DelegatingCtorCycles :
DiagGroup<"delegating-ctor-cycles">;
OpenPOWER on IntegriCloud