commit 6bc574daab3d3571d888cc4a21df67f2e2a14792
author Douglas Gregor <dgregor@apple.com> Wed Jun 30 00:20:43 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Wed Jun 30 00:20:43 2010 +0000
tree a0f3dca52c6359b6211fad27d444d517fdf2f9ff
parent f186b54cc68e13a819736a54bc11d37179029154

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

lib/Sema/Sema.h

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index c771898..3ed2a51 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1195,7 +1195,8 @@
                                      const PartialDiagnostic &ExplicitConvDiag,
                                      const PartialDiagnostic &ExplicitConvNote,
                                      const PartialDiagnostic &AmbigDiag,
-                                     const PartialDiagnostic &AmbigNote);
+                                     const PartialDiagnostic &AmbigNote,
+                                     const PartialDiagnostic &ConvDiag);
   
   bool PerformObjectMemberConversion(Expr *&From,
                                      NestedNameSpecifier *Qualifier,