aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel López-Ibáñez <manu@gcc.gnu.org>2014-08-15 16:14:50 +0000
committerManuel López-Ibáñez <manu@gcc.gnu.org>2014-08-15 16:14:50 +0000
commit598fc08518078da824ddfb97ae9caf4ed6c93dd4 (patch)
tree3d5d9d0e8d9bf73a87446df42d17458be65e8275
parent2ce8cb99a64ed8512be9b3ae5e5bef2c18353baf (diff)
downloadgcc-598fc08518078da824ddfb97ae9caf4ed6c93dd4.zip
gcc-598fc08518078da824ddfb97ae9caf4ed6c93dd4.tar.gz
gcc-598fc08518078da824ddfb97ae9caf4ed6c93dd4.tar.bz2
call.c (build_conditional_expr_1): Use OPT_Wextra in warning.
2014-08-15 Manuel Lopez-Ibanez <manu@gcc.gnu.org> gcc/cp/: * call.c (build_conditional_expr_1): Use OPT_Wextra in warning. From-SVN: r214026
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/call.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 54ed213..df3811c 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-15 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
+
+ * call.c (build_conditional_expr_1): Use OPT_Wextra in warning.
+
2014-08-14 Paolo Carlini <paolo.carlini@oracle.com>
* typeck.c (composite_pointer_type, cxx_sizeof_or_alignof_type,
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 43bfe50..7044e14 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5017,7 +5017,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3,
type_promotes_to (arg3_type)))))
{
if (complain & tf_warning)
- warning_at (loc, 0, "enumeral and non-enumeral type in "
+ warning_at (loc, OPT_Wextra, "enumeral and non-enumeral type in "
"conditional expression");
}