diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 2 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2cf1f74db87..7cb83b51fa7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2004-09-18 Kazu Hirata <kazu@cs.umass.edu> + + * call.c, semantics.c: Follow spelling conventions. + * class.c: Fix a comment typo. + 2004-09-16 Geoffrey Keating <geoffk@apple.com> PR pch/13361 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 4f2a80c2922..1185608006b 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -5318,7 +5318,7 @@ build_new_method_call (tree instance, tree fns, tree args, && (DECL_CONSTRUCTOR_P (current_function_decl) || DECL_DESTRUCTOR_P (current_function_decl))) /* This is not an error, it is runtime undefined - behaviour. */ + behavior. */ warning ((DECL_CONSTRUCTOR_P (current_function_decl) ? "abstract virtual `%#D' called from constructor" : "abstract virtual `%#D' called from destructor"), diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 5a065209849..4c8dee338fe 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -500,7 +500,7 @@ build_vfield_ref (tree datum, tree type) /* Second, the requested type may not be the owner of its own vptr. If not, convert to the base class that owns it. We cannot use convert_to_base here, because VCONTEXT may appear more than once - in the inheritence hierarchy of TYPE, and thus direct conversion + in the inheritance hierarchy of TYPE, and thus direct conversion between the types may be ambiguous. Following the path back up one step at a time via primary bases avoids the problem. */ vfield = TYPE_VFIELD (type); diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 2f1d0e8f3da..e66736fe3ef 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -1037,7 +1037,7 @@ finish_handler (tree handler) } /* Begin a compound statement. FLAGS contains some bits that control the - behaviour and context. If BCS_NO_SCOPE is set, the compound statement + behavior and context. If BCS_NO_SCOPE is set, the compound statement does not define a scope. If BCS_FN_BODY is set, this is the outermost block of a function. If BCS_TRY_BLOCK is set, this is the block created on behalf of a TRY statement. Returns a token to be passed to |
