summaryrefslogtreecommitdiff
path: root/gcc/objcp
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/objcp')
-rw-r--r--gcc/objcp/ChangeLog6
-rw-r--r--gcc/objcp/objcp-decl.c6
-rw-r--r--gcc/objcp/objcp-decl.h6
3 files changed, 13 insertions, 5 deletions
diff --git a/gcc/objcp/ChangeLog b/gcc/objcp/ChangeLog
index 12b93aac710..fcb4a6419be 100644
--- a/gcc/objcp/ChangeLog
+++ b/gcc/objcp/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-12 Aldy Hernandez <aldyh@redhat.com>
+
+ * objcp-decl.h (c_end_compound_stmt): New argument.
+ * objcp-decl.c (objcp_start_struct): Add argument.
+ (objcp_finish_struct): Same.
+
2009-06-03 Ian Lance Taylor <iant@google.com>
* Make-lang.in (cc1objplus-checksum.o): Depend upon $(CONFIG_H)
diff --git a/gcc/objcp/objcp-decl.c b/gcc/objcp/objcp-decl.c
index 12a73c1272a..379a69c2bb4 100644
--- a/gcc/objcp/objcp-decl.c
+++ b/gcc/objcp/objcp-decl.c
@@ -44,7 +44,8 @@ along with GCC; see the file COPYING3. If not see
/* Hacks to simulate start_struct() and finish_struct(). */
tree
-objcp_start_struct (enum tree_code code ATTRIBUTE_UNUSED, tree name)
+objcp_start_struct (location_t loc ATTRIBUTE_UNUSED,
+ enum tree_code code ATTRIBUTE_UNUSED, tree name)
{
tree s;
/* The idea here is to mimic the actions that the C++ parser takes when
@@ -62,7 +63,8 @@ objcp_start_struct (enum tree_code code ATTRIBUTE_UNUSED, tree name)
}
tree
-objcp_finish_struct (tree t, tree fieldlist, tree attributes)
+objcp_finish_struct (location_t loc ATTRIBUTE_UNUSED,
+ tree t, tree fieldlist, tree attributes)
{
tree field, next_field;
diff --git a/gcc/objcp/objcp-decl.h b/gcc/objcp/objcp-decl.h
index 3f6c4321e7f..e335149e0e5 100644
--- a/gcc/objcp/objcp-decl.h
+++ b/gcc/objcp/objcp-decl.h
@@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see
#ifndef GCC_OBJCP_DECL_H
#define GCC_OBJCP_DECL_H
-extern tree objcp_start_struct (enum tree_code, tree);
-extern tree objcp_finish_struct (tree, tree, tree);
+extern tree objcp_start_struct (location_t, enum tree_code, tree);
+extern tree objcp_finish_struct (location_t, tree, tree, tree);
extern void objcp_finish_function (void);
extern tree objcp_build_function_call (tree, tree);
extern tree objcp_xref_tag (enum tree_code, tree);
@@ -49,7 +49,7 @@ extern tree objcp_end_compound_stmt (tree, int);
objcp_comptypes (type1, type2)
#define c_begin_compound_stmt(flags) \
objcp_begin_compound_stmt (flags)
-#define c_end_compound_stmt(stmt, flags) \
+#define c_end_compound_stmt(loc, stmt, flags) \
objcp_end_compound_stmt (stmt, flags)
#undef OBJC_TYPE_NAME