diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2011-08-18 00:04:08 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2011-08-18 00:04:08 +0000 |
| commit | 4c7269474efc9800f0898c57361a027fd376a644 (patch) | |
| tree | df8422271f50ddef9fcb1283f1d6af16003433b2 /clang/lib/Sema/SemaInit.cpp | |
| parent | d5fe9e4d9741022ad10da2abf325b5323bdb0ae1 (diff) | |
| download | bcm5719-llvm-4c7269474efc9800f0898c57361a027fd376a644.tar.gz bcm5719-llvm-4c7269474efc9800f0898c57361a027fd376a644.zip | |
Downgrade "err_init_list_variable_narrowing" into a warning in Microsoft mode even if c++0x is enabled. This necessary to parse MSVC code in C++0x mode.
llvm-svn: 137904
Diffstat (limited to 'clang/lib/Sema/SemaInit.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index e410f2f9a0d..ee122ff05d6 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5145,7 +5145,7 @@ static void DiagnoseNarrowingInInitList( bool Constant, const APValue &ConstantValue) { if (Constant) { S.Diag(InitE->getLocStart(), - S.getLangOptions().CPlusPlus0x + S.getLangOptions().CPlusPlus0x && !S.getLangOptions().Microsoft ? diag::err_init_list_constant_narrowing : diag::warn_init_list_constant_narrowing) << InitE->getSourceRange() @@ -5153,7 +5153,7 @@ static void DiagnoseNarrowingInInitList( << EntityType; } else S.Diag(InitE->getLocStart(), - S.getLangOptions().CPlusPlus0x + S.getLangOptions().CPlusPlus0x && !S.getLangOptions().Microsoft ? diag::err_init_list_variable_narrowing : diag::warn_init_list_variable_narrowing) << InitE->getSourceRange() |
