From b188fcd7f87306f084cec114647a107f7e559d06 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@gmail.com>
Date: Sun, 14 May 2023 21:27:58 +0300
Subject: [PATCH] Update test/mp_rename_2.cpp

---
 test/mp_rename_2.cpp | 25 ++++++++++++++++---------
 test/mp_size_2.cpp   |  2 +-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/test/mp_rename_2.cpp b/test/mp_rename_2.cpp
index 70c187f..ef63f8a 100644
--- a/test/mp_rename_2.cpp
+++ b/test/mp_rename_2.cpp
@@ -14,7 +14,8 @@ int main() {}
 #include <boost/mp11/integral.hpp>
 #include <boost/core/lightweight_test_trait.hpp>
 
-template<auto... T> struct L {};
+template<auto... A> struct L1 {};
+template<int... I> struct L2 {};
 
 int main()
 {
@@ -24,19 +25,25 @@ int main()
     using boost::mp11::mp_false;
     using boost::mp11::mp_int;
     using boost::mp11::mp_size_t;
+    using boost::mp11::mp_list_c;
 
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<>, mp_list>, mp_list<>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<>, mp_list>, mp_list<>);
 
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<false>, mp_list>, mp_list<mp_false>);
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<true>, mp_list>, mp_list<mp_true>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<false>, mp_list>, mp_list<mp_false>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<true>, mp_list>, mp_list<mp_true>);
 
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<0>, mp_list>, mp_list<mp_int<0>>);
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<-1>, mp_list>, mp_list<mp_int<-1>>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<0>, mp_list>, mp_list<mp_int<0>>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<-1>, mp_list>, mp_list<mp_int<-1>>);
 
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<std::size_t(0)>, mp_list>, mp_list<mp_size_t<0>>);
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<std::size_t(1)>, mp_list>, mp_list<mp_size_t<1>>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<std::size_t(0)>, mp_list>, mp_list<mp_size_t<0>>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<std::size_t(1)>, mp_list>, mp_list<mp_size_t<1>>);
 
-    BOOST_TEST_TRAIT_SAME(mp_rename<L<false, 0, std::size_t(0)>, mp_list>, mp_list<mp_false, mp_int<0>, mp_size_t<0>>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L1<false, 0, std::size_t(0)>, mp_list>, mp_list<mp_false, mp_int<0>, mp_size_t<0>>);
+
+    BOOST_TEST_TRAIT_SAME(mp_rename<L2<>, mp_list>, mp_list_c<int>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L2<0>, mp_list>, mp_list_c<int, 0>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L2<0, 1>, mp_list>, mp_list_c<int, 0, 1>);
+    BOOST_TEST_TRAIT_SAME(mp_rename<L2<0, 1, 2>, mp_list>, mp_list_c<int, 0, 1, 2>);
 
     return boost::report_errors();
 }
diff --git a/test/mp_size_2.cpp b/test/mp_size_2.cpp
index e2b72db..c272eec 100644
--- a/test/mp_size_2.cpp
+++ b/test/mp_size_2.cpp
@@ -15,7 +15,7 @@ int main() {}
 #include <boost/core/lightweight_test_trait.hpp>
 
 template<auto... A> struct L1 {};
-template<int... A> struct L2 {};
+template<int... I> struct L2 {};
 
 int main()
 {