diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-14 10:57:59 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-02-14 10:57:59 +0000 |
| commit | 0f8fccb6caa8aed5e8d2233ac760b623eb846556 (patch) | |
| tree | 5a445ae95e6c1973829a9b8b97248b83cc68eddc /gcc/cp | |
| parent | e1a6547e4a4a51612ce68b6b911a7cbda6d628ee (diff) | |
| download | gcc-0f8fccb6caa8aed5e8d2233ac760b623eb846556.tar.gz | |
cp:
* cp-tree.h (setup_vtbl_ptr): Move prototype to semantics.c
section.
* init.c (emit_base_init): Remove incorrect comment about
virtual bases.
* method.c (make_thunk): Fix comment alignment.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39679 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 5 | ||||
| -rw-r--r-- | gcc/cp/init.c | 5 | ||||
| -rw-r--r-- | gcc/cp/method.c | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 8cbbe7ce9d9..e86e9fbf62c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,13 @@ 2001-02-14 Nathan Sidwell <nathan@codesourcery.com> + * cp-tree.h (setup_vtbl_ptr): Move prototype to semantics.c + section. + * init.c (emit_base_init): Remove incorrect comment about + virtual bases. + * method.c (make_thunk): Fix comment alignment. + +2001-02-14 Nathan Sidwell <nathan@codesourcery.com> + Kill remnants of this is variable. * cp-tree.h (flag_this_is_variable): Remove. * decl2.c (flag_this_is_variable): Remove. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 17238730e6f..f970b94370f 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3927,8 +3927,7 @@ extern int copy_assignment_arg_p PARAMS ((tree, int)); extern void cplus_decl_attributes PARAMS ((tree, tree, tree)); extern tree constructor_name_full PARAMS ((tree)); extern tree constructor_name PARAMS ((tree)); -extern void setup_vtbl_ptr PARAMS ((tree, tree)); -extern void defer_fn PARAMS ((tree)); +extern void defer_fn PARAMS ((tree)); extern tree get_temp_name PARAMS ((tree)); extern void finish_anon_union PARAMS ((tree)); extern tree finish_table PARAMS ((tree, tree, tree, int)); @@ -4318,7 +4317,7 @@ extern void prep_stmt PARAMS ((tree)); extern void do_pushlevel PARAMS ((void)); extern tree do_poplevel PARAMS ((void)); extern void finish_mem_initializers PARAMS ((tree)); - +extern void setup_vtbl_ptr PARAMS ((tree, tree)); extern void clear_out_block PARAMS ((void)); extern tree begin_global_stmt_expr PARAMS ((void)); extern tree finish_global_stmt_expr PARAMS ((tree)); diff --git a/gcc/cp/init.c b/gcc/cp/init.c index becb347bc96..e2ac3ba6636 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -696,10 +696,7 @@ sort_base_init (t, base_init_list, rbase_ptr, vbase_ptr) If there is a need for a call to a constructor, we must surround that call with a pushlevel/poplevel pair, since we are technically - at the PARM level of scope. - - Note that emit_base_init does *not* initialize virtual base - classes. That is done specially, elsewhere. */ + at the PARM level of scope. */ void emit_base_init (mem_init_list, base_init_list) diff --git a/gcc/cp/method.c b/gcc/cp/method.c index a2b0a5aaea4..ccaec60424f 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -356,7 +356,7 @@ make_thunk (function, delta, vcall_index, generate_with_vtable_p) THUNK_VCALL_OFFSET (thunk) = vcall_offset; THUNK_GENERATE_WITH_VTABLE_P (thunk) = generate_with_vtable_p; /* The thunk itself is not a constructor or destructor, even if - the thing it is thunking to is. */ + the thing it is thunking to is. */ DECL_INTERFACE_KNOWN (thunk) = 1; DECL_NOT_REALLY_EXTERN (thunk) = 1; DECL_SAVED_FUNCTION_DATA (thunk) = NULL; |