This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch installed: C++ PROTO->PARAMS part3
- To: egcs-patches at egcs dot cygnus dot com, jason at cygnus dot com, mark at codesourcery dot com
- Subject: Patch installed: C++ PROTO->PARAMS part3
- From: "Kaveh R. Ghazi" <ghazi at caip dot rutgers dot edu>
- Date: Wed, 26 Jan 2000 16:04:58 -0500 (EST)
Index: input.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/input.c,v
retrieving revision 1.14
diff -u -p -r1.14 input.c
--- input.c 1999/07/27 10:10:49 1.14
+++ input.c 2000/01/26 20:40:58
@@ -1,5 +1,6 @@
/* Input handling for G++.
- Copyright (C) 1992, 93-98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
+ Free Software Foundation, Inc.
Written by Ken Raeburn (raeburn@cygnus.com) while at Watchmaker Computing.
Enhanced by Michael Tiemann (tiemann@cygnus.com) to better support USE_CPPLIB
@@ -69,15 +70,15 @@ extern unsigned char *yy_cur, *yy_lim;
extern int yy_get_token ();
#endif
-extern void feed_input PROTO((char *, int, char *, int));
-extern void put_input PROTO((int));
-extern void put_back PROTO((int));
-extern int getch PROTO((void));
-extern int input_redirected PROTO((void));
-
-static inline struct input_source * allocate_input PROTO((void));
-static inline void free_input PROTO((struct input_source *));
-static inline void end_input PROTO((void));
+extern void feed_input PARAMS ((char *, int, char *, int));
+extern void put_input PARAMS ((int));
+extern void put_back PARAMS ((int));
+extern int getch PARAMS ((void));
+extern int input_redirected PARAMS ((void));
+
+static inline struct input_source * allocate_input PARAMS ((void));
+static inline void free_input PARAMS ((struct input_source *));
+static inline void end_input PARAMS ((void));
static inline struct input_source *
allocate_input ()
Index: lex.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/lex.c,v
retrieving revision 1.173
diff -u -p -r1.173 lex.c
--- lex.c 2000/01/12 05:22:42 1.173
+++ lex.c 2000/01/26 20:41:07
@@ -48,47 +48,47 @@ Boston, MA 02111-1307, USA. */
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
-extern void yyprint PROTO((FILE *, int, YYSTYPE));
+extern void yyprint PARAMS ((FILE *, int, YYSTYPE));
-static tree get_time_identifier PROTO((const char *));
-static int check_newline PROTO((void));
-static int whitespace_cr PROTO((int));
-static int skip_white_space PROTO((int));
-static void finish_defarg PROTO((void));
-static int my_get_run_time PROTO((void));
-static int interface_strcmp PROTO((const char *));
-static int readescape PROTO((int *));
-static char *extend_token_buffer PROTO((const char *));
-static void consume_string PROTO((struct obstack *, int));
-static void feed_defarg PROTO((tree, tree));
-static void store_pending_inline PROTO((tree, struct pending_inline *));
-static void reinit_parse_for_expr PROTO((struct obstack *));
-static int *init_cpp_parse PROTO((void));
-static void cp_pragma_interface PROTO((char *));
-static void cp_pragma_implementation PROTO ((char *));
-static int handle_cp_pragma PROTO((const char *));
+static tree get_time_identifier PARAMS ((const char *));
+static int check_newline PARAMS ((void));
+static int whitespace_cr PARAMS ((int));
+static int skip_white_space PARAMS ((int));
+static void finish_defarg PARAMS ((void));
+static int my_get_run_time PARAMS ((void));
+static int interface_strcmp PARAMS ((const char *));
+static int readescape PARAMS ((int *));
+static char *extend_token_buffer PARAMS ((const char *));
+static void consume_string PARAMS ((struct obstack *, int));
+static void feed_defarg PARAMS ((tree, tree));
+static void store_pending_inline PARAMS ((tree, struct pending_inline *));
+static void reinit_parse_for_expr PARAMS ((struct obstack *));
+static int *init_cpp_parse PARAMS ((void));
+static void cp_pragma_interface PARAMS ((char *));
+static void cp_pragma_implementation PARAMS ((char *));
+static int handle_cp_pragma PARAMS ((const char *));
#ifdef HANDLE_GENERIC_PRAGMAS
-static int handle_generic_pragma PROTO((int));
+static int handle_generic_pragma PARAMS ((int));
#endif
#ifdef GATHER_STATISTICS
#ifdef REDUCE_LENGTH
-static int reduce_cmp PROTO((int *, int *));
-static int token_cmp PROTO((int *, int *));
+static int reduce_cmp PARAMS ((int *, int *));
+static int token_cmp PARAMS ((int *, int *));
#endif
#endif
-static void begin_definition_of_inclass_inline PROTO((struct pending_inline*));
-static void parse_float PROTO((PTR));
-static int is_global PROTO((tree));
-static void init_filename_times PROTO((void));
-static void extend_token_buffer_to PROTO((int));
+static void begin_definition_of_inclass_inline PARAMS ((struct pending_inline*));
+static void parse_float PARAMS ((PTR));
+static int is_global PARAMS ((tree));
+static void init_filename_times PARAMS ((void));
+static void extend_token_buffer_to PARAMS ((int));
#ifdef HANDLE_PRAGMA
-static int pragma_getc PROTO((void));
-static void pragma_ungetc PROTO((int));
+static int pragma_getc PARAMS ((void));
+static void pragma_ungetc PARAMS ((int));
#endif
-static int read_line_number PROTO((int *));
-static int token_getch PROTO ((void));
-static void token_put_back PROTO ((int));
-static void mark_impl_file_chain PROTO ((void *));
+static int read_line_number PARAMS ((int *));
+static int token_getch PARAMS ((void));
+static void token_put_back PARAMS ((int));
+static void mark_impl_file_chain PARAMS ((void *));
/* Given a file name X, return the nondirectory portion.
Keep in mind that X can be computed more than once. */
@@ -4851,7 +4851,7 @@ dump_time_statistics ()
}
void
-compiler_error VPROTO ((const char *msg, ...))
+compiler_error VPARAMS ((const char *msg, ...))
{
#ifndef ANSI_PROTOTYPES
const char *msg;
Index: lex.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/lex.h,v
retrieving revision 1.9
diff -u -p -r1.9 lex.h
--- lex.h 1999/08/14 09:23:28 1.9
+++ lex.h 2000/01/26 20:41:07
@@ -1,5 +1,5 @@
/* Define constants and variables for communication with parse.y.
- Copyright (C) 1987, 92-97, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1987, 92-97, 1998, 2000 Free Software Foundation, Inc.
Hacked by Michael Tiemann (tiemann@cygnus.com)
and by Brendan Kehoe (brendan@cygnus.com).
@@ -130,6 +130,6 @@ extern tree got_object;
Positive is push count, negative is pop count. */
extern int pending_lang_change;
-extern int yylex PROTO((void));
+extern int yylex PARAMS ((void));
extern struct lang_decl *free_lang_decl_chain;
Index: method.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/method.c,v
retrieving revision 1.132
diff -u -p -r1.132 method.c
--- method.c 2000/01/17 20:18:40 1.132
+++ method.c 2000/01/26 20:41:09
@@ -65,39 +65,39 @@ struct pending_inline *pending_inlines;
static struct obstack scratch_obstack;
static char *scratch_firstobj;
-static void icat PROTO((HOST_WIDE_INT));
-static void dicat PROTO((HOST_WIDE_INT, HOST_WIDE_INT));
-static int old_backref_index PROTO((tree));
-static int flush_repeats PROTO((int, tree));
-static void build_overload_identifier PROTO((tree));
-static void build_overload_nested_name PROTO((tree));
-static void mangle_expression PROTO((tree));
-static void build_overload_int PROTO((tree, mangling_flags));
-static void build_overload_identifier PROTO((tree));
-static void build_qualified_name PROTO((tree));
-static void build_overload_value PROTO((tree, tree, mangling_flags));
-static void issue_nrepeats PROTO((int, tree));
-static char *build_mangled_name PROTO((tree,int,int));
-static void process_modifiers PROTO((tree));
-static void process_overload_item PROTO((tree,int));
-static void do_build_assign_ref PROTO((tree));
-static void do_build_copy_constructor PROTO((tree));
-static void build_template_template_parm_names PROTO((tree));
-static void build_template_parm_names PROTO((tree, tree));
-static void build_underscore_int PROTO((int));
-static void start_squangling PROTO((void));
-static void end_squangling PROTO((void));
-static int check_ktype PROTO((tree, int));
-static int issue_ktype PROTO((tree));
-static void build_overload_scope_ref PROTO((tree));
-static void build_mangled_template_parm_index PROTO((const char *, tree));
+static void icat PARAMS ((HOST_WIDE_INT));
+static void dicat PARAMS ((HOST_WIDE_INT, HOST_WIDE_INT));
+static int old_backref_index PARAMS ((tree));
+static int flush_repeats PARAMS ((int, tree));
+static void build_overload_identifier PARAMS ((tree));
+static void build_overload_nested_name PARAMS ((tree));
+static void mangle_expression PARAMS ((tree));
+static void build_overload_int PARAMS ((tree, mangling_flags));
+static void build_overload_identifier PARAMS ((tree));
+static void build_qualified_name PARAMS ((tree));
+static void build_overload_value PARAMS ((tree, tree, mangling_flags));
+static void issue_nrepeats PARAMS ((int, tree));
+static char *build_mangled_name PARAMS ((tree,int,int));
+static void process_modifiers PARAMS ((tree));
+static void process_overload_item PARAMS ((tree,int));
+static void do_build_assign_ref PARAMS ((tree));
+static void do_build_copy_constructor PARAMS ((tree));
+static void build_template_template_parm_names PARAMS ((tree));
+static void build_template_parm_names PARAMS ((tree, tree));
+static void build_underscore_int PARAMS ((int));
+static void start_squangling PARAMS ((void));
+static void end_squangling PARAMS ((void));
+static int check_ktype PARAMS ((tree, int));
+static int issue_ktype PARAMS ((tree));
+static void build_overload_scope_ref PARAMS ((tree));
+static void build_mangled_template_parm_index PARAMS ((const char *, tree));
#if HOST_BITS_PER_WIDE_INT >= 64
-static void build_mangled_C9x_name PROTO((int));
+static void build_mangled_C9x_name PARAMS ((int));
#endif
-static int is_back_referenceable_type PROTO((tree));
-static int check_btype PROTO((tree));
-static void build_mangled_name_for_type PROTO((tree));
-static void build_mangled_name_for_type_with_Gcode PROTO((tree, int));
+static int is_back_referenceable_type PARAMS ((tree));
+static int check_btype PARAMS ((tree));
+static void build_mangled_name_for_type PARAMS ((tree));
+static void build_mangled_name_for_type_with_Gcode PARAMS ((tree, int));
# define OB_INIT() (scratch_firstobj ? (obstack_free (&scratch_obstack, scratch_firstobj), 0) : 0)
# define OB_PUTC(C) (obstack_1grow (&scratch_obstack, (C)))
Index: optimize.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/optimize.c,v
retrieving revision 1.12
diff -u -p -r1.12 optimize.c
--- optimize.c 2000/01/15 04:36:04 1.12
+++ optimize.c 2000/01/26 20:41:10
@@ -65,17 +65,17 @@ typedef struct inline_data
/* Prototypes. */
-static tree initialize_inlined_parameters PROTO((inline_data *, tree, tree));
-static tree declare_return_variable PROTO((inline_data *, tree *));
-static tree copy_body_r PROTO((tree *, int *, void *));
-static tree copy_body PROTO((inline_data *));
-static tree expand_call_inline PROTO((tree *, int *, void *));
-static void expand_calls_inline PROTO((tree *, inline_data *));
-static int inlinable_function_p PROTO((tree, inline_data *));
-static tree remap_decl PROTO((tree, inline_data *));
-static void remap_block PROTO((tree, tree, inline_data *));
-static void copy_scope_stmt PROTO((tree *, int *, inline_data *));
-static tree calls_setjmp_r PROTO((tree *, int *, void *));
+static tree initialize_inlined_parameters PARAMS ((inline_data *, tree, tree));
+static tree declare_return_variable PARAMS ((inline_data *, tree *));
+static tree copy_body_r PARAMS ((tree *, int *, void *));
+static tree copy_body PARAMS ((inline_data *));
+static tree expand_call_inline PARAMS ((tree *, int *, void *));
+static void expand_calls_inline PARAMS ((tree *, inline_data *));
+static int inlinable_function_p PARAMS ((tree, inline_data *));
+static tree remap_decl PARAMS ((tree, inline_data *));
+static void remap_block PARAMS ((tree, tree, inline_data *));
+static void copy_scope_stmt PARAMS ((tree *, int *, inline_data *));
+static tree calls_setjmp_r PARAMS ((tree *, int *, void *));
/* Remap DECL during the copying of the BLOCK tree for the function.
DATA is really an `inline_data *'. */
Index: parse.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/parse.c,v
retrieving revision 1.148
diff -u -p -r1.148 parse.c
--- parse.c 2000/01/18 10:23:31 1.148
+++ parse.c 2000/01/26 20:41:26
@@ -127,8 +127,8 @@ extern int end_of_file;
error message if the user supplies an empty conditional expression. */
static const char *cond_stmt_keyword;
-static tree empty_parms PROTO((void));
-static void parse_decl PROTO((tree, tree, tree, int, tree *));
+static tree empty_parms PARAMS ((void));
+static void parse_decl PARAMS ((tree, tree, tree, int, tree *));
/* Nonzero if we have an `extern "C"' acting as an extern specifier. */
int have_extern_spec;
@@ -180,8 +180,8 @@ static tree current_enum_type;
/* Tell yyparse how to print a token's value, if yydebug is set. */
#define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint PROTO((FILE *, int, YYSTYPE));
-extern tree combine_strings PROTO((tree));
+extern void yyprint PARAMS ((FILE *, int, YYSTYPE));
+extern tree combine_strings PARAMS ((tree));
static void
parse_decl (declarator, specs_attrs, attributes, initialized, decl)
Index: parse.y
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/parse.y,v
retrieving revision 1.159
diff -u -p -r1.159 parse.y
--- parse.y 2000/01/18 10:23:31 1.159
+++ parse.y 2000/01/26 20:41:31
@@ -62,8 +62,8 @@ extern int end_of_file;
error message if the user supplies an empty conditional expression. */
static const char *cond_stmt_keyword;
-static tree empty_parms PROTO((void));
-static void parse_decl PROTO((tree, tree, tree, int, tree *));
+static tree empty_parms PARAMS ((void));
+static void parse_decl PARAMS ((tree, tree, tree, int, tree *));
/* Nonzero if we have an `extern "C"' acting as an extern specifier. */
int have_extern_spec;
@@ -311,8 +311,8 @@ static tree current_enum_type;
/* Tell yyparse how to print a token's value, if yydebug is set. */
#define YYPRINT(FILE,YYCHAR,YYLVAL) yyprint(FILE,YYCHAR,YYLVAL)
-extern void yyprint PROTO((FILE *, int, YYSTYPE));
-extern tree combine_strings PROTO((tree));
+extern void yyprint PARAMS ((FILE *, int, YYSTYPE));
+extern tree combine_strings PARAMS ((tree));
static void
parse_decl (declarator, specs_attrs, attributes, initialized, decl)
Index: pt.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/pt.c,v
retrieving revision 1.393
diff -u -p -r1.393 pt.c
--- pt.c 2000/01/25 05:53:12 1.393
+++ pt.c 2000/01/26 20:41:45
@@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA. */
/* The type of functions taking a tree, and some additional data, and
returning an int. */
-typedef int (*tree_fn_t) PROTO((tree, void*));
+typedef int (*tree_fn_t) PARAMS ((tree, void*));
extern struct obstack permanent_obstack;
@@ -87,77 +87,77 @@ static size_t inline_parm_levels_used;
#define GTB_IGNORE_TYPE 2 /* We don't need to try to unify the current
type with the desired type. */
-static int resolve_overloaded_unification PROTO((tree, tree, tree, tree,
+static int resolve_overloaded_unification PARAMS ((tree, tree, tree, tree,
unification_kind_t, int));
-static int try_one_overload PROTO((tree, tree, tree, tree, tree,
+static int try_one_overload PARAMS ((tree, tree, tree, tree, tree,
unification_kind_t, int));
-static int unify PROTO((tree, tree, tree, tree, int));
-static void add_pending_template PROTO((tree));
-static int push_tinst_level PROTO((tree));
-static tree classtype_mangled_name PROTO((tree));
-static char *mangle_class_name_for_template PROTO((char *, tree, tree));
-static tree tsubst_expr_values PROTO((tree, tree));
-static int list_eq PROTO((tree, tree));
-static tree get_class_bindings PROTO((tree, tree, tree));
-static tree coerce_template_parms PROTO((tree, tree, tree, int, int));
-static void tsubst_enum PROTO((tree, tree, tree));
-static tree add_to_template_args PROTO((tree, tree));
-static tree add_outermost_template_args PROTO((tree, tree));
-static void maybe_adjust_types_for_deduction PROTO((unification_kind_t, tree*,
+static int unify PARAMS ((tree, tree, tree, tree, int));
+static void add_pending_template PARAMS ((tree));
+static int push_tinst_level PARAMS ((tree));
+static tree classtype_mangled_name PARAMS ((tree));
+static char *mangle_class_name_for_template PARAMS ((char *, tree, tree));
+static tree tsubst_expr_values PARAMS ((tree, tree));
+static int list_eq PARAMS ((tree, tree));
+static tree get_class_bindings PARAMS ((tree, tree, tree));
+static tree coerce_template_parms PARAMS ((tree, tree, tree, int, int));
+static void tsubst_enum PARAMS ((tree, tree, tree));
+static tree add_to_template_args PARAMS ((tree, tree));
+static tree add_outermost_template_args PARAMS ((tree, tree));
+static void maybe_adjust_types_for_deduction PARAMS ((unification_kind_t, tree*,
tree*));
-static int type_unification_real PROTO((tree, tree, tree, tree,
+static int type_unification_real PARAMS ((tree, tree, tree, tree,
int, unification_kind_t, int));
-static void note_template_header PROTO((int));
-static tree maybe_fold_nontype_arg PROTO((tree));
-static tree convert_nontype_argument PROTO((tree, tree));
-static tree convert_template_argument PROTO ((tree, tree, tree, int,
+static void note_template_header PARAMS ((int));
+static tree maybe_fold_nontype_arg PARAMS ((tree));
+static tree convert_nontype_argument PARAMS ((tree, tree));
+static tree convert_template_argument PARAMS ((tree, tree, tree, int,
int , tree));
-static tree get_bindings_overload PROTO((tree, tree, tree));
-static int for_each_template_parm PROTO((tree, tree_fn_t, void*));
-static tree build_template_parm_index PROTO((int, int, int, tree, tree));
-static int inline_needs_template_parms PROTO((tree));
-static void push_inline_template_parms_recursive PROTO((tree, int));
-static tree retrieve_specialization PROTO((tree, tree));
-static tree retrieve_local_specialization PROTO((tree, tree));
-static tree register_specialization PROTO((tree, tree, tree));
-static tree register_local_specialization PROTO((tree, tree, tree));
-static int unregister_specialization PROTO((tree, tree));
-static tree reduce_template_parm_level PROTO((tree, tree, int));
-static tree build_template_decl PROTO((tree, tree));
-static int mark_template_parm PROTO((tree, void *));
-static tree tsubst_friend_function PROTO((tree, tree));
-static tree tsubst_friend_class PROTO((tree, tree));
-static tree get_bindings_real PROTO((tree, tree, tree, int));
-static int template_decl_level PROTO((tree));
-static tree maybe_get_template_decl_from_type_decl PROTO((tree));
-static int check_cv_quals_for_unify PROTO((int, tree, tree));
-static tree tsubst_template_arg_vector PROTO((tree, tree, int));
-static tree tsubst_template_parms PROTO((tree, tree, int));
-static void regenerate_decl_from_template PROTO((tree, tree));
-static tree most_specialized PROTO((tree, tree, tree));
-static tree most_specialized_class PROTO((tree, tree));
-static void set_mangled_name_for_template_decl PROTO((tree));
-static int template_class_depth_real PROTO((tree, int));
-static tree tsubst_aggr_type PROTO((tree, tree, int, tree, int));
-static tree tsubst_decl PROTO((tree, tree, tree, tree));
-static tree tsubst_arg_types PROTO((tree, tree, int, tree));
-static tree tsubst_function_type PROTO((tree, tree, int, tree));
-static void check_specialization_scope PROTO((void));
-static tree process_partial_specialization PROTO((tree));
-static void set_current_access_from_decl PROTO((tree));
-static void check_default_tmpl_args PROTO((tree, tree, int, int));
-static tree tsubst_call_declarator_parms PROTO((tree, tree, int, tree));
-static tree get_template_base_recursive PROTO((tree, tree,
+static tree get_bindings_overload PARAMS ((tree, tree, tree));
+static int for_each_template_parm PARAMS ((tree, tree_fn_t, void*));
+static tree build_template_parm_index PARAMS ((int, int, int, tree, tree));
+static int inline_needs_template_parms PARAMS ((tree));
+static void push_inline_template_parms_recursive PARAMS ((tree, int));
+static tree retrieve_specialization PARAMS ((tree, tree));
+static tree retrieve_local_specialization PARAMS ((tree, tree));
+static tree register_specialization PARAMS ((tree, tree, tree));
+static tree register_local_specialization PARAMS ((tree, tree, tree));
+static int unregister_specialization PARAMS ((tree, tree));
+static tree reduce_template_parm_level PARAMS ((tree, tree, int));
+static tree build_template_decl PARAMS ((tree, tree));
+static int mark_template_parm PARAMS ((tree, void *));
+static tree tsubst_friend_function PARAMS ((tree, tree));
+static tree tsubst_friend_class PARAMS ((tree, tree));
+static tree get_bindings_real PARAMS ((tree, tree, tree, int));
+static int template_decl_level PARAMS ((tree));
+static tree maybe_get_template_decl_from_type_decl PARAMS ((tree));
+static int check_cv_quals_for_unify PARAMS ((int, tree, tree));
+static tree tsubst_template_arg_vector PARAMS ((tree, tree, int));
+static tree tsubst_template_parms PARAMS ((tree, tree, int));
+static void regenerate_decl_from_template PARAMS ((tree, tree));
+static tree most_specialized PARAMS ((tree, tree, tree));
+static tree most_specialized_class PARAMS ((tree, tree));
+static void set_mangled_name_for_template_decl PARAMS ((tree));
+static int template_class_depth_real PARAMS ((tree, int));
+static tree tsubst_aggr_type PARAMS ((tree, tree, int, tree, int));
+static tree tsubst_decl PARAMS ((tree, tree, tree, tree));
+static tree tsubst_arg_types PARAMS ((tree, tree, int, tree));
+static tree tsubst_function_type PARAMS ((tree, tree, int, tree));
+static void check_specialization_scope PARAMS ((void));
+static tree process_partial_specialization PARAMS ((tree));
+static void set_current_access_from_decl PARAMS ((tree));
+static void check_default_tmpl_args PARAMS ((tree, tree, int, int));
+static tree tsubst_call_declarator_parms PARAMS ((tree, tree, int, tree));
+static tree get_template_base_recursive PARAMS ((tree, tree,
tree, tree, tree, int));
-static tree get_template_base PROTO((tree, tree, tree, tree));
-static tree try_class_unification PROTO((tree, tree, tree, tree));
-static int coerce_template_template_parms PROTO((tree, tree, int,
+static tree get_template_base PARAMS ((tree, tree, tree, tree));
+static tree try_class_unification PARAMS ((tree, tree, tree, tree));
+static int coerce_template_template_parms PARAMS ((tree, tree, int,
tree, tree));
-static tree determine_specialization PROTO((tree, tree, tree *, int));
-static int template_args_equal PROTO((tree, tree));
-static void print_template_context PROTO((int));
-static void tsubst_default_arguments PROTO((tree));
-static tree for_each_template_parm_r PROTO((tree *, int *, void *));
+static tree determine_specialization PARAMS ((tree, tree, tree *, int));
+static int template_args_equal PARAMS ((tree, tree));
+static void print_template_context PARAMS ((int));
+static void tsubst_default_arguments PARAMS ((tree));
+static tree for_each_template_parm_r PARAMS ((tree *, int *, void *));
/* Called once to initialize pt.c. */
Index: repo.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/repo.c,v
retrieving revision 1.23
diff -u -p -r1.23 repo.c
--- repo.c 1999/12/21 00:19:01 1.23
+++ repo.c 2000/01/26 20:41:46
@@ -1,5 +1,5 @@
/* Code to maintain a C++ template repository.
- Copyright (C) 1995, 96-97, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1995, 96-97, 1998, 2000 Free Software Foundation, Inc.
Contributed by Jason Merrill (jason@cygnus.com)
This file is part of GNU CC.
@@ -34,12 +34,12 @@ Boston, MA 02111-1307, USA. */
#include "toplev.h"
#include "ggc.h"
-static tree repo_get_id PROTO((tree));
-static char *extract_string PROTO((char **));
-static char *get_base_filename PROTO((const char *));
-static void open_repo_file PROTO((const char *));
-static char *afgets PROTO((FILE *));
-static void reopen_repo_file_for_write PROTO((void));
+static tree repo_get_id PARAMS ((tree));
+static char *extract_string PARAMS ((char **));
+static char *get_base_filename PARAMS ((const char *));
+static void open_repo_file PARAMS ((const char *));
+static char *afgets PARAMS ((FILE *));
+static void reopen_repo_file_for_write PARAMS ((void));
static tree pending_repo;
static tree original_repo;
Index: rtti.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/rtti.c,v
retrieving revision 1.57
diff -u -p -r1.57 rtti.c
--- rtti.c 2000/01/24 12:16:59 1.57
+++ rtti.c 2000/01/26 20:41:50
@@ -35,23 +35,23 @@ Boston, MA 02111-1307, USA. */
extern struct obstack permanent_obstack;
-static tree build_runtime_decl PROTO((const char *, tree));
-static tree build_headof_sub PROTO((tree));
-static tree build_headof PROTO((tree));
-static tree get_tinfo_var PROTO((tree));
-static tree ifnonnull PROTO((tree, tree));
-static tree tinfo_name PROTO((tree));
-static tree get_base_offset PROTO((tree, tree));
-static tree build_dynamic_cast_1 PROTO((tree, tree));
-static void expand_si_desc PROTO((tree, tree));
-static void expand_class_desc PROTO((tree, tree));
-static void expand_attr_desc PROTO((tree, tree));
-static void expand_ptr_desc PROTO((tree, tree));
-static void expand_generic_desc PROTO((tree, tree, const char *));
-static tree throw_bad_cast PROTO((void));
-static tree throw_bad_typeid PROTO((void));
-static tree get_tinfo_decl_dynamic PROTO((tree));
-static tree tinfo_from_decl PROTO((tree));
+static tree build_runtime_decl PARAMS ((const char *, tree));
+static tree build_headof_sub PARAMS ((tree));
+static tree build_headof PARAMS ((tree));
+static tree get_tinfo_var PARAMS ((tree));
+static tree ifnonnull PARAMS ((tree, tree));
+static tree tinfo_name PARAMS ((tree));
+static tree get_base_offset PARAMS ((tree, tree));
+static tree build_dynamic_cast_1 PARAMS ((tree, tree));
+static void expand_si_desc PARAMS ((tree, tree));
+static void expand_class_desc PARAMS ((tree, tree));
+static void expand_attr_desc PARAMS ((tree, tree));
+static void expand_ptr_desc PARAMS ((tree, tree));
+static void expand_generic_desc PARAMS ((tree, tree, const char *));
+static tree throw_bad_cast PARAMS ((void));
+static tree throw_bad_typeid PARAMS ((void));
+static tree get_tinfo_decl_dynamic PARAMS ((tree));
+static tree tinfo_from_decl PARAMS ((tree));
void
init_rtti_processing ()
Index: search.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/search.c,v
retrieving revision 1.149
diff -u -p -r1.149 search.c
--- search.c 2000/01/20 11:05:19 1.149
+++ search.c 2000/01/26 20:41:55
@@ -75,78 +75,78 @@ pop_stack_level (stack)
#define search_level stack_level
static struct search_level *search_stack;
-static tree next_baselink PROTO((tree));
-static tree get_vbase_1 PROTO((tree, tree, unsigned int *));
-static tree lookup_field_1 PROTO((tree, tree));
-static tree convert_pointer_to_single_level PROTO((tree, tree));
-static int lookup_fnfields_here PROTO((tree, tree));
-static int is_subobject_of_p PROTO((tree, tree));
-static int hides PROTO((tree, tree));
-static tree virtual_context PROTO((tree, tree, tree));
-static tree dfs_check_overlap PROTO((tree, void *));
-static tree dfs_no_overlap_yet PROTO((tree, void *));
+static tree next_baselink PARAMS ((tree));
+static tree get_vbase_1 PARAMS ((tree, tree, unsigned int *));
+static tree lookup_field_1 PARAMS ((tree, tree));
+static tree convert_pointer_to_single_level PARAMS ((tree, tree));
+static int lookup_fnfields_here PARAMS ((tree, tree));
+static int is_subobject_of_p PARAMS ((tree, tree));
+static int hides PARAMS ((tree, tree));
+static tree virtual_context PARAMS ((tree, tree, tree));
+static tree dfs_check_overlap PARAMS ((tree, void *));
+static tree dfs_no_overlap_yet PARAMS ((tree, void *));
static int get_base_distance_recursive
- PROTO((tree, int, int, int, int *, tree *, tree,
+ PARAMS ((tree, int, int, int, int *, tree *, tree,
int, int *, int, int));
-static int dynamic_cast_base_recurse PROTO((tree, tree, int, tree *));
+static int dynamic_cast_base_recurse PARAMS ((tree, tree, int, tree *));
static void expand_upcast_fixups
- PROTO((tree, tree, tree, tree, tree, tree, tree *));
+ PARAMS ((tree, tree, tree, tree, tree, tree, tree *));
static void fixup_virtual_upcast_offsets
- PROTO((tree, tree, int, int, tree, tree, tree, tree,
+ PARAMS ((tree, tree, int, int, tree, tree, tree, tree,
tree *));
-static tree marked_vtable_pathp PROTO((tree, void *));
-static tree unmarked_vtable_pathp PROTO((tree, void *));
-static tree marked_new_vtablep PROTO((tree, void *));
-static tree unmarked_new_vtablep PROTO((tree, void *));
-static tree marked_pushdecls_p PROTO((tree, void *));
-static tree unmarked_pushdecls_p PROTO((tree, void *));
+static tree marked_vtable_pathp PARAMS ((tree, void *));
+static tree unmarked_vtable_pathp PARAMS ((tree, void *));
+static tree marked_new_vtablep PARAMS ((tree, void *));
+static tree unmarked_new_vtablep PARAMS ((tree, void *));
+static tree marked_pushdecls_p PARAMS ((tree, void *));
+static tree unmarked_pushdecls_p PARAMS ((tree, void *));
#if 0
-static tree dfs_debug_unmarkedp PROTO((tree, void *));
-static tree dfs_debug_mark PROTO((tree, void *));
+static tree dfs_debug_unmarkedp PARAMS ((tree, void *));
+static tree dfs_debug_mark PARAMS ((tree, void *));
#endif
-static tree dfs_find_vbases PROTO((tree, void *));
-static tree dfs_clear_vbase_slots PROTO((tree, void *));
-static tree dfs_init_vbase_pointers PROTO((tree, void *));
-static tree dfs_get_vbase_types PROTO((tree, void *));
-static tree dfs_push_type_decls PROTO((tree, void *));
-static tree dfs_push_decls PROTO((tree, void *));
-static tree dfs_unuse_fields PROTO((tree, void *));
-static tree add_conversions PROTO((tree, void *));
-static tree get_virtuals_named_this PROTO((tree, tree));
-static tree get_virtual_destructor PROTO((tree, void *));
-static tree tree_has_any_destructor_p PROTO((tree, void *));
-static int covariant_return_p PROTO((tree, tree));
-static int check_final_overrider PROTO((tree, tree));
+static tree dfs_find_vbases PARAMS ((tree, void *));
+static tree dfs_clear_vbase_slots PARAMS ((tree, void *));
+static tree dfs_init_vbase_pointers PARAMS ((tree, void *));
+static tree dfs_get_vbase_types PARAMS ((tree, void *));
+static tree dfs_push_type_decls PARAMS ((tree, void *));
+static tree dfs_push_decls PARAMS ((tree, void *));
+static tree dfs_unuse_fields PARAMS ((tree, void *));
+static tree add_conversions PARAMS ((tree, void *));
+static tree get_virtuals_named_this PARAMS ((tree, tree));
+static tree get_virtual_destructor PARAMS ((tree, void *));
+static tree tree_has_any_destructor_p PARAMS ((tree, void *));
+static int covariant_return_p PARAMS ((tree, tree));
+static int check_final_overrider PARAMS ((tree, tree));
static struct search_level *push_search_level
- PROTO((struct stack_level *, struct obstack *));
+ PARAMS ((struct stack_level *, struct obstack *));
static struct search_level *pop_search_level
- PROTO((struct stack_level *));
+ PARAMS ((struct stack_level *));
static tree bfs_walk
- PROTO((tree, tree (*) (tree, void *), tree (*) (tree, void *),
+ PARAMS ((tree, tree (*) (tree, void *), tree (*) (tree, void *),
void *));
-static tree lookup_field_queue_p PROTO((tree, void *));
-static tree lookup_field_r PROTO((tree, void *));
-static tree get_virtuals_named_this_r PROTO ((tree, void *));
-static tree context_for_name_lookup PROTO ((tree));
-static tree canonical_binfo PROTO ((tree));
-static tree shared_marked_p PROTO ((tree, void *));
-static tree shared_unmarked_p PROTO ((tree, void *));
-static int dependent_base_p PROTO ((tree));
-static tree dfs_accessible_queue_p PROTO ((tree, void *));
-static tree dfs_accessible_p PROTO ((tree, void *));
-static tree dfs_access_in_type PROTO ((tree, void *));
-static tree access_in_type PROTO ((tree, tree));
-static tree dfs_canonical_queue PROTO ((tree, void *));
-static tree dfs_assert_unmarked_p PROTO ((tree, void *));
-static void assert_canonical_unmarked PROTO ((tree));
-static int protected_accessible_p PROTO ((tree, tree, tree, tree));
-static int friend_accessible_p PROTO ((tree, tree, tree, tree));
-static void setup_class_bindings PROTO ((tree, int));
-static int template_self_reference_p PROTO ((tree, tree));
-static void fixup_all_virtual_upcast_offsets PROTO ((tree, tree));
-static tree dfs_mark_primary_bases PROTO((tree, void *));
-static tree get_shared_vbase_if_not_primary PROTO((tree, void *));
-static tree dfs_find_vbase_instance PROTO((tree, void *));
+static tree lookup_field_queue_p PARAMS ((tree, void *));
+static tree lookup_field_r PARAMS ((tree, void *));
+static tree get_virtuals_named_this_r PARAMS ((tree, void *));
+static tree context_for_name_lookup PARAMS ((tree));
+static tree canonical_binfo PARAMS ((tree));
+static tree shared_marked_p PARAMS ((tree, void *));
+static tree shared_unmarked_p PARAMS ((tree, void *));
+static int dependent_base_p PARAMS ((tree));
+static tree dfs_accessible_queue_p PARAMS ((tree, void *));
+static tree dfs_accessible_p PARAMS ((tree, void *));
+static tree dfs_access_in_type PARAMS ((tree, void *));
+static tree access_in_type PARAMS ((tree, tree));
+static tree dfs_canonical_queue PARAMS ((tree, void *));
+static tree dfs_assert_unmarked_p PARAMS ((tree, void *));
+static void assert_canonical_unmarked PARAMS ((tree));
+static int protected_accessible_p PARAMS ((tree, tree, tree, tree));
+static int friend_accessible_p PARAMS ((tree, tree, tree, tree));
+static void setup_class_bindings PARAMS ((tree, int));
+static int template_self_reference_p PARAMS ((tree, tree));
+static void fixup_all_virtual_upcast_offsets PARAMS ((tree, tree));
+static tree dfs_mark_primary_bases PARAMS ((tree, void *));
+static tree get_shared_vbase_if_not_primary PARAMS ((tree, void *));
+static tree dfs_find_vbase_instance PARAMS ((tree, void *));
/* Allocate a level of searching. */
@@ -1707,8 +1707,8 @@ lookup_fnfields_1 (type, name)
static tree
bfs_walk (binfo, fn, qfn, data)
tree binfo;
- tree (*fn) PROTO((tree, void *));
- tree (*qfn) PROTO((tree, void *));
+ tree (*fn) PARAMS ((tree, void *));
+ tree (*qfn) PARAMS ((tree, void *));
void *data;
{
size_t head;
@@ -1773,9 +1773,9 @@ bfs_walk (binfo, fn, qfn, data)
tree
dfs_walk_real (binfo, prefn, postfn, qfn, data)
tree binfo;
- tree (*prefn) PROTO((tree, void *));
- tree (*postfn) PROTO((tree, void *));
- tree (*qfn) PROTO((tree, void *));
+ tree (*prefn) PARAMS ((tree, void *));
+ tree (*postfn) PARAMS ((tree, void *));
+ tree (*qfn) PARAMS ((tree, void *));
void *data;
{
int i;
@@ -1822,8 +1822,8 @@ dfs_walk_real (binfo, prefn, postfn, qfn
tree
dfs_walk (binfo, fn, qfn, data)
tree binfo;
- tree (*fn) PROTO((tree, void *));
- tree (*qfn) PROTO((tree, void *));
+ tree (*fn) PARAMS ((tree, void *));
+ tree (*qfn) PARAMS ((tree, void *));
void *data;
{
return dfs_walk_real (binfo, 0, fn, qfn, data);
Index: semantics.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/semantics.c,v
retrieving revision 1.121
diff -u -p -r1.121 semantics.c
--- semantics.c 2000/01/11 02:43:00 1.121
+++ semantics.c 2000/01/26 20:41:58
@@ -45,9 +45,9 @@
parsing into this file; that will make implementing the new parser
much easier since it will be able to make use of these routines. */
-static tree expand_cond PROTO((tree));
-static tree maybe_convert_cond PROTO((tree));
-static tree simplify_aggr_init_exprs_r PROTO((tree *, int *, void *));
+static tree expand_cond PARAMS ((tree));
+static tree maybe_convert_cond PARAMS ((tree));
+static tree simplify_aggr_init_exprs_r PARAMS ((tree *, int *, void *));
/* Record the fact that STMT was the last statement added to the
statement tree. */
Index: spew.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/spew.c,v
retrieving revision 1.25
diff -u -p -r1.25 spew.c
--- spew.c 1999/12/01 18:09:09 1.25
+++ spew.c 2000/01/26 20:41:59
@@ -1,5 +1,5 @@
/* Type Analyzer for GNU C++.
- Copyright (C) 1987, 89, 92-97, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1987, 89, 92-97, 98, 99, 2000 Free Software Foundation, Inc.
Hacked... nay, bludgeoned... by Mark Eichin (eichin@cygnus.com)
This file is part of GNU CC.
@@ -46,15 +46,15 @@ struct token {
YYSTYPE yylval;
};
-static int do_aggr PROTO((void));
-static void scan_tokens PROTO((unsigned int));
+static int do_aggr PARAMS ((void));
+static void scan_tokens PARAMS ((unsigned int));
#ifdef SPEW_DEBUG
-static int num_tokens PROTO((void));
-static struct token *nth_token PROTO((int));
-static void add_token PROTO((struct token *));
-static void consume_token PROTO((void));
-static int debug_yychar PROTO((int));
+static int num_tokens PARAMS ((void));
+static struct token *nth_token PARAMS ((int));
+static void add_token PARAMS ((struct token *));
+static void consume_token PARAMS ((void));
+static int debug_yychar PARAMS ((int));
#endif
/* From lex.c: */
Index: tree.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/tree.c,v
retrieving revision 1.179
diff -u -p -r1.179 tree.c
--- tree.c 2000/01/23 19:51:01 1.179
+++ tree.c 2000/01/26 20:42:01
@@ -31,21 +31,21 @@ Boston, MA 02111-1307, USA. */
#include "insn-config.h"
#include "integrate.h"
-static tree bot_manip PROTO((tree *, int *, void *));
-static tree bot_replace PROTO((tree *, int *, void *));
-static tree build_cplus_array_type_1 PROTO((tree, tree));
-static void list_hash_add PROTO((int, tree));
-static int list_hash PROTO((tree, tree, tree));
-static tree list_hash_lookup PROTO((int, tree, tree, tree));
-static cp_lvalue_kind lvalue_p_1 PROTO((tree, int));
-static tree no_linkage_helper PROTO((tree *, int *, void *));
-static tree build_srcloc PROTO((char *, int));
-static void mark_list_hash PROTO ((void *));
-static int statement_code_p PROTO((enum tree_code));
-static tree mark_local_for_remap_r PROTO((tree *, int *, void *));
-static tree cp_unsave_r PROTO ((tree *, int *, void *));
-static void cp_unsave PROTO((tree *));
-static tree build_target_expr PROTO((tree, tree));
+static tree bot_manip PARAMS ((tree *, int *, void *));
+static tree bot_replace PARAMS ((tree *, int *, void *));
+static tree build_cplus_array_type_1 PARAMS ((tree, tree));
+static void list_hash_add PARAMS ((int, tree));
+static int list_hash PARAMS ((tree, tree, tree));
+static tree list_hash_lookup PARAMS ((int, tree, tree, tree));
+static cp_lvalue_kind lvalue_p_1 PARAMS ((tree, int));
+static tree no_linkage_helper PARAMS ((tree *, int *, void *));
+static tree build_srcloc PARAMS ((char *, int));
+static void mark_list_hash PARAMS ((void *));
+static int statement_code_p PARAMS ((enum tree_code));
+static tree mark_local_for_remap_r PARAMS ((tree *, int *, void *));
+static tree cp_unsave_r PARAMS ((tree *, int *, void *));
+static void cp_unsave PARAMS ((tree *));
+static tree build_target_expr PARAMS ((tree, tree));
/* If REF is an lvalue, returns the kind of lvalue that REF is.
Otherwise, returns clk_none. If TREAT_CLASS_RVALUES_AS_LVALUES is
@@ -1630,7 +1630,7 @@ break_out_target_exprs (t)
current line number. */
tree
-build_min_nt VPROTO((enum tree_code code, ...))
+build_min_nt VPARAMS ((enum tree_code code, ...))
{
#ifndef ANSI_PROTOTYPES
enum tree_code code;
@@ -1664,7 +1664,7 @@ build_min_nt VPROTO((enum tree_code code
line-number. */
tree
-build_min VPROTO((enum tree_code code, tree tt, ...))
+build_min VPARAMS ((enum tree_code code, tree tt, ...))
{
#ifndef ANSI_PROTOTYPES
enum tree_code code;
Index: typeck.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/typeck.c,v
retrieving revision 1.242
diff -u -p -r1.242 typeck.c
--- typeck.c 2000/01/26 02:06:21 1.242
+++ typeck.c 2000/01/26 20:42:09
@@ -41,31 +41,31 @@ Boston, MA 02111-1307, USA. */
#include "toplev.h"
#include "defaults.h"
-static tree convert_for_assignment PROTO((tree, tree, const char *, tree,
+static tree convert_for_assignment PARAMS ((tree, tree, const char *, tree,
int));
-static tree pointer_int_sum PROTO((enum tree_code, tree, tree));
-static tree rationalize_conditional_expr PROTO((enum tree_code, tree));
-static int comp_target_parms PROTO((tree, tree, int));
-static int comp_ptr_ttypes_real PROTO((tree, tree, int));
-static int comp_ptr_ttypes_const PROTO((tree, tree));
-static int comp_ptr_ttypes_reinterpret PROTO((tree, tree));
-static int comp_except_types PROTO((tree, tree, int));
-static int comp_array_types PROTO((int (*) (tree, tree, int), tree,
+static tree pointer_int_sum PARAMS ((enum tree_code, tree, tree));
+static tree rationalize_conditional_expr PARAMS ((enum tree_code, tree));
+static int comp_target_parms PARAMS ((tree, tree, int));
+static int comp_ptr_ttypes_real PARAMS ((tree, tree, int));
+static int comp_ptr_ttypes_const PARAMS ((tree, tree));
+static int comp_ptr_ttypes_reinterpret PARAMS ((tree, tree));
+static int comp_except_types PARAMS ((tree, tree, int));
+static int comp_array_types PARAMS ((int (*) (tree, tree, int), tree,
tree, int));
-static tree common_base_type PROTO((tree, tree));
+static tree common_base_type PARAMS ((tree, tree));
#if 0
-static tree convert_sequence PROTO((tree, tree));
+static tree convert_sequence PARAMS ((tree, tree));
#endif
-static tree lookup_anon_field PROTO((tree, tree));
-static tree pointer_diff PROTO((tree, tree, tree));
-static tree build_component_addr PROTO((tree, tree));
-static tree qualify_type PROTO((tree, tree));
-static tree get_delta_difference PROTO((tree, tree, int));
-static int comp_cv_target_types PROTO((tree, tree, int));
-static void casts_away_constness_r PROTO((tree *, tree *));
-static int casts_away_constness PROTO ((tree, tree));
-static void maybe_warn_about_returning_address_of_local PROTO ((tree));
-static tree strip_all_pointer_quals PROTO ((tree));
+static tree lookup_anon_field PARAMS ((tree, tree));
+static tree pointer_diff PARAMS ((tree, tree, tree));
+static tree build_component_addr PARAMS ((tree, tree));
+static tree qualify_type PARAMS ((tree, tree));
+static tree get_delta_difference PARAMS ((tree, tree, int));
+static int comp_cv_target_types PARAMS ((tree, tree, int));
+static void casts_away_constness_r PARAMS ((tree *, tree *));
+static int casts_away_constness PARAMS ((tree, tree));
+static void maybe_warn_about_returning_address_of_local PARAMS ((tree));
+static tree strip_all_pointer_quals PARAMS ((tree));
/* Return the target type of TYPE, which means return T for:
T*, T&, T[], T (...), and otherwise, just T. */
@@ -857,7 +857,7 @@ comp_except_specs (t1, t2, exact)
static int
comp_array_types (cmp, t1, t2, strict)
- register int (*cmp) PROTO((tree, tree, int));
+ register int (*cmp) PARAMS ((tree, tree, int));
tree t1, t2;
int strict;
{
Index: typeck2.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/typeck2.c,v
retrieving revision 1.72
diff -u -p -r1.72 typeck2.c
--- typeck2.c 2000/01/20 09:24:01 1.72
+++ typeck2.c 2000/01/26 20:42:11
@@ -1,6 +1,6 @@
/* Report error messages, build initializers, and perform
some front-end optimizations for C++ compiler.
- Copyright (C) 1987, 88, 89, 92-98, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1987, 88, 89, 92-98, 99, 2000 Free Software Foundation, Inc.
Hacked by Michael Tiemann (tiemann@cygnus.com)
This file is part of GNU CC.
@@ -38,8 +38,8 @@ Boston, MA 02111-1307, USA. */
#include "toplev.h"
#include "output.h"
-static tree process_init_constructor PROTO((tree, tree, tree *));
-static void ack PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1;
+static tree process_init_constructor PARAMS ((tree, tree, tree *));
+static void ack PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1;
/* Print an error message stemming from an attempt to use
BASETYPE as a base class for TYPE. */
@@ -83,7 +83,7 @@ readonly_error (arg, string, soft)
int soft;
{
const char *fmt;
- void (*fn) PVPROTO ((const char *, ...));
+ void (*fn) PARAMS ((const char *, ...));
if (soft)
fn = cp_pedwarn;
@@ -248,7 +248,7 @@ retry:
/* Like error(), but don't call report_error_function(). */
static void
-ack VPROTO ((const char *msg, ...))
+ack VPARAMS ((const char *msg, ...))
{
#ifndef ANSI_PROTOTYPES
const char *msg;
Index: xref.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/xref.c,v
retrieving revision 1.22
diff -u -p -r1.22 xref.c
--- xref.c 1999/12/29 06:39:42 1.22
+++ xref.c 2000/01/26 20:42:11
@@ -1,5 +1,5 @@
/* Code for handling XREF output from GNU C++.
- Copyright (C) 1992, 93-97, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1992, 93-97, 1998, 2000 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com)
This file is part of GNU CC.
@@ -117,15 +117,15 @@ static tree last_fndecl = NULL;
/* Forward definitions */
/* */
/************************************************************************/
-static void gen_assign PROTO((XREF_FILE, tree));
-static XREF_FILE find_file PROTO((const char *));
-static const char * filename PROTO((XREF_FILE));
-static const char * fctname PROTO((tree));
-static const char * declname PROTO((tree));
-static void simplify_type PROTO((char *));
-static const char * fixname PROTO((const char *, char *));
-static void open_xref_file PROTO((const char *));
-static const char * classname PROTO((tree));
+static void gen_assign PARAMS ((XREF_FILE, tree));
+static XREF_FILE find_file PARAMS ((const char *));
+static const char * filename PARAMS ((XREF_FILE));
+static const char * fctname PARAMS ((tree));
+static const char * declname PARAMS ((tree));
+static void simplify_type PARAMS ((char *));
+static const char * fixname PARAMS ((const char *, char *));
+static void open_xref_file PARAMS ((const char *));
+static const char * classname PARAMS ((tree));
/* Start cross referencing. FILE is the name of the file we xref. */