#if BOOST_PP_VARIADICS
-#if BOOST_PP_VARIADICS_MSVC /* Testing the VC++ variadic version */
+# include <boost/preprocessor/variadic/has_opt.hpp>
+
+#if defined(__cplusplus) && __cplusplus > 201703L && BOOST_PP_VARIADIC_HAS_OPT()
+
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN2) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN3) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN4) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN5) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN8) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN9) == 0 END
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN10) == 0 END
+
+#elif BOOST_PP_VARIADICS_MSVC /* Testing the VC++ variadic version */
/* INCORRECT */