| commit | b67313d9136559ec0f8cda43550f73399fe2b76a | [log] [tgz] |
|---|---|---|
| author | Rafael Espindola <rafael.espindola@gmail.com> | Mon Jun 17 19:26:19 2013 +0000 |
| committer | Rafael Espindola <rafael.espindola@gmail.com> | Mon Jun 17 19:26:19 2013 +0000 |
| tree | 4feeb98190bcd08d6f5b08dbc00bb8adf2e091aa | |
| parent | 37aba4797703ebadbd480b757ce40b81036539bc [diff] [blame] |
Revert "Updated test cases for contextual conversion" This reverts commit r184100. It was faling on some bots: http://bb.pgr.jp/builders/cmake-clang-i686-mingw32/builds/1973/steps/test_clang/logs/Clang%20%3A%3A%20SemaCXX__cxx1y-contextual-conversion-tweaks.cpp git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@184108 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index d723c1f..40af207 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 << "'size_t'"; + // Diagnose the compatibility of this conversion. + Diag(StartLoc, diag::warn_cxx98_compat_array_size_conversion) + << ArraySize->getType() << 0 << Context.getSizeType(); } else { class SizeConvertDiagnoser : public ICEConvertDiagnoser { protected: