From b95d91ee71a723cf32b6dfc3cd57a8f7da6823d9 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Sun, 3 May 2020 14:35:41 -0400
Subject: [PATCH] Use a separate BOOST_PP_LIMIT_VARIADIC for variadic elements

---
 include/boost/preprocessor/config/limits.hpp | 29 ++++++++++++++------
 include/boost/preprocessor/variadic/elem.hpp |  6 ++--
 include/boost/preprocessor/variadic/size.hpp |  6 ++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/include/boost/preprocessor/config/limits.hpp b/include/boost/preprocessor/config/limits.hpp
index c583743..9882fbd 100644
--- a/include/boost/preprocessor/config/limits.hpp
+++ b/include/boost/preprocessor/config/limits.hpp
@@ -34,15 +34,6 @@
 # undef BOOST_PP_LIMIT_WHILE
 # endif
 
-# if defined(BOOST_PP_LIMIT_TUPLE)
-# if !(BOOST_PP_LIMIT_TUPLE == 64 || BOOST_PP_LIMIT_TUPLE == 128 || BOOST_PP_LIMIT_TUPLE == 256)
-# undef BOOST_PP_LIMIT_TUPLE
-# define BOOST_PP_LIMIT_TUPLE 64
-# endif
-# else
-# define BOOST_PP_LIMIT_TUPLE 64
-# endif
-
 # if defined(BOOST_PP_LIMIT_MAG)
 # if !(BOOST_PP_LIMIT_MAG == 256 || BOOST_PP_LIMIT_MAG == 512)
 # undef BOOST_PP_LIMIT_MAG
@@ -56,6 +47,26 @@
 # define BOOST_PP_LIMIT_WHILE 256
 # endif
 
+# if defined(BOOST_PP_LIMIT_VARIADIC)
+# if !(BOOST_PP_LIMIT_VARIADIC == 64 || BOOST_PP_LIMIT_VARIADIC == 128 || BOOST_PP_LIMIT_VARIADIC == 256)
+# undef BOOST_PP_LIMIT_VARIADIC
+# define BOOST_PP_LIMIT_VARIADIC 64
+# endif
+# else
+# define BOOST_PP_LIMIT_VARIADIC 64
+# endif
+
+# if defined(BOOST_PP_LIMIT_TUPLE)
+# if !(BOOST_PP_LIMIT_TUPLE == 64 || BOOST_PP_LIMIT_TUPLE == 128 || BOOST_PP_LIMIT_TUPLE == 256)
+# undef BOOST_PP_LIMIT_TUPLE
+# define BOOST_PP_LIMIT_TUPLE 64
+# elif BOOST_PP_LIMIT_TUPLE > BOOST_PP_LIMIT_VARIADIC
+# define BOOST_PP_LIMIT_VARIADIC BOOST_PP_LIMIT_TUPLE
+# endif
+# else
+# define BOOST_PP_LIMIT_TUPLE 64
+# endif
+
 # if defined(BOOST_PP_LIMIT_FOR)
 # if !(BOOST_PP_LIMIT_FOR == 256 || BOOST_PP_LIMIT_FOR == 512)
 # undef BOOST_PP_LIMIT_FOR
diff --git a/include/boost/preprocessor/variadic/elem.hpp b/include/boost/preprocessor/variadic/elem.hpp
index ad918e7..d49052d 100644
--- a/include/boost/preprocessor/variadic/elem.hpp
+++ b/include/boost/preprocessor/variadic/elem.hpp
@@ -19,11 +19,11 @@
 #
 # include <boost/preprocessor/config/limits.hpp>
 #
-# if BOOST_PP_LIMIT_TUPLE == 64
+# if BOOST_PP_LIMIT_VARIADIC == 64
 # include <boost/preprocessor/variadic/limits/elem_64.hpp>
-# elif BOOST_PP_LIMIT_TUPLE == 128
+# elif BOOST_PP_LIMIT_VARIADIC == 128
 # include <boost/preprocessor/variadic/limits/elem_128.hpp>
-# elif BOOST_PP_LIMIT_TUPLE == 256
+# elif BOOST_PP_LIMIT_VARIADIC == 256
 # include <boost/preprocessor/variadic/limits/elem_256.hpp>
 # else
 # error Incorrect value for the BOOST_PP_LIMIT_TUPLE limit
diff --git a/include/boost/preprocessor/variadic/size.hpp b/include/boost/preprocessor/variadic/size.hpp
index 45eb61c..83b5489 100644
--- a/include/boost/preprocessor/variadic/size.hpp
+++ b/include/boost/preprocessor/variadic/size.hpp
@@ -17,11 +17,11 @@
 #
 # include <boost/preprocessor/config/limits.hpp>
 #
-# if BOOST_PP_LIMIT_TUPLE == 64
+# if BOOST_PP_LIMIT_VARIADIC == 64
 # include <boost/preprocessor/variadic/limits/size_64.hpp>
-# elif BOOST_PP_LIMIT_TUPLE == 128
+# elif BOOST_PP_LIMIT_VARIADIC == 128
 # include <boost/preprocessor/variadic/limits/size_128.hpp>
-# elif BOOST_PP_LIMIT_TUPLE == 256
+# elif BOOST_PP_LIMIT_VARIADIC == 256
 # include <boost/preprocessor/variadic/limits/size_256.hpp>
 # else
 # error Incorrect value for the BOOST_PP_LIMIT_TUPLE limit