commit 0bb5199941d6058b866afe01956cca36e64cc247
author Larisse Voufo <lvoufo@google.com> Tue Jun 18 01:27:47 2013 +0000
committer Larisse Voufo <lvoufo@google.com> Tue Jun 18 01:27:47 2013 +0000
tree 47c8ae505035e845c85ab4ad2b7b646223a877e2
parent 2736f2eca78b498dd75c739a76f833ed43cdb43b

r184100 Fix -- Updated test cases for contextual conversion

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@184165 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaExprCXX.cpp

diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp
index 40af207..d723c1f 100644
--- a/lib/Sema/SemaExprCXX.cpp
+++ b/lib/Sema/SemaExprCXX.cpp
@@ -1205,9 +1205,9 @@
 						AA_Converting);
 
       if (!isSFINAEContext())
-	// Diagnose the compatibility of this conversion.
-	Diag(StartLoc, diag::warn_cxx98_compat_array_size_conversion)
-	  << ArraySize->getType() << 0 << Context.getSizeType();
+        // Diagnose the compatibility of this conversion.
+        Diag(StartLoc, diag::warn_cxx98_compat_array_size_conversion)
+          << ArraySize->getType() << 0 << "'size_t'";
     } else {
       class SizeConvertDiagnoser : public ICEConvertDiagnoser {
       protected: