diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/ref2.C | 27 |
4 files changed, 39 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index dee21a9..9abb9c8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-07 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/19298 + * pt.c (tsubst_qualified_id): Call convert_from_reference. + 2005-01-06 Mark Mitchell <mark@codesourcery.com> PR c++/19244 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ad852c5..972e266 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7648,6 +7648,8 @@ tsubst_qualified_id (tree qualified_id, tree args, (expr, scope, current_class_type)); expr = finish_qualified_id_expr (scope, expr, done, address_p); } + + expr = convert_from_reference (expr); return expr; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 832d43a..46a2093 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-01-07 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/19298 + * g++.dg/template/ref2.C: New. + 2005-01-07 Andrew Pinski <pinskia@physics.uc.edu> * gcc.c-torture/compile/pr17529.c (y): Change size of array to 1 diff --git a/gcc/testsuite/g++.dg/template/ref2.C b/gcc/testsuite/g++.dg/template/ref2.C new file mode 100644 index 0000000..9feb19d --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ref2.C @@ -0,0 +1,27 @@ +// Copyright (C) 2005 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 7 Jan 2005 <nathan@codesourcery.com> + +// PR 19298: Rejects legal +// Origin: Andrew Pinski <pinskia@gcc.gnu.org> + +struct t +{ + void f() const; +}; + +template <typename _Tp> +struct A +{ + static t const& c; +}; + +template <typename _Tp> +void g(void) +{ + A<_Tp>::c.f(); +} + +void h(void) +{ + g<int>(); +} |