diff options
| author | Dirk Mueller <dmueller@suse.de> | 2006-10-29 19:52:52 +0000 |
|---|---|---|
| committer | Dirk Mueller <mueller@gcc.gnu.org> | 2006-10-29 19:52:52 +0000 |
| commit | 153ae66aeea1d7b38af1cf77a4107db5964a759a (patch) | |
| tree | afdbe6d9b5b78009c69e7d33a81737ad8334ce16 /gcc | |
| parent | 180550a8b8512c2584cf3b129f392ac3ee7a12ab (diff) | |
| download | gcc-153ae66aeea1d7b38af1cf77a4107db5964a759a.zip gcc-153ae66aeea1d7b38af1cf77a4107db5964a759a.tar.gz gcc-153ae66aeea1d7b38af1cf77a4107db5964a759a.tar.bz2 | |
re PR c++/29089 (Words substituted for %s in a sentence can not be translated)
PR c++/29089
* typeck.c (build_unary_op): Duplicate warning message
for easier translation.
From-SVN: r118156
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 24 |
2 files changed, 20 insertions, 10 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1d46779..fe1cf68 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2006-10-29 Dirk Mueller <dmueller@suse.de> + PR c++/29089 + * typeck.c (build_unary_op): Duplicate warning message + for easier translation. + +2006-10-29 Dirk Mueller <dmueller@suse.de> + PR c++/16307 * typeck.c (build_array_ref): Warn for char subscriptions on pointers. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 46eee41..2730156 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -4121,9 +4121,9 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert) /* ARM $5.2.5 last annotation says this should be forbidden. */ if (TREE_CODE (argtype) == ENUMERAL_TYPE) - pedwarn ("ISO C++ forbids %sing an enum", - (code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR) - ? "increment" : "decrement"); + pedwarn ((code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR) ? + "ISO C++ forbids incrementing an enum" : + "ISO C++ forbids decrementing an enum"); /* Compute the increment. */ @@ -4132,16 +4132,20 @@ build_unary_op (enum tree_code code, tree xarg, int noconvert) tree type = complete_type (TREE_TYPE (argtype)); if (!COMPLETE_OR_VOID_TYPE_P (type)) - error ("cannot %s a pointer to incomplete type %qT", - ((code == PREINCREMENT_EXPR - || code == POSTINCREMENT_EXPR) - ? "increment" : "decrement"), TREE_TYPE (argtype)); + error (((code == PREINCREMENT_EXPR + || code == POSTINCREMENT_EXPR)) + ? + "cannot increment a pointer to incomplete type %qT" : + "cannot decrement a pointer to incomplete type %qT", + TREE_TYPE (argtype)); else if ((pedantic || warn_pointer_arith) && !TYPE_PTROB_P (argtype)) - pedwarn ("ISO C++ forbids %sing a pointer of type %qT", - ((code == PREINCREMENT_EXPR + pedwarn (((code == PREINCREMENT_EXPR || code == POSTINCREMENT_EXPR) - ? "increment" : "decrement"), argtype); + ? + "ISO C++ forbids incrementing a pointer of type %qT" : + "ISO C++ forbids decrementing a pointer of type %qT"), + argtype); inc = cxx_sizeof_nowarn (TREE_TYPE (argtype)); } else |