Re: [PATCH] s/__unused/__dimensions/ in

2017-01-04 Thread Tim Shen via gcc-patches
On Wed, Jan 4, 2017 at 7:16 PM, Tim Shen  wrote:
> Since it's an obvious textual fix, I'm going to check it in directly.

Checked in with 80-columns limit respected. I have confusing tabstop
settings... :/


-- 
Regards,
Tim Shen


[PATCH] s/__unused/__dimensions/ in

2017-01-04 Thread Tim Shen via gcc-patches
Since it's an obvious textual fix, I'm going to check it in directly.

-- 
Regards,
Tim Shen
commit b005916b043f52feed32b646f86ced80f3e5392b
Author: Tim Shen 
Date:   Wed Jan 4 19:07:07 2017 -0800

2017-01-05  Tim Shen  

PR libstdc++/78996
* include/std/variant: rename __unused to __dimensions to avoid
naming conflict.

diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index 899198a..da57ed6 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -604,17 +604,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template
 struct __gen_vtable_impl;
 
-  template
 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::type>;
   using _Array_type =
- _Multi_array<_Result_type (*)(_Visitor, _Variants...), __unused...>;
+ _Multi_array<_Result_type (*)(_Visitor, _Variants...),
+  __dimensions...>;
 
   static constexpr _Array_type
   _S_apply()