From: Tim Shen <timshen@google.com>
Date: Thu, 5 Jan 2017 03:18:17 +0000 (+0000)
Subject: re PR libstdc++/78996 (<variant> uses macro as name)
X-Git-Tag: basepoints/gcc-8~2012
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f9cf7ff836bbc7d4f68e47918c878983c08e386;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 10f362bdd69f..e51ab1707508 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 a4a1a1dd9e1c..1803315dab63 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()