diagnostics: get rid of *_at_rich_loc in favor of overloading

[thirdparty/gcc.git] / gcc / c-family / c-warn.c

diff --git a/gcc/c-family/c-warn.c b/gcc/c-family/c-warn.c
index 78f6ba83d981bc0d6be3cdc63a7909e947199803..09ef6856cf90447dcdbf5a5a02d17c5a44ddbed8 100644 (file)
--- a/gcc/c-family/c-warn.c
+++ b/gcc/c-family/c-warn.c
@@ -496,8 +496,8 @@ warn_logical_not_parentheses (location_t location, enum tree_code code,
       rich_location richloc (line_table, lhs_loc);
       richloc.add_fixit_insert_before (lhs_loc, "(");
       richloc.add_fixit_insert_after (lhs_loc, ")");
-      inform_at_rich_loc (&richloc, "add parentheses around left hand side "
-                         "expression to silence this warning");
+      inform (&richloc, "add parentheses around left hand side "
+             "expression to silence this warning");
     }
 }
 
@@ -2391,13 +2391,13 @@ warn_for_restrict (unsigned param_pos, tree *argarray, unsigned nargs)
        richloc.add_range (EXPR_LOCATION (arg), false);
     }
 
-  warning_at_rich_loc_n (&richloc, OPT_Wrestrict, arg_positions.length (),
-                        "passing argument %i to restrict-qualified parameter"
-                        " aliases with argument %Z",
-                        "passing argument %i to restrict-qualified parameter"
-                        " aliases with arguments %Z",
-                        param_pos + 1, arg_positions.address (),
-                        arg_positions.length ());
+  warning_n (&richloc, OPT_Wrestrict, arg_positions.length (),
+            "passing argument %i to restrict-qualified parameter"
+            " aliases with argument %Z",
+            "passing argument %i to restrict-qualified parameter"
+            " aliases with arguments %Z",
+            param_pos + 1, arg_positions.address (),
+            arg_positions.length ());
 }
 
 /* Callback function to determine whether an expression TP or one of its