diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/ext/tmplattr1.C | 24 |
4 files changed, 36 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bba2e8e..dee7410 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-10-21 Mark Mitchell <mark@codesourcery.com> + + PR c++/24260 + * parser.c (cp_parser_init_declarator): Pass attributes to + grokfield. + 2005-10-20 Mark Mitchell <mark@codesourcery.com> PR c++/22618 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 300c266..25f25ce 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10938,7 +10938,7 @@ cp_parser_init_declarator (cp_parser* parser, } decl = grokfield (declarator, decl_specifiers, initializer, /*asmspec=*/NULL_TREE, - /*attributes=*/NULL_TREE); + prefix_attributes); if (decl && TREE_CODE (decl) == FUNCTION_DECL) cp_parser_save_default_args (parser, decl); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index af14116..1f3dd7a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-10-21 Mark Mitchell <mark@codesourcery.com> + + PR c++/24260 + * g++.dg/ext/tmplattr1.C: New test. + 2005-10-21 Paul Thomas <pault@gcc.gnu.org> PR fortran/24440 diff --git a/gcc/testsuite/g++.dg/ext/tmplattr1.C b/gcc/testsuite/g++.dg/ext/tmplattr1.C new file mode 100644 index 0000000..111e344 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/tmplattr1.C @@ -0,0 +1,24 @@ +// PR c++/24260 +// { dg-do compile { target i?86-*-* x86_64-*-* } } +// { dg-require-effective-target ilp32 } + +#define stdcall __attribute__((stdcall)) + +struct T { + template <class S> + static int stdcall func(int arg1, int arg2); +}; + +template <class S> +int stdcall T::func(int arg1, int arg2) +{ + return arg1+arg2; +} + +struct dummy {}; + +void xx() +{ + int (stdcall *ptr2)(int,int) = &T::func<dummy>; +} + |