diff options
| author | Jason Merrill <jason@redhat.com> | 2014-06-03 00:57:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-06-03 00:57:32 -0400 |
| commit | cfc8dced31257ef31f86a032da2c9e4cce53f563 (patch) | |
| tree | 63a0e880e54aef20247bf3b1a315abc9c9e537b2 /gcc | |
| parent | a21e55d2bb4caac33798c71d33cca7279d4664a8 (diff) | |
| download | gcc-cfc8dced31257ef31f86a032da2c9e4cce53f563.zip gcc-cfc8dced31257ef31f86a032da2c9e4cce53f563.tar.gz gcc-cfc8dced31257ef31f86a032da2c9e4cce53f563.tar.bz2 | |
re PR c++/61134 ([C++11] bogus "no matching function for call...")
PR c++/61134
* pt.c (pack_deducible_p): Handle canonicalization.
From-SVN: r211159
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/variadic158.C | 24 |
3 files changed, 30 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f8d5230..e57edc5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-02 Jason Merrill <jason@redhat.com> + + PR c++/61134 + * pt.c (pack_deducible_p): Handle canonicalization. + 2014-06-02 Paolo Carlini <paolo.carlini@oracle.com> * pt.c (tsubst_function_type): Initialize arg_types. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2b9ca20..d267a5c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -15765,7 +15765,7 @@ pack_deducible_p (tree parm, tree fn) continue; for (packs = PACK_EXPANSION_PARAMETER_PACKS (type); packs; packs = TREE_CHAIN (packs)) - if (TREE_VALUE (packs) == parm) + if (template_args_equal (TREE_VALUE (packs), parm)) { /* The template parameter pack is used in a function parameter pack. If this is the end of the parameter list, the diff --git a/gcc/testsuite/g++.dg/cpp0x/variadic158.C b/gcc/testsuite/g++.dg/cpp0x/variadic158.C new file mode 100644 index 0000000..cc5c24d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/variadic158.C @@ -0,0 +1,24 @@ +// PR c++/61134 +// { dg-do compile { target c++11 } } + +struct Base { }; + +template <typename> +struct Fixed { + typedef const char* name; +}; + +template <typename VT, typename... Fields> +void New(const char* name, + typename Fixed<Fields>::name... field_names); + +template <typename VT, typename... Fields> +void CreateMetric(const char* name, + typename Fixed<Fields>::name... field_names, + const Base&) { } + + +void Fn() +{ + CreateMetric<int, const char*>("abcd", "def", Base()); +} |