aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2015-07-09 15:14:10 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2015-07-09 15:14:10 +0000
commit09bae928c56997afe3e13e9fee3328afc1c9d9e8 (patch)
tree4ba1ffe00809d4c7d719d746b99d189495d4117e /gcc
parent9b004cd378134e48c62af86c65d5d8ba4c657d0a (diff)
downloadgcc-09bae928c56997afe3e13e9fee3328afc1c9d9e8.zip
gcc-09bae928c56997afe3e13e9fee3328afc1c9d9e8.tar.gz
gcc-09bae928c56997afe3e13e9fee3328afc1c9d9e8.tar.bz2
typeck.c (warn_args_num): Rename to error_args_num.
2015-07-09 Paolo Carlini <paolo.carlini@oracle.com> * typeck.c (warn_args_num): Rename to error_args_num. (convert_arguments): Adjust calls. From-SVN: r225615
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog5
-rw-r--r--gcc/cp/typeck.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 609c7ed..c1a85e5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * typeck.c (warn_args_num): Rename to error_args_num.
+ (convert_arguments): Adjust calls.
+
2015-07-09 Andrew MacLeod <amacleod@redhat.com>
* cp-ubsan.c: Don't include alloc-pool.h or lto-streamer.h.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 24866ef..3e252f9 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -62,7 +62,7 @@ static void casts_away_constness_r (tree *, tree *, tsubst_flags_t);
static bool casts_away_constness (tree, tree, tsubst_flags_t);
static bool maybe_warn_about_returning_address_of_local (tree);
static tree lookup_destructor (tree, tree, tree, tsubst_flags_t);
-static void warn_args_num (location_t, tree, bool);
+static void error_args_num (location_t, tree, bool);
static int convert_arguments (tree, vec<tree, va_gc> **, tree, int,
tsubst_flags_t);
@@ -3559,10 +3559,10 @@ cp_build_function_call_vec (tree function, vec<tree, va_gc> **params,
}
/* Subroutine of convert_arguments.
- Warn about wrong number of args are genereted. */
+ Print an error message about a wrong number of arguments. */
static void
-warn_args_num (location_t loc, tree fndecl, bool too_many_p)
+error_args_num (location_t loc, tree fndecl, bool too_many_p)
{
if (fndecl)
{
@@ -3645,7 +3645,7 @@ convert_arguments (tree typelist, vec<tree, va_gc> **values, tree fndecl,
{
if (complain & tf_error)
{
- warn_args_num (input_location, fndecl, /*too_many_p=*/true);
+ error_args_num (input_location, fndecl, /*too_many_p=*/true);
return i;
}
else
@@ -3749,7 +3749,7 @@ convert_arguments (tree typelist, vec<tree, va_gc> **values, tree fndecl,
else
{
if (complain & tf_error)
- warn_args_num (input_location, fndecl, /*too_many_p=*/false);
+ error_args_num (input_location, fndecl, /*too_many_p=*/false);
return -1;
}
}