diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/typeof6.C | 17 |
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 3e1fa5d..69242ca 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2003-06-27 Mark Mitchell <mark@codesourcery.com> + PR c++/10468 + * pt.c (tsubst): Handle qualified TYPEOF_TYPEs correctly. + +2003-06-27 Mark Mitchell <mark@codesourcery.com> + PR c++/10796 * decl.c (finish_enum): Implement DR377. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 282c788..75b3537 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7062,7 +7062,10 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) if (e1 == error_mark_node) return error_mark_node; - return TREE_TYPE (e1); + return cp_build_qualified_type_real (TREE_TYPE (e1), + cp_type_quals (t) + | cp_type_quals (TREE_TYPE (e1)), + complain); } default: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b407402..e551aae 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2003-06-27 Mark Mitchell <mark@codesourcery.com> + PR c++/10468 + * g++.dg/ext/typeof6.C: New test. + +2003-06-27 Mark Mitchell <mark@codesourcery.com> + PR c++/10796 * g++.dg/init/enum1.C: New test. diff --git a/gcc/testsuite/g++.dg/ext/typeof6.C b/gcc/testsuite/g++.dg/ext/typeof6.C new file mode 100644 index 0000000..ef75f25 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/typeof6.C @@ -0,0 +1,17 @@ +// { dg-options "" } + +template <class T> +void test1() { + int x = 0; + const typeof(x) & t1 = x+0; +} + +void test2() { + int x = 0; + const typeof(x) & t1 = x+0; +} + +int main() { + test1<int>(); + test2 (); +} |