cp-tree.h (commonparms): Remove prototype.

	* cp-tree.h (commonparms): Remove prototype.
	(convert_arguments): Likewise.
	(PFN_FROM_PTRMEMFUNC): Remove.
	* typeck.c (commonparms): Make static.
	(convert_arguments): Add prototype. Make static.
	(PFN_FROM_PTRMEMFUNC): Replace by pfn_from_ptrmemfunc.

From-SVN: r94613

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e964d83063cb1cb5f3cad4e70e045b744da8ccfd..b90461a09f89e219491ba4a8dbca106f89c216b0 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-02  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
+
+       * cp-tree.h (commonparms): Remove prototype.
+       (convert_arguments): Likewise.
+       (PFN_FROM_PTRMEMFUNC): Remove.
+       * typeck.c (commonparms): Make static.
+       (convert_arguments): Add prototype. Make static.
+       (PFN_FROM_PTRMEMFUNC): Replace by pfn_from_ptrmemfunc.
+
 2005-01-31  Mark Mitchell  <mark@codesourcery.com>
 
        * parser.c (cp_parser_primary_expression): Don't complain about

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index cb0c25b3694c8f45aaf4ecf7707fa57e60001247..71cc5d3d666f309a0fbd526e8467dd7e0c48fcf1 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -2535,8 +2535,6 @@ struct lang_decl GTY(())
       }                                                                        \
     TYPE_LANG_SPECIFIC (NODE)->u.ptrmem.record = (VALUE);              \
   } while (0)
-/* Returns the pfn field from a TYPE_PTRMEMFUNC_P.  */
-#define PFN_FROM_PTRMEMFUNC(NODE) pfn_from_ptrmemfunc ((NODE))
 
 /* For a pointer-to-member type of the form `T X::*', this is `X'.
    For a type like `void (X::*)() const', this type is `X', not `const
@@ -4267,7 +4265,6 @@ extern tree complete_type                 (tree);
 extern tree complete_type_or_diagnostic         (tree, tree, int);
 #define complete_type_or_else(T,V) (complete_type_or_diagnostic ((T), (V), 0))
 extern int type_unknown_p                      (tree);
-extern tree commonparms                                (tree, tree);
 extern tree original_type                      (tree);
 extern bool comp_except_specs                  (tree, tree, bool);
 extern bool comptypes                          (tree, tree, int);
@@ -4286,7 +4283,6 @@ extern tree build_x_indirect_ref          (tree, const char *);
 extern tree build_indirect_ref                 (tree, const char *);
 extern tree build_array_ref                    (tree, tree);
 extern tree get_member_function_from_ptrfunc   (tree *, tree);
-extern tree convert_arguments                  (tree, tree, tree, int);
 extern tree build_x_binary_op                  (enum tree_code, tree, tree,
                                                 bool *);
 extern tree build_x_unary_op                   (enum tree_code, tree);

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 53a48d113d8927f00eee31bc47dfac9bb073cccf..859c437f0504b03d89772c13ab45172cf9cfe4da 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -57,6 +57,7 @@ static void casts_away_constness_r (tree *, tree *);
 static bool casts_away_constness (tree, tree);
 static void maybe_warn_about_returning_address_of_local (tree);
 static tree lookup_destructor (tree, tree, tree);
+static tree convert_arguments (tree, tree, tree, int);
 
 /* Return the target type of TYPE, which means return T for:
    T*, T&, T[], T (...), and otherwise, just T.  */
@@ -174,7 +175,7 @@ type_unknown_p (tree exp)
    As an optimization, free the space we allocate if the parameter
    lists are already common.  */
 
-tree
+static tree
 commonparms (tree p1, tree p2)
 {
   tree oldargs = p1, newargs, n;
@@ -2325,7 +2326,7 @@ get_member_function_from_ptrfunc (tree *instance_ptrptr, tree function)
        function = save_expr (function);
 
       /* Start by extracting all the information from the PMF itself.  */
-      e3 = PFN_FROM_PTRMEMFUNC (function);
+      e3 = pfn_from_ptrmemfunc (function);
       delta = build_ptrmemfunc_access_expr (function, delta_identifier);
       idx = build1 (NOP_EXPR, vtable_index_type, e3);
       switch (TARGET_PTRMEMFUNC_VBIT_LOCATION)
@@ -2493,7 +2494,7 @@ build_function_call (tree function, tree params)
    In C++, unspecified trailing parameters can be filled in with their
    default arguments, if such were specified.  Do so here.  */
 
-tree
+static tree
 convert_arguments (tree typelist, tree values, tree fndecl, int flags)
 {
   tree typetail, valtail;