diff options
| author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-21 13:09:05 +0000 |
|---|---|---|
| committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-21 13:09:05 +0000 |
| commit | 65404a7fd10a259530b04aa9eaed9ba712e90409 (patch) | |
| tree | ce0dcd6d60bc043fa0be4502f811ca419e63f5da | |
| parent | 0ad5c862aa270a90337ab56ba68996568d0ffc56 (diff) | |
| download | ppe42-gcc-65404a7fd10a259530b04aa9eaed9ba712e90409.tar.gz ppe42-gcc-65404a7fd10a259530b04aa9eaed9ba712e90409.zip | |
testsuite/
* g++.old-deja/g++.jason/conversion5.C: Adjust option.
* g++.old-deja/g++.bugs/900215_01.C: Likewise.
cp/
PR c++/10915
* decl.c (grok_op_properties): Warn possible confusing conversion
only if -Wconversion.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68303 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/conversion-function-1.C | 8 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.bugs/900215_01.C | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.old-deja/g++.jason/conversion5.C | 1 |
6 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 88c91dbe873..7f0c4ede4c0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2003-06-21 Gabriel Dos Reis <gdr@integrable-solutions.net> + + PR c++/10915 + * decl.c (grok_op_properties): Warn possible confusing conversion + only if -Wconversion. + 2003-06-20 Mark Mitchell <mark@codesourcery.com> PR c++/10749 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index d73c0d08f99..f539842c295 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -12371,7 +12371,7 @@ grok_op_properties (tree decl, int friendp) && DERIVED_FROM_P (t, current_class_type)) what = "a base class"; - if (what) + if (what && warn_conversion) warning ("conversion to %s%s will never use a type conversion operator", ref ? "a reference to " : "", what); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a0b977744f6..a947a8fc5e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2003-06-21 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * g++.old-deja/g++.jason/conversion5.C: Adjust option. + * g++.old-deja/g++.bugs/900215_01.C: Likewise. + 2003-06-20 Mark Mitchell <mark@codesourcery.com> PR c++/10888 diff --git a/gcc/testsuite/g++.dg/warn/conversion-function-1.C b/gcc/testsuite/g++.dg/warn/conversion-function-1.C new file mode 100644 index 00000000000..878011cf328 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/conversion-function-1.C @@ -0,0 +1,8 @@ +// Copyright (C) 2003 Free Software Foundation +// Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net> +// { dg-options "-Wno-conversion" } + +struct A { + operator A&(); +}; + diff --git a/gcc/testsuite/g++.old-deja/g++.bugs/900215_01.C b/gcc/testsuite/g++.old-deja/g++.bugs/900215_01.C index 768105791aa..c79a7035f99 100644 --- a/gcc/testsuite/g++.old-deja/g++.bugs/900215_01.C +++ b/gcc/testsuite/g++.old-deja/g++.bugs/900215_01.C @@ -20,6 +20,8 @@ // 8/3/2000 (nathan): The std allows you to define such an op, but // it will never be called. [class.conv.fct]. Make it an unconditional warning. +// { dg-options "-Wconversion" } + struct struct0 { operator void (); // { dg-warning "" } operator void diff --git a/gcc/testsuite/g++.old-deja/g++.jason/conversion5.C b/gcc/testsuite/g++.old-deja/g++.jason/conversion5.C index e409fae54af..0031084db00 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/conversion5.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/conversion5.C @@ -1,4 +1,5 @@ // { dg-do assemble } +// { dg-options "-Wconversion" } struct A { }; struct B: public A { A a; |
