From be20e6732da81358c887828c726e0e7d584248d7 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Wed, 2 Feb 2005 21:19:07 +0000 Subject: [PATCH] cp-tree.h (complete_type_or_else): Remove macro. * cp-tree.h (complete_type_or_else): Remove macro. (complete_type_or_diagnostic): Rename to complete_type_or_else and remove last argument. * typeck.c (complete_type_or_diagnostic): Rename to complete_type_or_else and remove last argument. From-SVN: r94614 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/cp-tree.h | 3 +-- gcc/cp/typeck.c | 7 +++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b90461a09f8..284a93315a6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2005-02-02 Volker Reichelt + + * cp-tree.h (complete_type_or_else): Remove macro. + (complete_type_or_diagnostic): Rename to complete_type_or_else + and remove last argument. + * typeck.c (complete_type_or_diagnostic): Rename to + complete_type_or_else and remove last argument. + 2005-02-02 Volker Reichelt * cp-tree.h (commonparms): Remove prototype. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 71cc5d3d666..fa4c630d495 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4262,8 +4262,7 @@ extern tree condition_conversion (tree); extern tree target_type (tree); extern tree require_complete_type (tree); 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 tree complete_type_or_else (tree, tree); extern int type_unknown_p (tree); extern tree original_type (tree); extern bool comp_except_specs (tree, tree, bool); diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 859c437f050..b35ae979b6d 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -138,12 +138,11 @@ complete_type (tree type) } /* Like complete_type, but issue an error if the TYPE cannot be completed. - VALUE is used for informative diagnostics. DIAG_TYPE indicates the type - of diagnostic: 0 for an error, 1 for a warning, 2 for a pedwarn. + VALUE is used for informative diagnostics. Returns NULL_TREE if the type cannot be made complete. */ tree -complete_type_or_diagnostic (tree type, tree value, int diag_type) +complete_type_or_else (tree type, tree value) { type = complete_type (type); if (type == error_mark_node) @@ -151,7 +150,7 @@ complete_type_or_diagnostic (tree type, tree value, int diag_type) return NULL_TREE; else if (!COMPLETE_TYPE_P (type)) { - cxx_incomplete_type_diagnostic (value, type, diag_type); + cxx_incomplete_type_diagnostic (value, type, 0); return NULL_TREE; } else -- 2.30.2