r205697 - in /trunk/gcc: cp/ChangeLog cp/decl.c...

[paolo@gcc.gnu.org]

Author: paolo
Date: Thu Dec  5 09:51:11 2013
New Revision: 205697

URL: http://gcc.gnu.org/viewcvs?rev=205697&root=gcc&view=rev
Log:
/cp
2013-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	* decl.c (duplicate_decls): Replace pairs of errors and permerrors
	with error + inform (permerror + inform, respectively).

/testsuite
2013-12-05  Paolo Carlini  <paolo.carlini@oracle.com>

	* g++.dg/cpp0x/constexpr-46336.C: Adjust expected messages.
	* g++.dg/cpp0x/defaulted2.C: Likewise.
	* g++.dg/cpp1y/auto-fn8.C: Likewise.
	* g++.dg/gomp/udr-3.C: Likewise.
	* g++.dg/lookup/extern-c-redecl5.C: Likewise.
	* g++.dg/lookup/linkage1.C: Likewise.
	* g++.dg/overload/new1.C: Likewise.
	* g++.dg/parse/friend5.C: Likewise.
	* g++.dg/parse/namespace-alias-1.C: Likewise.
	* g++.dg/parse/namespace10.C: Likewise.
	* g++.dg/parse/redef2.C: Likewise.
	* g++.dg/template/friend44.C: Likewise.
	* g++.old-deja/g++.brendan/crash42.C: Likewise.
	* g++.old-deja/g++.brendan/crash52.C: Likewise.
	* g++.old-deja/g++.brendan/crash55.C: Likewise.
	* g++.old-deja/g++.jason/overload21.C: Likewise.
	* g++.old-deja/g++.jason/overload5.C: Likewise.
	* g++.old-deja/g++.jason/redecl1.C: Likewise.
	* g++.old-deja/g++.law/arm8.C: Likewise.
	* g++.old-deja/g++.other/main1.C: Likewise.

Modified:
    trunk/gcc/cp/ChangeLog
    trunk/gcc/cp/decl.c
    trunk/gcc/testsuite/ChangeLog
    trunk/gcc/testsuite/g++.dg/cpp0x/constexpr-46336.C
    trunk/gcc/testsuite/g++.dg/cpp0x/defaulted2.C
    trunk/gcc/testsuite/g++.dg/cpp1y/auto-fn8.C
    trunk/gcc/testsuite/g++.dg/gomp/udr-3.C
    trunk/gcc/testsuite/g++.dg/lookup/extern-c-redecl5.C
    trunk/gcc/testsuite/g++.dg/lookup/linkage1.C
    trunk/gcc/testsuite/g++.dg/overload/new1.C
    trunk/gcc/testsuite/g++.dg/parse/friend5.C
    trunk/gcc/testsuite/g++.dg/parse/namespace-alias-1.C
    trunk/gcc/testsuite/g++.dg/parse/namespace10.C
    trunk/gcc/testsuite/g++.dg/parse/redef2.C
    trunk/gcc/testsuite/g++.dg/template/friend44.C
    trunk/gcc/testsuite/g++.old-deja/g++.brendan/crash42.C
    trunk/gcc/testsuite/g++.old-deja/g++.brendan/crash52.C
    trunk/gcc/testsuite/g++.old-deja/g++.brendan/crash55.C
    trunk/gcc/testsuite/g++.old-deja/g++.jason/overload21.C
    trunk/gcc/testsuite/g++.old-deja/g++.jason/overload5.C
    trunk/gcc/testsuite/g++.old-deja/g++.jason/redecl1.C
    trunk/gcc/testsuite/g++.old-deja/g++.law/arm8.C
    trunk/gcc/testsuite/g++.old-deja/g++.other/main1.C