Merge branch 'develop'

Allow the IBM compiler to default to the level of C++/C compliance to determine default variadic macro support
NVidia compiler supports variadic macros.
2025-06-29 22:11:04 +02:00 · 2018-02-20 09:13:57 -05:00 · 2018-02-18 09:47:44 -05:00 · 2018-02-14 22:01:04 -05:00 · 2018-01-11 13:02:34 -05:00 · 2018-01-11 14:20:16 +00:00
7 changed files with 48 additions and 10 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -21,9 +21,9 @@ install:
  - cd ..
  - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
  - cd boost-root
-  - git submodule update --init --depth 1 tools/build
-  - git submodule update --init --depth 1 libs/config
-  - git submodule update --init --depth 1 tools/boostdep
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
  - cp -r $TRAVIS_BUILD_DIR/* libs/preprocessor
  - python tools/boostdep/depinst/depinst.py preprocessor
  - ./bootstrap.sh
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,36 @@
+# Copyright 2017 Edward Diener
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
+
+version: 1.0.{build}-{branch}
+
+shallow_clone: true
+
+branches:
+  only:
+    - master
+    - develop
+
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0,msvc-14.0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      TOOLSET: msvc-14.1
+
+install:
+  - cd ..
+  - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root
+  - cd boost-root
+  - git submodule update --init tools/build
+  - git submodule update --init libs/config
+  - git submodule update --init tools/boostdep
+  - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\preprocessor
+  - python tools/boostdep/depinst/depinst.py preprocessor
+  - bootstrap
+  - b2 headers
+
+build: off
+
+test_script:
+  - b2 libs/preprocessor/test toolset=%TOOLSET%
--- a/doc/ref/identity_n.html
+++ b/doc/ref/identity_n.html
@ -33,7 +33,7 @@
 		</ul>
 	<h4>Requirements</h4>
 		<div>
-			<b>Header:</b> &nbsp;<a href="../headers/facilities/identity_n.html">&lt;boost/preprocessor/facilities/identity.hpp&gt;</a>
+			<b>Header:</b> &nbsp;<a href="../headers/facilities/identity.html">&lt;boost/preprocessor/facilities/identity.hpp&gt;</a>
 		</div>
 	<h4>Sample Code</h4>
 <div><pre>
--- a/doc/ref/tuple_eat.html
+++ b/doc/ref/tuple_eat.html
@ -42,7 +42,7 @@ not occur.<br>
 			<b>Header:</b> &nbsp;<a href="../headers/tuple/eat.html">&lt;boost/preprocessor/tuple/eat.hpp&gt;</a>
 		</div>
 	<h4>Sample Code</h4>
-<div><pre>#include &lt;<a href="../headers/control/if.html">boost/preprocessor/control/if.hpp</a>&gt;<br>#include &lt;<a href="../headers/tuple/eat.html">boost/preprocessor/tuple/eat.hpp</a>&gt;<br><br>#define OP(a, b) (a b)<br><br>#define MACRO(n) <a href="if.html">BOOST_PP_IF</a>(n, OP, <a href="tuple_eat.html">BOOST_PP_TUPLE_EAT</a>(2))(1, 2)<br><br>// or for the variadic version <a href="../topics/variadic_macros.html#VNotation" target="_self"><sup>(v)</sup></a><br><br>#define MACRO(n) <a href="if.html">BOOST_PP_IF</a>(n, OP, <a href="file:///C:/Programming/VersionControl/sandbox/variadics/libs/preprocessor/doc/ref/tuple_eat.html">BOOST_PP_TUPLE_EAT</a>())(1, 2)<br><br>MACRO(0) // expands to nothing<br>MACRO(1) // expands to (1, 2)<br></pre></div>
+<div><pre>#include &lt;<a href="../headers/control/if.html">boost/preprocessor/control/if.hpp</a>&gt;<br>#include &lt;<a href="../headers/tuple/eat.html">boost/preprocessor/tuple/eat.hpp</a>&gt;<br><br>#define OP(a, b) (a b)<br><br>#define MACRO(n) <a href="if.html">BOOST_PP_IF</a>(n, OP, <a href="tuple_eat.html">BOOST_PP_TUPLE_EAT</a>(2))(1, 2)<br><br>// or for the variadic version <a href="../topics/variadic_macros.html#VNotation" target="_self"><sup>(v)</sup></a><br><br>#define MACRO(n) <a href="if.html">BOOST_PP_IF</a>(n, OP, <a href="tuple_eat.html">BOOST_PP_TUPLE_EAT</a>())(1, 2)<br><br>MACRO(0) // expands to nothing<br>MACRO(1) // expands to (1, 2)<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/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="file:///C:/Programming/VersionControl/sandbox/variadics/libs/preprocessor/doc/ref/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="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>
 	<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/while_d_macros.html
+++ b/doc/ref/while_d_macros.html
@ -12,12 +12,12 @@
    <ul>
      <li><a href="add_d.html"><span style="color: gray;">BOOST_PP_ADD_D</span></a></li>
      <li><a href="div_d.html"><span style="    color: gray;">BOOST_PP_DIV_D</span></a></li>
-      <li><a href="file:///C:/Programming/VersionControl/modular-boost/libs/preprocessor/doc/ref/div_d.html"><span
+      <li><a href="div_d.html"><span
            style="    color: gray;"></span></a><a href="mod_d.html"><span style="                      color: gray;">BOOST_PP_MOD_D</span></a></li>
-      <li><a href="file:///C:/Programming/VersionControl/modular-boost/libs/preprocessor/doc/ref/mod_d.html"><span
+      <li><a href="mod_d.html"><span
            style="                      color: gray;"></span></a><a href="mul_d.html"><span
            style="                       color: gray;">BOOST_PP_MUL_D</span></a></li>
-      <li><a href="file:///C:/Programming/VersionControl/modular-boost/libs/preprocessor/doc/ref/mul_d.html"><span
+      <li><a href="mul_d.html"><span
            style="                       color: gray;"></span></a><a href="sub_d.html"><span
            style="                          color: gray;">BOOST_PP_SUB_D</span></a></li>
    </ul>
--- a/include/boost/preprocessor/config/config.hpp
+++ b/include/boost/preprocessor/config/config.hpp
@ -71,8 +71,10 @@
 # define BOOST_PP_VARIADICS_MSVC 0
 # 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 __IBMCPP__ || defined __PGI
+#    if defined __GCCXML__ || 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
 #        define BOOST_PP_VARIADICS 0
+#    elif defined(__CUDACC__)
+#        define BOOST_PP_VARIADICS 1
 #    elif defined(_MSC_VER) && defined(__clang__)
 #        define BOOST_PP_VARIADICS 1
 #    /* VC++ (C/C++) and Intel C++ Compiler >= 17.0 with MSVC */
Author	SHA1	Message	Date
Edward Diener	56090c56b5	Merge branch 'develop'	2018-02-20 09:13:57 -05:00
Edward Diener	00b2f44624	Allow the IBM compiler to default to the level of C++/C compliance to determine default variadic macro support	2018-02-18 09:47:44 -05:00
Edward Diener	a329a67b47	NVidia compiler supports variadic macros.	2018-02-14 22:01:04 -05:00
Edward Diener	34af3a925c	Merge pull request #11 from danieljames/feature/fix-links Fix some links	2018-01-11 13:02:34 -05:00
Daniel James	ad22f9686e	Fix some links	2018-01-11 14:20:16 +00:00
eldiener	39175c471f	Merge branch 'develop'	2017-10-30 11:32:10 -04:00
eldiener	aa9ee3ae3f	Removed --depth 1	2017-10-29 21:31:25 -04:00
eldiener	50ffeeee8b	Merge branch 'develop'	2017-10-27 22:31:37 -04:00
Edward Diener	f54e270433	Better appveyor designation for tests.	2017-10-09 11:58:08 -04:00
Edward Diener	08ec2abb2e	Updated appveyor file for correct toolsets.	2017-10-09 11:39:03 -04:00
Edward Diener	c4b1ce10bd	Add VS2017 worker image.	2017-10-09 11:23:30 -04:00
Edward Diener	1ecc2e2ec9	Added Appveyor file.	2017-10-09 08:09:05 -04:00