Merge branch 'develop'

2025-07-31 12:47:12 +02:00 · 2019-10-04 22:51:14 -04:00
parent d135cad759 af70b2872e
commit 6af29d8b77
56 changed files with 651 additions and 325 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -33,6 +33,8 @@ install:
  - git submodule update --init tools/build
  - git submodule update --init libs/config
  - git submodule update --init tools/boostdep
+  - git submodule update --init tools/boost_install
+  - git submodule update --init libs/headers
  - cp -r $TRAVIS_BUILD_DIR/* libs/preprocessor
  - python tools/boostdep/depinst/depinst.py preprocessor
  - ./bootstrap.sh
--- a/appveyor.yml
+++ b/appveyor.yml
@ -49,6 +49,8 @@ for:
    - git submodule update --init tools/build
    - git submodule update --init libs/config
    - git submodule update --init tools/boostdep
+    - git submodule update --init tools/boost_install
+    - git submodule update --init libs/headers
    - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\preprocessor
    - python tools/boostdep/depinst/depinst.py preprocessor
    - bootstrap
--- a/doc/headers.html
+++ b/doc/headers.html
@ -230,6 +230,7 @@
      <li><a href="headers/variadic.html">variadic.hpp</a></li>
      <li>variadic/</li>
      <li class="ps"><a href="headers/variadic/elem.html">elem.hpp</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
+      <li class="ps"><a href="headers/variadic/opt.html">opt.hpp</a> </li>
      <li class="ps"><a href="headers/variadic/size.html">size.hpp</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
      <li class="ps"><a href="headers/variadic/to_array.html">to_array.hpp</a> <a
          href="topics/variadic_macros.html#VNotation">(v)</a></li>
--- a/doc/headers/variadic.html
+++ b/doc/headers/variadic.html
@ -14,6 +14,7 @@
 	<h4>Includes</h4>
 		<ul>
 			<li><a href="variadic/elem.html">&lt;boost/preprocessor/variadic/elem.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
+			<li><a href="variadic/opt.html">&lt;boost/preprocessor/variadic/opt.hpp&gt;</a> </li>
 			<li><a href="variadic/size.html">&lt;boost/preprocessor/variadic/size.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
 			<li><a href="variadic/to_array.html">&lt;boost/preprocessor/variadic/to_array.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
 			<li><a href="variadic/to_list.html">&lt;boost/preprocessor/variadic/to_list.hpp&gt;</a> <a href="../topics/variadic_macros.html#VNotation" target="_self">(v)</a></li>
@ -22,7 +23,7 @@
 		</ul>
 	<hr size="1">
 	<div style="margin-left: 0px;">
-		<i></i><i><EFBFBD> Copyright Edward Diener 2011,2013</i>
+		<i></i><i><EFBFBD> Copyright Edward Diener 2011,2013,2019</i>
 	</div>
 	<div style="margin-left: 0px;">
 		<p><small>Distributed under the Boost Software License, Version 1.0. (See
--- a/doc/headers/variadic/opt.html
+++ b/doc/headers/variadic/opt.html
@ -0,0 +1,25 @@
+<html><head>
+  <title>variadic/opt.hpp</title>
+  <link rel="stylesheet" type="text/css" href="../../styles.css"></head><body>
+   <div style="margin-left: 0px;">
+   The <b>variadic/opt.hpp</b> header defines a macro that determines whether or not the __VA_OPT__ construct is supported.
+   </div>
+   <h4>Usage</h4>
+   <div class="code">
+   #include <b>&lt;boost/preprocessor/variadic/opt.hpp&gt;</b>
+   </div>
+   <h4>Contents</h4>
+   <ul>
+   <li><a href="../../ref/variadic_opt.html">BOOST_PP_VARIADIC_OPT</a> <br>
+   </li>
+   </ul>
+   <hr size="1">
+   <div style="margin-left: 0px;">
+   <i></i><i><EFBFBD> Copyright Edward Diener 2019</i>
+   </div>
+   <div style="margin-left: 0px;">
+   <p><small>Distributed under the Boost Software License, Version 1.0. (See
+   accompanying file <a href="../../../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or
+   copy at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</small></p>
+   </div>
+   </body></html>
--- a/doc/ref.html
+++ b/doc/ref.html
@ -298,6 +298,7 @@
      <li><a href="ref/value.html">VALUE</a></li>
      <li><a href="ref/variadics.html">VARIADICS</a></li>
      <li><a href="ref/variadic_elem.html">VARIADIC_ELEM</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
+      <li><a href="ref/variadic_opt.html">VARIADIC_OPT</a></li>
      <li><a href="ref/variadic_seq_to_seq.html">VARIADIC_SEQ_TO_SEQ</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
      <li><a href="ref/variadic_size.html">VARIADIC_SIZE</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
      <li><a href="ref/variadic_to_array.html">VARIADIC_TO_ARRAY</a> <a href="topics/variadic_macros.html#VNotation">(v)</a></li>
--- a/doc/ref/list_to_array_d.html
+++ b/doc/ref/list_to_array_d.html
@ -30,5 +30,13 @@
    <h4> Requirements </h4>
    <div> <b>Header:</b> &nbsp;<a href="../headers/list/to_array.html">&lt;boost/preprocessor/list/to_array.hpp&gt;</a>
    </div>
+    <hr size="1">
+    <div style="margin-left: 0px;"> <i></i><i>© Copyright Edward Diener 2011</i>
+    </div>
+    <div style="margin-left: 0px;">
+      <p><small>Distributed under the Boost Software License, Version 1.0. (See
+          accompanying file <a href="../../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a>
+          or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</small></p>
+    </div>
  </body>
 </html>
--- a/doc/ref/list_to_seq_r.html
+++ b/doc/ref/list_to_seq_r.html
@ -28,5 +28,12 @@
    <h4> Requirements </h4>
    <div> <b>Header:</b> &nbsp;<a href="../headers/list/to_seq.html">&lt;boost/preprocessor/list/to_seq.hpp&gt;</a>
    </div>
+    <hr size="1">
+    <div style="margin-left: 0px;"> <i>© Copyright Edward Diener 2011</i> </div>
+    <div style="margin-left: 0px;">
+      <p><small>Distributed under the Boost Software License, Version 1.0. (See
+          accompanying file <a href="../../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a>
+          or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</small></p>
+    </div>
  </body>
 </html>
--- a/doc/ref/tuple_elem.html
+++ b/doc/ref/tuple_elem.html
@ -49,7 +49,7 @@ or<br>
 			<b>Header:</b> &nbsp;<a href="../headers/tuple/elem.html">&lt;boost/preprocessor/tuple/elem.hpp&gt;</a>
 		</div>
 	<h4>Sample Code</h4>
-<div><pre>#include &lt;<a href="../headers/tuple/elem.html">boost/preprocessor/tuple/elem.hpp</a>&gt;<br><br>#define TUPLE (a, b, c, d)<br><br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(4, 0, TUPLE) // expands to a<br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(4, 3, TUPLE) // expands to d<br><br>// or for the variadic version <a href="../topics/variadic_macros.html#VNotation" target="_self"><sup>(v)</sup></a><br><br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(0, TUPLE) // expands to a in the variadic version<br><a href="file:///C:/Programming/VersionControl/sandbox/variadics/libs/preprocessor/doc/ref/tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(3, TUPLE) // expands to d in the variadic version<br></pre></div>
+<div><pre>#include &lt;<a href="../headers/tuple/elem.html">boost/preprocessor/tuple/elem.hpp</a>&gt;<br><br>#define TUPLE (a, b, c, d)<br><br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(4, 0, TUPLE) // expands to a<br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(4, 3, TUPLE) // expands to d<br><br>// or for the variadic version <a href="../topics/variadic_macros.html#VNotation" target="_self"><sup>(v)</sup></a><br><br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(0, TUPLE) // expands to a in the variadic version<br><a href="tuple_elem.html">BOOST_PP_TUPLE_ELEM</a>(3, TUPLE) // expands to d in the variadic version<br></pre></div>
 	<hr size="1">
 	<div style="margin-left: 0px;">
 		<i><EFBFBD> Copyright <a href="http://www.housemarque.com" target="_top">Housemarque Oy</a> 2002</i>
--- a/doc/ref/variadic_opt.html
+++ b/doc/ref/variadic_opt.html
@ -0,0 +1,50 @@
+<html>
+<head>
+  <title>BOOST_PP_VARIADIC_OPT</title>
+  <link rel="stylesheet" type="text/css" href="../styles.css">
+</head>
+<body>
+<div style="margin-left: 0px;"> The <b>BOOST_PP_VARIADIC_OPT</b> macro
+determines whether or not the C++20 __VA_OPT__ construct is supported for the compiler's preprocessor being used. 
+Expands to 1 if the __VA_OPT__ construct is supported, otherwise expands to 0.
+</div>
+<h4>Usage</h4>
+<div class="code"> <b>BOOST_PP_VARIADIC_OPT</b>() <br>
+  </div>
+<h4>Arguments</h4>
+<dl>
+  <dt>None<br>
+</dt>
+</dl>
+<h4>Requirements</h4>
+<div> <b>Header:</b> &nbsp;<a href="../headers/variadic/opt.html">&lt;boost/preprocessor/variadic/opt.hpp&gt;</a>
+</div>
+<h4>Sample Code</h4>
+<div>
+<pre>
+#include &lt;<a href="../headers/variadic/opt.html">boost/preprocessor/variadic/opt.hpp</a>&gt;<br>
+#if <a href="variadic_opt.html">BOOST_PP_VARIADIC_OPT</a>()
+// Preprocessor code which uses __VA_OPT__
+#else
+// Preprocessor code which does not use __VA_OPT__
+#endif
+</pre>
+<br>
+or within a macro definition<br><br>
+<pre>
+#include &lt;boost/preprocessor/control/iif.hpp&gt;
+#include &lt;<a href="../headers/variadic/opt.html">boost/preprocessor/variadic/opt.hpp</a>&gt;<br>
+#define USE_OPT(...) BOOST_PP_IIF(<a href="variadic_opt.html">BOOST_PP_VARIADIC_OPT</a>(),MACRO_USING_OPT,MACRO_NOT_USING_OPT)(__VA_ARGS__)
+#define MACRO_USING_OPT(...) __VA_OPT__( preprocessor tokens ) anything
+#define MACRO_NOT_USING_OPT(...) anything
+</pre>
+</div>
+<hr size="1">
+<div style="margin-left: 0px;"> <i></i><i><EFBFBD> Copyright Edward Diener 2019</i> </div>
+<div style="margin-left: 0px;">
+<p><small>Distributed under the Boost Software License, Version 1.0.
+(See accompanying file <a href="../../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a>
+or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</small></p>
+</div>
+</body>
+</html>
--- a/doc/syntax.html
+++ b/doc/syntax.html
@ -284,6 +284,7 @@
 	<!-- V -->
 	<br>BOOST_PP_VALUE
    <br>BOOST_PP_VARIADIC_ELEM
+    <br>BOOST_PP_VARIADIC_OPT
    <br>BOOST_PP_VARIADIC_SIZE
    <br>BOOST_PP_VARIADIC_TO_ARRAY
    <br>BOOST_PP_VARIADIC_TO_LIST
--- a/doc/topics/variadic_macros.html
+++ b/doc/topics/variadic_macros.html
@ -136,6 +136,27 @@
      use this variadic data reliably as arguments to other macros, one needs
      variadic macro support.<br>
    </div>
+    <h4>C++20 Support For Variadic Macros</h4>
+    <div>
+      In the C++20 specification there is a new construct which can be
+      used in the expansion of a variadic macro, called __VA_OPT__. This
+      construct when used in the expansion of a variadic macro is followed
+      by an opening paranthesis ('('), preprocessor data, and a closing
+      parenthesis ('}'). When the variadic data passed by the invocation
+      of a variadic macro is empty, this new construct expands to nothing.
+      When the variadic data passed by the invocation of a variadic macro
+      is not empty, this new construct expands to the preprocessor data
+      between its opening and closing parentheses.
+      <br><br>
+      This library offers support for this new C++20 construct by automatically
+      detecting whether this new construct is supported by the compiler's
+      preprocessor when using the library. The library macro which detects
+      support for the __VA_OPT__ construct is called BOOST_PP_VARIADIC_OPT.
+      This is a function-like macro which takes no parameters and returns
+      1 if the compiler is working in C++20 mode and supports the __VA_OPT__
+      construct, while otherwise it returns 0.
+      <br>
+    </div>
    <u  style="font-weight: bold;"> Using a Tuple Instead of an Array<br>
    </u>
    <div>An array as a preprocessor data type is a two-element tuple where the
@ -257,6 +278,5 @@
          (See accompanying file <a  href="../../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a>
          or copy at <a  href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</small></p>
    </div>
-  
-
-</body></html>
+  </body>
+</html>
--- a/include/boost/preprocessor/config/config.hpp
+++ b/include/boost/preprocessor/config/config.hpp
@ -80,7 +80,7 @@
 # if !defined BOOST_PP_VARIADICS
 #    /* variadic support explicitly disabled for all untested compilers */

-#    if defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || ( defined __SUNPRO_CC && __SUNPRO_CC < 0x5120 ) || defined __HP_aCC && !defined __EDG__ || defined __MRC__ || defined __SC__ || (defined(__PGI) && !defined(__EDG__))
+#    if defined __GCCXML__ || (defined __CUDACC__ && !(defined(__clang__) && defined(__CUDA__))) || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || ( defined __SUNPRO_CC && __SUNPRO_CC < 0x5120 ) || (defined __HP_aCC && !defined __EDG__) || defined __MRC__ || defined __SC__ || (defined(__PGI) && !defined(__EDG__))
 #        define BOOST_PP_VARIADICS 0
 #    elif defined(_MSC_VER) && defined(__clang__)
 #        define BOOST_PP_VARIADICS 1
--- a/include/boost/preprocessor/facilities/is_empty_variadic.hpp
+++ b/include/boost/preprocessor/facilities/is_empty_variadic.hpp
@ -1,6 +1,6 @@
 # /* **************************************************************************
 #  *                                                                          *
-#  *     (C) Copyright Edward Diener 2014.
+#  *     (C) Copyright Edward Diener 2014,2019.
 #  *     Distributed under the Boost Software License, Version 1.0. (See
 #  *     accompanying file LICENSE_1_0.txt or copy at
 #  *     http://www.boost.org/LICENSE_1_0.txt)
@ -37,7 +37,34 @@
 /**/
 #define BOOST_PP_IS_EMPTY_ZERO(param) 0
 # else
+# if defined(__cplusplus) && __cplusplus > 201703L
+# include <boost/preprocessor/variadic/opt.hpp>
 #define BOOST_PP_IS_EMPTY(...) \
+    BOOST_PP_DETAIL_IS_EMPTY_IIF \
+      ( \
+      BOOST_PP_VARIADIC_OPT() \
+      ) \
+      ( \
+      BOOST_PP_IS_EMPTY_OPT, \
+      BOOST_PP_IS_EMPTY_NO_OPT \
+      ) \
+    (__VA_ARGS__) \
+/**/
+#define BOOST_PP_IS_EMPTY_FUNCTION2(...) \
+    __VA_OPT__(0,) 1 \
+/**/
+#define BOOST_PP_IS_EMPTY_FUNCTION(...) \
+    BOOST_PP_IS_EMPTY_FUNCTION2(__VA_ARGS__) \
+/**/
+#define BOOST_PP_IS_EMPTY_OPT(...) \
+    BOOST_PP_VARIADIC_OPT_ELEM0(BOOST_PP_IS_EMPTY_FUNCTION(__VA_ARGS__),) \
+/**/
+# else
+#define BOOST_PP_IS_EMPTY(...) \
+    BOOST_PP_IS_EMPTY_NO_OPT(__VA_ARGS__) \
+/**/
+# endif /* defined(__cplusplus) && __cplusplus > 201703L */
+#define BOOST_PP_IS_EMPTY_NO_OPT(...) \
    BOOST_PP_DETAIL_IS_EMPTY_IIF \
      ( \
      BOOST_PP_IS_BEGIN_PARENS \
--- a/include/boost/preprocessor/variadic.hpp
+++ b/include/boost/preprocessor/variadic.hpp
@ -14,6 +14,7 @@
 # define BOOST_PREPROCESSOR_VARIADIC_HPP
 #
 # include <boost/preprocessor/variadic/elem.hpp>
+# include <boost/preprocessor/variadic/opt.hpp>
 # include <boost/preprocessor/variadic/size.hpp>
 # include <boost/preprocessor/variadic/to_array.hpp>
 # include <boost/preprocessor/variadic/to_list.hpp>
--- a/include/boost/preprocessor/variadic/detail/opt.hpp
+++ b/include/boost/preprocessor/variadic/detail/opt.hpp
@ -0,0 +1,30 @@
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Edward Diener 2019.                                    *
+#  *     Distributed under the Boost Software License, Version 1.0. (See      *
+#  *     accompanying file LICENSE_1_0.txt or copy at                         *
+#  *     http://www.boost.org/LICENSE_1_0.txt)                                *
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef BOOST_PREPROCESSOR_VARIADIC_DETAIL_OPT_HPP
+# define BOOST_PREPROCESSOR_VARIADIC_DETAIL_OPT_HPP
+#
+# include <boost/preprocessor/config/config.hpp>
+#
+# if BOOST_PP_VARIADICS && defined(__cplusplus) && __cplusplus > 201703L
+#
+# define BOOST_PP_VARIADIC_OPT_FUNCTION(...) \
+    __VA_OPT__(,) , 1, 0 \
+/**/
+#
+# define BOOST_PP_VARIADIC_OPT_ELEM0(e0, ...) BOOST_PP_VARIADIC_OPT_ELEM_0(e0,__VA_ARGS__)
+# define BOOST_PP_VARIADIC_OPT_ELEM2(e0, ...) BOOST_PP_VARIADIC_OPT_ELEM_2(e0,__VA_ARGS__)
+# define BOOST_PP_VARIADIC_OPT_ELEM_0(e0, ...) e0
+# define BOOST_PP_VARIADIC_OPT_ELEM_2(e0, e1, e2, ...) e2
+#
+# endif
+#
+# endif
--- a/include/boost/preprocessor/variadic/opt.hpp
+++ b/include/boost/preprocessor/variadic/opt.hpp
@ -0,0 +1,28 @@
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Edward Diener 2019.                                    *
+#  *     Distributed under the Boost Software License, Version 1.0. (See      *
+#  *     accompanying file LICENSE_1_0.txt or copy at                         *
+#  *     http://www.boost.org/LICENSE_1_0.txt)                                *
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef BOOST_PREPROCESSOR_VARIADIC_OPT_HPP
+# define BOOST_PREPROCESSOR_VARIADIC_OPT_HPP
+#
+# include <boost/preprocessor/config/config.hpp>
+#
+# /* BOOST_PP_VARIADIC_OPT */
+#
+# if BOOST_PP_VARIADICS && defined(__cplusplus) && __cplusplus > 201703L
+# include <boost/preprocessor/variadic/detail/opt.hpp>
+# define BOOST_PP_VARIADIC_OPT() \
+  BOOST_PP_VARIADIC_OPT_ELEM2(BOOST_PP_VARIADIC_OPT_FUNCTION(?),) \
+/**/
+# else
+# define BOOST_PP_VARIADIC_OPT() 0
+# endif
+#
+# endif
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@ -3,6 +3,7 @@
 #~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 import testing ;
+import cast ;

 project preprocessor_tests : requirements <warnings>on
                                          <toolset>gcc-4.3.0:<warnings>all
@ -247,3 +248,15 @@ alias preprocessor_config
   :   
        [ run config_info.cpp ]
  ;
+  
+alias test_clang_cuda
+   :   
+        [ compile [ cast _ cpp : clang_cuda.cu ]
+          : <cxxflags>-nocudalib
+            <cxxflags>-nocudainc
+            <cxxflags>"-x cuda"
+          : clang_cuda_cu
+        ]
+  ;
+
+explicit test_clang_cuda ;
--- a/test/clang_cuda.cu
+++ b/test/clang_cuda.cu
@ -0,0 +1,26 @@
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Edward Diener 2019.
+#  *     Distributed under the Boost Software License, Version 1.0. (See
+#  *     accompanying file LICENSE_1_0.txt or copy at
+#  *     http://www.boost.org/LICENSE_1_0.txt)
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# include <libs/preprocessor/test/test_macro.h>
+
+#if defined(__clang__) && defined(__CUDACC__) && defined(__CUDA__)
+
+BEGIN BOOST_PP_VARIADICS == 1 END
+
+#else
+
+BEGIN 0 == 1 END
+
+#endif
+
+int main(void) {
+    return 0;
+}
--- a/test/config_info.cpp
+++ b/test/config_info.cpp
@ -1,7 +1,19 @@
+# /* **************************************************************************
+#  *                                                                          *
+#  *     (C) Copyright Edward Diener 2014,2019.
+#  *     Distributed under the Boost Software License, Version 1.0. (See
+#  *     accompanying file LICENSE_1_0.txt or copy at
+#  *     http://www.boost.org/LICENSE_1_0.txt)
+#  *                                                                          *
+#  ************************************************************************** */
+#
+# /* See http://www.boost.org for most recent version. */
+#
 #include <iostream>
 #include <iomanip>
 #include <string.h>
 #include <boost/preprocessor/stringize.hpp>
+#include <boost/preprocessor/variadic/opt.hpp>

 static unsigned int indent = 4;
 static unsigned int width = 40;
@ -82,6 +94,7 @@ void print_macros()
  PRINT_MACRO(BOOST_PP_CONFIG_FLAGS());
  PRINT_MACRO(BOOST_PP_VARIADICS);
  PRINT_MACRO(BOOST_PP_VARIADICS_MSVC);
+  PRINT_MACRO(BOOST_PP_VARIADIC_OPT());
 }

 int main()
--- a/test/isempty.cxx
+++ b/test/isempty.cxx
@ -38,7 +38,20 @@

 #if BOOST_PP_VARIADICS

-#if BOOST_PP_VARIADICS_MSVC /* Testing the VC++ variadic version */
+# include <boost/preprocessor/variadic/opt.hpp>
+
+#if defined(__cplusplus) && __cplusplus > 201703L && BOOST_PP_VARIADIC_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 */

--- a/test/isempty_variadic_standard_failure.cxx
+++ b/test/isempty_variadic_standard_failure.cxx
@ -16,8 +16,18 @@

 #define FUNC_GEN8(x,y) (1,2,3)

+#if defined(__cplusplus) && __cplusplus > 201703L
+  
+# include <boost/preprocessor/variadic/opt.hpp>
+
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN8) == BOOST_PP_VARIADIC_OPT() END
+
+#else
+
 BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN8) == 0 END

+#endif
+
 #else
  
 BEGIN 1 == 0 END
--- a/test/isempty_variadic_standard_failure2.cxx
+++ b/test/isempty_variadic_standard_failure2.cxx
@ -16,8 +16,18 @@

 #define FUNC_GEN9(x,y,z) anything
  
+#if defined(__cplusplus) && __cplusplus > 201703L
+  
+# include <boost/preprocessor/variadic/opt.hpp>
+
+BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN9) == BOOST_PP_VARIADIC_OPT() END
+
+#else
+
 BEGIN BOOST_PP_IS_EMPTY(FUNC_GEN9) == 0 END

+#endif
+
 #else
  
 BEGIN 1 == 0 END
--- a/test/test.h
+++ b/test/test.h
@ -14,24 +14,7 @@
 # ifndef BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_H
 # define BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_H
 #
-# include <boost/preprocessor/cat.hpp>
+# include <libs/preprocessor/test/test_macro.h>
+# include <libs/preprocessor/test/test_main.h>
 #
-# define BEGIN typedef int BOOST_PP_CAT(test_, __LINE__)[((
-# define END )==1) ? 1 : -1];
-
-#if defined(__cplusplus)
-#include <cstdio>
-#if !defined(_STLP_MSVC) || _STLP_MSVC >= 1300
-namespace std { }
-using namespace std;
-#endif
-#else
-#include <stdio.h>
-#endif
-
-int main(void) {
-    printf("pass " __TIME__);
-    return 0;
-}
-
 # endif
--- a/test/test_macro.h
+++ b/test/test_macro.h
@ -0,0 +1,22 @@
+# /* Copyright (C) 2001
+#  * Housemarque Oy
+#  * http://www.housemarque.com
+#  *
+#  * Distributed under the Boost Software License, Version 1.0. (See
+#  * accompanying file LICENSE_1_0.txt or copy at
+#  * http://www.boost.org/LICENSE_1_0.txt)
+#  */
+#
+# /* Revised by Paul Mensonides (2002) */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_MACRO_H
+# define BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_MACRO_H
+#
+# include <boost/preprocessor/cat.hpp>
+#
+# define BEGIN typedef int BOOST_PP_CAT(test_, __LINE__)[((
+# define END )==1) ? 1 : -1];
+#
+# endif
--- a/test/test_main.h
+++ b/test/test_main.h
@ -0,0 +1,32 @@
+# /* Copyright (C) 2001
+#  * Housemarque Oy
+#  * http://www.housemarque.com
+#  *
+#  * Distributed under the Boost Software License, Version 1.0. (See
+#  * accompanying file LICENSE_1_0.txt or copy at
+#  * http://www.boost.org/LICENSE_1_0.txt)
+#  */
+#
+# /* Revised by Paul Mensonides (2002) */
+#
+# /* See http://www.boost.org for most recent version. */
+#
+# ifndef BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_MAIN_H
+# define BOOST_LIBS_PREPROCESSOR_REGRESSION_TEST_MAIN_H
+#
+#if defined(__cplusplus)
+#include <cstdio>
+#if !defined(_STLP_MSVC) || _STLP_MSVC >= 1300
+namespace std { }
+using namespace std;
+#endif
+#else
+#include <stdio.h>
+#endif
+
+int main(void) {
+    printf("pass " __TIME__);
+    return 0;
+}
+
+# endif