r244551 - in /branches/gcc-6-branch/gcc: cp/Cha...

[jakub@gcc.gnu.org]

Author: jakub
Date: Tue Jan 17 20:31:40 2017
New Revision: 244551

URL: https://gcc.gnu.org/viewcvs?rev=244551&root=gcc&view=rev
Log:
	Backported from mainline
	2017-01-04  Jakub Jelinek  <jakub@redhat.com>

	PR c++/78693
	* parser.c (cp_parser_simple_declaration): Only complain about
	inconsistent auto deduction if auto_result doesn't use auto.

	* g++.dg/cpp0x/pr78693.C: New test.

Added:
    branches/gcc-6-branch/gcc/testsuite/g++.dg/cpp0x/pr78693.C
Modified:
    branches/gcc-6-branch/gcc/cp/ChangeLog
    branches/gcc-6-branch/gcc/cp/parser.c
    branches/gcc-6-branch/gcc/testsuite/ChangeLog