diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/error.c | 4 | ||||
| -rw-r--r-- | gcc/cp/init.c | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 5 |
5 files changed, 17 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1b4ebd3..9e03f18 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2016-02-12 Jakub Jelinek <jakub@redhat.com> + + * error.c: Spelling fixes - behaviour -> behavior and + neighbour -> neighbor. + * decl.c: Likewise. + * typeck.c (cp_build_binary_op): Fix up behavior spelling in + diagnostics. + * init.c (build_delete): Likewise. + 2016-02-11 Jakub Jelinek <jakub@redhat.com> PR c/69768 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 09bd512..30eef5c 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -15036,7 +15036,7 @@ cxx_maybe_build_cleanup (tree decl, tsubst_flags_t complain) /* build_delete sets the location of the destructor call to the current location, even though the destructor is going to be called later, at the end of the current scope. This can lead to - a "jumpy" behaviour for users of debuggers when they step around + a "jumpy" behavior for users of debuggers when they step around the end of the block. So let's unset the location of the destructor call instead. */ protected_set_expr_location (cleanup, UNKNOWN_LOCATION); diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 3f9cf4a..aa5fd41 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -2844,7 +2844,7 @@ decl_as_dwarf_string (tree decl, int flags) { const char *name; /* Curiously, reinit_cxx_pp doesn't reset the flags field, so setting the flag - here will be adequate to get the desired behaviour. */ + here will be adequate to get the desired behavior. */ cxx_pp->flags |= pp_c_flag_gnu_v3; name = decl_as_string (decl, flags); /* Subsequent calls to the pretty printer shouldn't use this style. */ @@ -2876,7 +2876,7 @@ lang_decl_dwarf_name (tree decl, int v, bool translate) { const char *name; /* Curiously, reinit_cxx_pp doesn't reset the flags field, so setting the flag - here will be adequate to get the desired behaviour. */ + here will be adequate to get the desired behavior. */ cxx_pp->flags |= pp_c_flag_gnu_v3; name = lang_decl_name (decl, v, translate); /* Subsequent calls to the pretty printer shouldn't use this style. */ diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 338f85e..f6ceb7f 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -4390,12 +4390,12 @@ build_delete (tree otype, tree addr, special_function_kind auto_delete, warning (OPT_Wdelete_non_virtual_dtor, "deleting object of abstract class type %qT" " which has non-virtual destructor" - " will cause undefined behaviour", type); + " will cause undefined behavior", type); else warning (OPT_Wdelete_non_virtual_dtor, "deleting object of polymorphic class type %qT" " which has non-virtual destructor" - " might cause undefined behaviour", type); + " might cause undefined behavior", type); } } } diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 3a247d8..1ffb135 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4492,7 +4492,7 @@ cp_build_binary_op (location_t location, || (TREE_CODE (orig_op1) == STRING_CST && !integer_zerop (cp_fully_fold (op0))))) warning (OPT_Waddress, "comparison with string literal results " - "in unspecified behaviour"); + "in unspecified behavior"); build_type = boolean_type_node; if ((code0 == INTEGER_TYPE || code0 == REAL_TYPE @@ -4793,7 +4793,8 @@ cp_build_binary_op (location_t location, || TREE_CODE (orig_op1) == STRING_CST) { if (complain & tf_warning) - warning (OPT_Waddress, "comparison with string literal results in unspecified behaviour"); + warning (OPT_Waddress, "comparison with string literal results " + "in unspecified behavior"); } if (code0 == VECTOR_TYPE && code1 == VECTOR_TYPE) |