OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

class.c (add_method): Compare template parms too.

Browse Source 
cp:
	* class.c (add_method): Compare template parms too.
testsuite:
	* g++.dg/overload/member2.C: New test.

From-SVN: r58278
This commit is contained in:
Nathan Sidwell 2002-10-18 08:09:58 +00:00 committed by Nathan Sidwell
parent e6ffac8ac0
commit 8a188e2490
4 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-17 Nathan Sidwell <nathan@codesourcery.com>
* class.c (add_method): Compare template parms too.
2002-10-17 Mark Mitchell <mark@codesourcery.com>
PR c++/7584

7
gcc/cp/class.c
View File

@ -950,6 +950,13 @@ add_method (type, method, error_p)
&& (TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms1)))
!= TYPE_QUALS (TREE_TYPE (TREE_VALUE (parms2)))))
same = 0;
/* For templates, the template parms must be identical. */
if (TREE_CODE (fn) == TEMPLATE_DECL
&& !comp_template_parms (DECL_TEMPLATE_PARMS (fn),
DECL_TEMPLATE_PARMS (method)))
same = 0;
if (! DECL_STATIC_FUNCTION_P (fn))
parms1 = TREE_CHAIN (parms1);
if (! DECL_STATIC_FUNCTION_P (method))

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2002-10-17 Nathan Sidwell <nathan@codesourcery.com>
* g++.dg/overload/member2.C: New test.
2002-10-17 Janis Johnson <janis187@us.ibm.com>
* g++.dg/README: Describe new compat directory.

41
gcc/testsuite/g++.dg/overload/member2.C Normal file
View File

@ -0,0 +1,41 @@
// { dg-do run }
// Copyright (C) 2001 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 17 Oct 2002 <nathan@codesourcery.com>
// PR 7676. We didn't notice template members were different.
struct foo
{
template<class T>
int bar() {return 1;}
template<int I>
int bar() {return 2;}
};
struct baz : foo
{
using foo::bar;
template<int I>
int bar () {return 3;}
};
int main ()
{
baz b;
foo f;
if (f.bar<1> () != 2)
return 1;
if (f.bar<int> () != 1)
return 2;
if (b.bar<1> () != 3)
return 1;
if (b.bar<int> () != 1)
return 2;
return 0;
}