r221496 - in /branches/c++-concepts: ChangeLog....

[asutton@gcc.gnu.org]

Author: asutton
Date: Wed Mar 18 17:31:08 2015
New Revision: 221496

URL: https://gcc.gnu.org/viewcvs?rev=221496&root=gcc&view=rev
Log:
2015-03-18  Andrew Sutton  <andrew.n.sutton@gmail.com>
	
	Addressing regressions after merge.
	* gcc/cp/parser.c (cp_parser_template_declaration_after_export):
	Revert implementation of concept introductions. It was causing
	scoping issues.
	* gcc/testsuite/g++.dg/concepts/friend1.C: Update test to account
	for apparent fix (?) to lookup rules involving friends.


Modified:
    branches/c++-concepts/ChangeLog.concepts
    branches/c++-concepts/gcc/cp/parser.c
    branches/c++-concepts/gcc/testsuite/g++.dg/concepts/friend1.C