diff options
Diffstat (limited to 'gcc/cp/constexpr.c')
| -rw-r--r-- | gcc/cp/constexpr.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 41665c5..e7b08c8 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3171,7 +3171,7 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t, /* A constant-expression cannot modify objects from outside the constant-expression. */ if (!ctx->quiet) - error ("modification of %qE is not a constant-expression", object); + error ("modification of %qE is not a constant expression", object); *non_constant_p = true; return t; } @@ -4098,7 +4098,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, { if (!ctx->quiet) error_at (EXPR_LOC_OR_LOC (t, input_location), - "a reinterpret_cast is not a constant-expression"); + "a reinterpret_cast is not a constant expression"); *non_constant_p = true; return t; } @@ -4140,7 +4140,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, if (!ctx->quiet) error_at (EXPR_LOC_OR_LOC (t, input_location), "%<reinterpret_cast<%T>(%E)%> is not " - "a constant-expression", + "a constant expression", type, op); *non_constant_p = true; return t; @@ -4202,7 +4202,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, case OFFSET_REF: if (!ctx->quiet) error_at (EXPR_LOC_OR_LOC (t, input_location), - "expression %qE is not a constant-expression", t); + "expression %qE is not a constant expression", t); *non_constant_p = true; break; @@ -4283,7 +4283,7 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, so for now just fail. */ if (!ctx->quiet) error_at (EXPR_LOCATION (t), - "statement is not a constant-expression"); + "statement is not a constant expression"); } else internal_error ("unexpected expression %qE of kind %s", t, @@ -4370,7 +4370,7 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant, { if (!allow_non_constant) error ("conversion from pointer type %qT " - "to arithmetic type %qT in a constant-expression", + "to arithmetic type %qT in a constant expression", TREE_TYPE (TREE_OPERAND (r, 0)), TREE_TYPE (r)); non_constant_p = true; } @@ -5068,7 +5068,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, case AT_ENCODE_EXPR: fail: if (flags & tf_error) - error ("expression %qE is not a constant-expression", t); + error ("expression %qE is not a constant expression", t); return false; case TYPEID_EXPR: @@ -5229,7 +5229,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, if (integer_zerop (denom)) { if (flags & tf_error) - error ("division by zero is not a constant-expression"); + error ("division by zero is not a constant expression"); return false; } else @@ -5334,7 +5334,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, { if (flags & tf_error) error_at (location_of (t), - "%<delete[]%> is not a constant-expression"); + "%<delete[]%> is not a constant expression"); return false; } /* Fall through. */ @@ -5357,7 +5357,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, want_rval, strict, tf_none)) return true; if (flags & tf_error) - error ("expression %qE is not a constant-expression", t); + error ("expression %qE is not a constant expression", t); return false; case VEC_INIT_EXPR: @@ -5385,7 +5385,7 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, if (breaks (target) || continues (target)) return true; if (flags & tf_error) - error ("%<goto%> is not a constant-expression"); + error ("%<goto%> is not a constant expression"); return false; } |