diff options
| author | Nathan Sidwell <nathan@acm.org> | 1999-08-04 09:07:51 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 1999-08-04 09:07:51 +0000 |
| commit | 4cc1d462013c5fcaa82b0ad82b4232bc1249b31c (patch) | |
| tree | eed4f20cf661ebad7e1110d70a77ace73ecd7837 /gcc/cp/class.c | |
| parent | bc3c01c50781c5306a57c974c84e767479e59f73 (diff) | |
| download | gcc-4cc1d462013c5fcaa82b0ad82b4232bc1249b31c.zip gcc-4cc1d462013c5fcaa82b0ad82b4232bc1249b31c.tar.gz gcc-4cc1d462013c5fcaa82b0ad82b4232bc1249b31c.tar.bz2 | |
cp-tree.h (empty_except_spec): New global var.
* cp-tree.h (empty_except_spec): New global var.
(compexcepttypes): Remove prototype.
(comp_except_specs): Prototype new global function.
(add_exception_specifier): Prototype new global function.
* decl.c (empty_except_spec): Define new global var.
(duplicate_decls): Use comp_except_specs, reword error message.
(init_decl_processing): Initialize empty_except_spec.
Adjust build_exception_variant calls.
* parse.y (exception_specification_opt): Use empty_except_spec.
(ansi_raise_identifier): Call check_for_new_type.
(ansi_raise_identifiers): Use add_exception_specifier.
* pt.c (tsubst): Use add_exception_specifier to build exception
specifier.
* search.c (check_final_overrider): New static function, broken
out of get_matching_virtual. Check throw specifiers, reword
diagnostics.
(get_matching_virtual): Use check_final_overrider.
* tree.c (build_exception_variant): Use comp_except_specs.
* typeck.c (compexcepttypes): Remove.
(comp_except_types): New static function, helper for
comp_except_specs. Compare two types as exception specifiers.
(comp_except_specs): New global function, compare two exception
specifiers.
(comptypes): Adjust for comp_except_specs.
* typeck2.c (add_exception_specifier): New global function.
* class.c (check_for_override): Reword error message.
From-SVN: r28494
Diffstat (limited to 'gcc/cp/class.c')
| -rw-r--r-- | gcc/cp/class.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 8ba5694..4f7172b 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2977,9 +2977,8 @@ check_for_override (decl, ctype) path to its virtual baseclass. */ if (TREE_CODE (TREE_TYPE (decl)) == FUNCTION_TYPE) { - cp_error_at ("method `%D' may not be declared static", - decl); - cp_error_at ("(since `%D' declared virtual in base class.)", + cp_error_at ("`static %#D' cannot be declared", decl); + cp_error_at (" since `virtual %#D' declared in base class", tmp); break; } |