diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticGroups.td | 5 | ||||
| -rw-r--r-- | test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-cxx11-nowarn.cpp | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/clang/Basic/DiagnosticGroups.td b/include/clang/Basic/DiagnosticGroups.td index 218120f515..82167951ce 100644 --- a/include/clang/Basic/DiagnosticGroups.td +++ b/include/clang/Basic/DiagnosticGroups.td @@ -72,8 +72,13 @@ def CXX98Compat : DiagGroup<"c++98-compat", def CXX98CompatPedantic : DiagGroup<"c++98-compat-pedantic", [CXX98Compat]>; def CXX11Narrowing : DiagGroup<"c++11-narrowing">; + +// Original name of this warning in Clang def : DiagGroup<"c++0x-narrowing", [CXX11Narrowing]>; +// Name of this warning in GCC +def : DiagGroup<"narrowing", [CXX11Narrowing]>; + def CXX11Compat : DiagGroup<"c++11-compat", [CXX11Narrowing]>; def : DiagGroup<"c++0x-compat", [CXX11Compat]>; diff --git a/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-cxx11-nowarn.cpp b/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-cxx11-nowarn.cpp index 53a775b581..4bcf113d71 100644 --- a/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-cxx11-nowarn.cpp +++ b/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-cxx11-nowarn.cpp @@ -1,4 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -std=c++11 -Wno-error=c++11-narrowing -triple x86_64-apple-macosx10.6.7 -verify %s +// RUN: %clang_cc1 -fsyntax-only -std=c++11 -Wno-error=narrowing -triple x86_64-apple-macosx10.6.7 -verify %s // Verify that narrowing conversions in initializer lists cause errors in C++0x // mode. |