aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaveh R. Ghazi <ghazi@caip.rutgers.edu>2005-07-16 14:20:45 +0000
committerKaveh Ghazi <ghazi@gcc.gnu.org>2005-07-16 14:20:45 +0000
commit72e78bf3173e5519bbb32313bba263441b65a7c4 (patch)
tree121f922e819fc777c5f3b9be2f9e5e3db0e5a343
parent87fbb651f896c031ec67452dfef71000aad84458 (diff)
downloadgcc-72e78bf3173e5519bbb32313bba263441b65a7c4.zip
gcc-72e78bf3173e5519bbb32313bba263441b65a7c4.tar.gz
gcc-72e78bf3173e5519bbb32313bba263441b65a7c4.tar.bz2
call.c (diagnostic_fn_t): New.
* call.c (diagnostic_fn_t): New. (build_temp, convert_like_real): Use diagnostic_fn_t. From-SVN: r102089
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/call.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6e05977..6ebdca9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * call.c (diagnostic_fn_t): New.
+ (build_temp, convert_like_real): Use diagnostic_fn_t.
+
2005-07-15 Mark Mitchell <mark@codesourcery.com>
PR c++/22204
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 1035f88..21201cf 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -194,7 +194,8 @@ static void add_candidates (tree, tree, tree, bool, tree, tree,
int, struct z_candidate **);
static conversion *merge_conversion_sequences (conversion *, conversion *);
static bool magic_varargs_p (tree);
-static tree build_temp (tree, tree, int, void (**)(const char *, ...));
+typedef void (*diagnostic_fn_t) (const char *, ...) ATTRIBUTE_GCC_CXXDIAG(1,2);
+static tree build_temp (tree, tree, int, diagnostic_fn_t *);
static void check_constructor_callable (tree, tree);
/* Returns nonzero iff the destructor name specified in NAME
@@ -4105,7 +4106,7 @@ check_constructor_callable (tree type, tree expr)
static tree
build_temp (tree expr, tree type, int flags,
- void (**diagnostic_fn)(const char *, ...))
+ diagnostic_fn_t *diagnostic_fn)
{
int savew, savee;
@@ -4140,7 +4141,7 @@ convert_like_real (conversion *convs, tree expr, tree fn, int argnum,
bool c_cast_p)
{
tree totype = convs->type;
- void (*diagnostic_fn)(const char *, ...) ATTRIBUTE_GCC_CXXDIAG(1,2);
+ diagnostic_fn_t diagnostic_fn;
if (convs->bad_p
&& convs->kind != ck_user