import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / preprocessor / variadic / to_array.hpp

diff --git a/ceph/src/boost/boost/preprocessor/variadic/to_array.hpp b/ceph/src/boost/boost/preprocessor/variadic/to_array.hpp
index 14c2b9220e2edae96fa07e2a3e1e627cd5044118..c2efcf56cd50b5497b940a622c728b6fa0a54c50 100644 (file)
--- a/ceph/src/boost/boost/preprocessor/variadic/to_array.hpp
+++ b/ceph/src/boost/boost/preprocessor/variadic/to_array.hpp
@@ -14,19 +14,25 @@
 # define BOOST_PREPROCESSOR_VARIADIC_TO_ARRAY_HPP
 #
 # include <boost/preprocessor/config/config.hpp>
+# include <boost/preprocessor/control/if.hpp>
 # include <boost/preprocessor/tuple/to_array.hpp>
-# if BOOST_PP_VARIADICS_MSVC
-#    include <boost/preprocessor/variadic/size.hpp>
-# endif
+# include <boost/preprocessor/variadic/has_opt.hpp>
+# include <boost/preprocessor/variadic/size.hpp>
 #
 # /* BOOST_PP_VARIADIC_TO_ARRAY */
 #
-# if BOOST_PP_VARIADICS
-#    if BOOST_PP_VARIADICS_MSVC
-#        define BOOST_PP_VARIADIC_TO_ARRAY(...) BOOST_PP_TUPLE_TO_ARRAY_2(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),(__VA_ARGS__))
-#    else
-#        define BOOST_PP_VARIADIC_TO_ARRAY(...) BOOST_PP_TUPLE_TO_ARRAY((__VA_ARGS__))
-#    endif
+# if BOOST_PP_VARIADIC_HAS_OPT()
+#     if BOOST_PP_VARIADICS_MSVC
+#         define BOOST_PP_VARIADIC_TO_ARRAY_NON_EMPTY(...) BOOST_PP_TUPLE_TO_ARRAY_2(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),(__VA_ARGS__))
+#     else
+#         define BOOST_PP_VARIADIC_TO_ARRAY_NON_EMPTY(...) BOOST_PP_TUPLE_TO_ARRAY((__VA_ARGS__))
+#     endif
+#     define BOOST_PP_VARIADIC_TO_ARRAY_EMPTY(...) (0,())
+#     define BOOST_PP_VARIADIC_TO_ARRAY(...) BOOST_PP_IF(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),BOOST_PP_VARIADIC_TO_ARRAY_NON_EMPTY,BOOST_PP_VARIADIC_TO_ARRAY_EMPTY)(__VA_ARGS__)
+# elif BOOST_PP_VARIADICS_MSVC
+#     define BOOST_PP_VARIADIC_TO_ARRAY(...) BOOST_PP_TUPLE_TO_ARRAY_2(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),(__VA_ARGS__))
+# else
+#     define BOOST_PP_VARIADIC_TO_ARRAY(...) BOOST_PP_TUPLE_TO_ARRAY((__VA_ARGS__))
 # endif
 #
 # endif