diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-22 08:25:43 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-22 08:25:43 +0000 |
| commit | e9a597fe457cc2062847d037eff33da8eed5dbc7 (patch) | |
| tree | 44d4b4d401a22261e056fbd78171ceccf1ac25c5 /gcc/objcp | |
| parent | e6f9d301a4a6085a086530c7b54414d03ceff5dd (diff) | |
| download | gcc-e9a597fe457cc2062847d037eff33da8eed5dbc7.tar.gz | |
2009-06-22 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r148777
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@148778 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/objcp')
| -rw-r--r-- | gcc/objcp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objcp/objcp-decl.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog index 45985f8db0b..526830f588b 100644 --- a/gcc/objcp/ChangeLog +++ b/gcc/objcp/ChangeLog @@ -1,3 +1,9 @@ +2009-06-19 Ian Lance Taylor <iant@google.com> + + * objcp-decl.h (start_struct): Remove in_struct and struct_types + parameters. Add struct_info parameter. + (finish_struct): Likewise. + 2009-06-13 Aldy Hernandez <aldyh@redhat.com> * objcp-decl.h (start_struct): Add location argument. diff --git a/gcc/objcp/objcp-decl.h b/gcc/objcp/objcp-decl.h index 07d39abaf8f..50d98287662 100644 --- a/gcc/objcp/objcp-decl.h +++ b/gcc/objcp/objcp-decl.h @@ -37,9 +37,9 @@ extern tree objcp_end_compound_stmt (tree, int); invoke the original C++ functions if needed). */ #ifdef OBJCP_REMAP_FUNCTIONS -#define start_struct(loc, code, name, in_struct, struct_types) \ +#define start_struct(loc, code, name, struct_info) \ objcp_start_struct (loc, code, name) -#define finish_struct(loc, t, fieldlist, attributes, in_struct, struct_types) \ +#define finish_struct(loc, t, fieldlist, attributes, struct_info) \ objcp_finish_struct (loc, t, fieldlist, attributes) #define finish_function() \ objcp_finish_function () |