diff options
| author | Jason Merrill <jason@redhat.com> | 2009-11-03 13:43:06 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-11-03 13:43:06 -0500 |
| commit | aa9b756937a80e557f1c983d37ce1423c3afc2b2 (patch) | |
| tree | 8a425ade42a069bc27caf86c3a2b7a4918ff3ec5 /gcc | |
| parent | a638b034245e39678a9f24b823df0bba0f1453d0 (diff) | |
| download | gcc-aa9b756937a80e557f1c983d37ce1423c3afc2b2.zip gcc-aa9b756937a80e557f1c983d37ce1423c3afc2b2.tar.gz gcc-aa9b756937a80e557f1c983d37ce1423c3afc2b2.tar.bz2 | |
re PR c++/41927 ([C++0x] Spurious warning with enable_if and default function template argument)
PR c++/41927
* typeck.c (build_x_binary_op): Don't do warn_parentheses
if we're in a SFINAE context.
From-SVN: r153863
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 1 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/sfinae16.C | 34 |
4 files changed, 42 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a04b6e7..d7b3150 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2009-11-03 Jason Merrill <jason@redhat.com> + PR c++/41927 + * typeck.c (build_x_binary_op): Don't do warn_parentheses + if we're in a SFINAE context. + PR c++/41815 * call.c (build_call_a): Strip cv-quals from rvalue result. diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 5b8523d..7cafc8a 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -3245,6 +3245,7 @@ build_x_binary_op (enum tree_code code, tree arg1, enum tree_code arg1_code, misinterpret. But don't warn about obj << x + y, since that is a common idiom for I/O. */ if (warn_parentheses + && (complain & tf_warning) && !processing_template_decl && !error_operand_p (arg1) && !error_operand_p (arg2) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0371d4a..dc49db0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-11-03 Jason Merrill <jason@redhat.com> + PR c++/41927 + * g++.dg/template/sfinae16.C: New. + PR c++/41815 * g++.dg/cpp0x/rv-return.C: New. * g++.dg/cpp0x/deduce.C: Adjust. diff --git a/gcc/testsuite/g++.dg/template/sfinae16.C b/gcc/testsuite/g++.dg/template/sfinae16.C new file mode 100644 index 0000000..5ea564c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/sfinae16.C @@ -0,0 +1,34 @@ +// PR c++/41927 +// { dg-options "-std=c++0x -Wall" } + +// We were getting a spurious ||/&& warning about the enable_if with the +// source position of d1. + +template<typename Tp> + struct is_int + { static const bool value = true; }; + +template<bool, typename Tp = void> + struct enable_if + { }; + +template<typename Tp> + struct enable_if<true, Tp> + { typedef Tp type; }; + +template<typename Rep> + struct duration + { + duration() { } + + template<typename Rep2, typename = typename + enable_if<false || (true && is_int<Rep2>::value)>::type> + duration(const duration<Rep2>&) { } + }; + +int main() +{ + duration<int> d0; + duration<int> d1 = d0; +} + |