procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR c++/9898, PR c++/383, DR 322

Browse source 
cp:
	PR c++/9898, PR c++/383, DR 322
	* pt.c (maybe_adjust_types_for_deduction) [DEDUCE_CONV]: Look
	through reference types on both PARM and ARG.
testsuite:
	PR c++/9898, c++/383
	* g++.dg/template/conv6.C: New test.

From-SVN: r64815
This commit is contained in:
Nathan Sidwell 2003-03-24 19:47:17 +00:00 • committed by Nathan Sidwell
parent a5fcc8951b
commit 1c82cc9081
4 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
2003-03-24 Nathan Sidwell <nathan@codesourcery.com>
PR c++/9898, PR c++/383, DR 322
* pt.c (maybe_adjust_types_for_deduction) [DEDUCE_CONV]: Look
through reference types on both PARM and ARG.
2003-03-24 Nathan Sidwell <nathan@codesourcery.com>
PR c++/10119

6
gcc/cp/pt.c
View file

@ -8753,6 +8753,12 @@ maybe_adjust_types_for_deduction (strict, parm, arg)
*parm = TREE_TYPE (*parm);
result |= UNIFY_ALLOW_OUTER_MORE_CV_QUAL;
}
/* DR 322. For conversion deduction, remove a reference type on parm
too (which has been swapped into ARG). */
if (strict == DEDUCE_CONV && TREE_CODE (*arg) == REFERENCE_TYPE)
*arg = TREE_TYPE (*arg);
return result;
}

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2003-03-24 Nathan Sidwell <nathan@codesourcery.com>
PR c++/9898, c++/383
* g++.dg/template/conv6.C: New test.
PR c++/10119
* g++.dg/template/ptrmem5.C: New test.

24
gcc/testsuite/g++.dg/template/conv6.C Normal file
View file

@ -0,0 +1,24 @@
// { dg-do compile }
// Copyright (C) 2003 Free Software Foundation, Inc.
// Contributed by Nathan Sidwell 21 Mar 2003 <nathan@codesourcery.com>
// PR 9898, DR 322. Conversion to reference type.
template <typename> struct Ref {};
template <typename> struct Val {};
struct Wrapper
{
template <typename U> operator Ref<U> & ();
template <typename U> operator Val<U> ();
};
void Foo (Wrapper l)
{
static_cast <Ref<int> &> (l);
static_cast <Ref<int> const &> (l);
static_cast <Ref<int> > (l);
static_cast <Val<int> const &> (l);
static_cast <Val<int> > (l);
}