summaryrefslogtreecommitdiff
path: root/boost/preprocessor/tuple/to_array.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/preprocessor/tuple/to_array.hpp')
-rw-r--r--boost/preprocessor/tuple/to_array.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/boost/preprocessor/tuple/to_array.hpp b/boost/preprocessor/tuple/to_array.hpp
index 1b994f3f38..0a52811239 100644
--- a/boost/preprocessor/tuple/to_array.hpp
+++ b/boost/preprocessor/tuple/to_array.hpp
@@ -16,6 +16,7 @@
# include <boost/preprocessor/cat.hpp>
# include <boost/preprocessor/config/config.hpp>
# include <boost/preprocessor/facilities/overload.hpp>
+# include <boost/preprocessor/tuple/size.hpp>
# include <boost/preprocessor/variadic/size.hpp>
#
# /* BOOST_PP_TUPLE_TO_ARRAY */
@@ -25,10 +26,11 @@
# define BOOST_PP_TUPLE_TO_ARRAY(...) BOOST_PP_TUPLE_TO_ARRAY_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_TO_ARRAY_, __VA_ARGS__), (__VA_ARGS__))
# define BOOST_PP_TUPLE_TO_ARRAY_I(m, args) BOOST_PP_TUPLE_TO_ARRAY_II(m, args)
# define BOOST_PP_TUPLE_TO_ARRAY_II(m, args) BOOST_PP_CAT(m ## args,)
+# define BOOST_PP_TUPLE_TO_ARRAY_1(tuple) (BOOST_PP_TUPLE_SIZE(tuple), tuple)
# else
# define BOOST_PP_TUPLE_TO_ARRAY(...) BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_TO_ARRAY_, __VA_ARGS__)(__VA_ARGS__)
+# define BOOST_PP_TUPLE_TO_ARRAY_1(tuple) (BOOST_PP_VARIADIC_SIZE tuple, tuple)
# endif
-# define BOOST_PP_TUPLE_TO_ARRAY_1(tuple) (BOOST_PP_VARIADIC_SIZE tuple, tuple)
# define BOOST_PP_TUPLE_TO_ARRAY_2(size, tuple) (size, tuple)
# else
# define BOOST_PP_TUPLE_TO_ARRAY(size, tuple) (size, tuple)