diff options
| author | Tim Shen <timshen@google.com> | 2017-01-05 03:18:17 +0000 |
|---|---|---|
| committer | Tim Shen <timshen@gcc.gnu.org> | 2017-01-05 03:18:17 +0000 |
| commit | 0f9cf7ff836bbc7d4f68e47918c878983c08e386 (patch) | |
| tree | 9178f74b9f42b016043ed782492956965a93c84b | |
| parent | a954833dfb8100b290d68894b8f573984ecbe5c9 (diff) | |
| download | gcc-0f9cf7ff836bbc7d4f68e47918c878983c08e386.zip gcc-0f9cf7ff836bbc7d4f68e47918c878983c08e386.tar.gz gcc-0f9cf7ff836bbc7d4f68e47918c878983c08e386.tar.bz2 | |
re PR libstdc++/78996 (<variant> uses macro as name)
2017-01-05 Tim Shen <timshen@google.com>
PR libstdc++/78996
* include/std/variant (__gen_vtable_impl): rename __unused to
__dimensions to avoid naming conflict.
From-SVN: r244092
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 10f362b..e51ab17 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-01-05 Tim Shen <timshen@google.com> + + PR libstdc++/78996 + * include/std/variant (__gen_vtable_impl): rename __unused to + __dimensions to avoid naming conflict. + 2017-01-04 Jonathan Wakely <jwakely@redhat.com> PR libstdc++/78968 diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index a4a1a1d..1803315 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -604,17 +604,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Array_type, typename _Variant_tuple, typename _Index_seq> struct __gen_vtable_impl; - template<typename _Result_type, typename _Visitor, size_t... __unused, + template<typename _Result_type, typename _Visitor, size_t... __dimensions, typename... _Variants, size_t... __indices> struct __gen_vtable_impl< - _Multi_array<_Result_type (*)(_Visitor, _Variants...), __unused...>, + _Multi_array<_Result_type (*)(_Visitor, _Variants...), __dimensions...>, tuple<_Variants...>, std::index_sequence<__indices...>> { using _Next = remove_reference_t<typename _Nth_type<sizeof...(__indices), _Variants...>::type>; using _Array_type = - _Multi_array<_Result_type (*)(_Visitor, _Variants...), __unused...>; + _Multi_array<_Result_type (*)(_Visitor, _Variants...), + __dimensions...>; static constexpr _Array_type _S_apply() |