diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-17 19:26:19 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-17 19:26:19 +0000 |
| commit | 09ce33ded0ab9a05e097d54c226ad037bd4d6113 (patch) | |
| tree | 8440e1835dd97005e8c8c4f2161be85a40892117 /clang/lib | |
| parent | 34889cabcd3e417aa7b0e4e50fb192afa890cd26 (diff) | |
| download | bcm5719-llvm-09ce33ded0ab9a05e097d54c226ad037bd4d6113.tar.gz bcm5719-llvm-09ce33ded0ab9a05e097d54c226ad037bd4d6113.zip | |
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
llvm-svn: 184108
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Sema/SemaExprCXX.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaExprCXX.cpp b/clang/lib/Sema/SemaExprCXX.cpp index d723c1fe77d..40af2075c3f 100644 --- a/clang/lib/Sema/SemaExprCXX.cpp +++ b/clang/lib/Sema/SemaExprCXX.cpp @@ -1205,9 +1205,9 @@ Sema::BuildCXXNew(SourceRange Range, bool UseGlobal, 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: |
