diff options
| author | Volker Reichelt <reichelt@igpm.rwth-aachen.de> | 2005-02-02 21:19:07 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2005-02-02 21:19:07 +0000 |
| commit | be20e6732da81358c887828c726e0e7d584248d7 (patch) | |
| tree | 441099b4bc0c5c06345176a6ef1f039d8863c6ce | |
| parent | 10b2bcdd509df50958aed053ad7445f8f0e0902e (diff) | |
| download | gcc-be20e6732da81358c887828c726e0e7d584248d7.zip gcc-be20e6732da81358c887828c726e0e7d584248d7.tar.gz gcc-be20e6732da81358c887828c726e0e7d584248d7.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 3 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 7 |
3 files changed, 12 insertions, 6 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b90461a..284a933 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,13 @@ 2005-02-02 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + * 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 <reichelt@igpm.rwth-aachen.de> + * cp-tree.h (commonparms): Remove prototype. (convert_arguments): Likewise. (PFN_FROM_PTRMEMFUNC): Remove. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 71cc5d3..fa4c630 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 859c437..b35ae97 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 |