From 65bbaf3125f7c92be32e2e3b6c07e63e8ab0ccbc Mon Sep 17 00:00:00 2001
From: Tom Honermann <tom@honermann.net>
Date: Fri, 22 Feb 2019 01:15:58 +0000
Subject: [PATCH] Disambiguate __gnu_cxx::append_ partial specialization

This patch corrects ambiguous partial specializations of
typelist::detail::append_.  Previously, neither append_<chain<Hd, Tl>,
Typelist_Chain> nor append_<Typelist_Chain, null_type> was a better
match for append_<chain<Hd, Tl>, null_type>.

2019-02-22  Tom Honermann  <tom@honermann.net>

	* include/ext/typelist.h: Constrain a partial specialization of
	typelist::detail::append_ to only match chain<T1,T2>.

From-SVN: r269088
---
 libstdc++-v3/ChangeLog              | 5 +++++
 libstdc++-v3/include/ext/typelist.h | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fab28f42079..904da1ba4c9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-22  Tom Honermann  <tom@honermann.net>
+
+	* include/ext/typelist.h: Constrain a partial specialization of
+	typelist::detail::append_ to only match chain<T1,T2>.
+
 2019-02-21  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR libstdc++/89416
diff --git a/libstdc++-v3/include/ext/typelist.h b/libstdc++-v3/include/ext/typelist.h
index 2806814028a..a6223aeb272 100644
--- a/libstdc++-v3/include/ext/typelist.h
+++ b/libstdc++-v3/include/ext/typelist.h
@@ -215,10 +215,10 @@ namespace detail
       typedef Typelist_Chain 			      		type;
     };
 
-  template<typename Typelist_Chain>
-    struct append_<Typelist_Chain, null_type>
+  template<typename Hd, typename Tl>
+    struct append_<chain<Hd, Tl>, null_type>
     {
-      typedef Typelist_Chain 					type;
+      typedef chain<Hd, Tl>  					type;
     };
 
   template<>
-- 
2.30.2