commit ffd015e316fff53f23e9ffd4907b88b8706e4183
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 480ee859f41dc9f166da7a0c9cb96c7fd945aaad
parent 9fd6b8f5a73788f288edd01fa99d434d1e6588ad

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


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

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index f5b4823..f782677 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/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()