* 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
+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.
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);
}
/* 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)
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