gcc/ada/ChangeLog:

[thirdparty/gcc.git] / gcc / cp / cvt.c

diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 3d409279f2272dbde2c75e4500849684fb1d1e98..7ebbf3c80c49906cb6d0fef0363b0382329feb3a 100644 (file)
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -88,7 +88,7 @@ cp_convert_to_pointer (tree type, tree expr, bool dofold,
       if (!COMPLETE_TYPE_P (intype))
        {
          if (complain & tf_error)
-           error_at (loc, "can%'t convert from incomplete type %qH to %qI",
+           error_at (loc, "cannot convert from incomplete type %qH to %qI",
                      intype, type);
          return error_mark_node;
        }
@@ -1060,14 +1060,14 @@ maybe_warn_nodiscard (tree expr, impl_conv_void implicit)
          auto_diagnostic_group d;
          if (warning_at (loc, OPT_Wunused_result,
                          "ignoring return value of %qD, "
-                         "declared with attribute warn_unused_result",
+                         "declared with attribute %<warn_unused_result%>",
                          fn))
            inform (DECL_SOURCE_LOCATION (fn), "declared here");
        }
       else
        warning_at (loc, OPT_Wunused_result,
                    "ignoring return value of function "
-                   "declared with attribute warn_unused_result");
+                   "declared with attribute %<warn_unused_result%>");
     }
 }
 
@@ -1820,7 +1820,7 @@ build_expr_type_conversion (int desires, tree expr, bool complain)
          if (TREE_CODE (cand) == TEMPLATE_DECL)
            {
              if (complain)
-               error ("default type conversion can%'t deduce template"
+               error ("default type conversion cannot deduce template"
                       " argument for %qD", cand);
              return error_mark_node;
            }
@@ -1920,7 +1920,7 @@ type_promotes_to (tree type)
        {
          if (abi_version_crosses (6)
              && TYPE_MODE (prom) != TYPE_MODE (type))
-           warning (OPT_Wabi, "scoped enum %qT passed through ... as "
+           warning (OPT_Wabi, "scoped enum %qT passed through %<...%> as "
                     "%qT before %<-fabi-version=6%>, %qT after",
                     type, prom, ENUM_UNDERLYING_TYPE (type));
          if (!abi_version_at_least (6))