aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaStmt.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-06-30 00:20:43 +0000
committerDouglas Gregor <dgregor@apple.com>2010-06-30 00:20:43 +0000
commit6bc574daab3d3571d888cc4a21df67f2e2a14792 (patch)
treea0f3dca52c6359b6211fad27d444d517fdf2f9ff /lib/Sema/SemaStmt.cpp
parentf186b54cc68e13a819736a54bc11d37179029154 (diff)
Implement C++ DR299, which allows an implicit conversion from a class
type to an integral or enumeration type in the size of an array new expression, e.g., new int[ConvertibleToInt(10)]; This is a GNU and C++0x extension. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@107229 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaStmt.cpp')
-rw-r--r--lib/Sema/SemaStmt.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp
index efd74e3c25..1abcf205dd 100644
--- a/lib/Sema/SemaStmt.cpp
+++ b/lib/Sema/SemaStmt.cpp
@@ -435,7 +435,8 @@ Sema::ActOnStartOfSwitchStmt(SourceLocation SwitchLoc, ExprArg Cond,
PDiag(diag::err_switch_explicit_conversion),
PDiag(diag::note_switch_conversion),
PDiag(diag::err_switch_multiple_conversions),
- PDiag(diag::note_switch_conversion));
+ PDiag(diag::note_switch_conversion),
+ PDiag(0));
if (ConvertedCond.isInvalid())
return StmtError();