commit 489e4e0369be714041a5ca2d9b4b4c84f77e4a97
author Richard Smith <richard-llvm@metafoo.co.uk> Sat May 04 04:19:27 2013 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sat May 04 04:19:27 2013 +0000
tree c7ac2b24bc2c6ef566b9fd3504996c8901dadbcf
parent 287f18b4b82dd59c827b1f7b496b8f62dfcc1c7f

Say 'decltype(auto)' not 'auto' as appropriate in mismatched-deduction diagnostic.

llvm-svn: 181103

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index f5b4823..f782677 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -8212,6 +8212,7 @@
           } else if (DeducedCanon != UCanon) {
             Diag(D->getTypeSourceInfo()->getTypeLoc().getBeginLoc(),
                  diag::err_auto_different_deductions)
+              << (AT->isDecltypeAuto() ? 1 : 0)
               << Deduced << DeducedDecl->getDeclName()
               << U << D->getDeclName()
               << DeducedDecl->getInit()->getSourceRange()