Merge branch 'develop'

Put BOOST_PP_EXPAND in correct place for VC++
Reveert removal of BOOST_PP_EXPAND
2025-06-30 06:20:57 +02:00 · 2015-03-28 04:19:20 -04:00 · 2015-02-02 21:19:50 -05:00 · 2015-02-02 18:04:58 -05:00 · 2015-01-30 23:16:08 -05:00 · 2015-01-30 23:11:07 -05:00
12 changed files with 25 additions and 23 deletions
--- a/doc/headers.html
+++ b/doc/headers.html
@ -54,7 +54,7 @@
      <li class="ps"><a href="headers/comparison/not_equal.html">not_equal.hpp</a></li>
      <li>config/</li>
      <li class="ps"><a href="headers/config/limits.html">limits.hpp</a></li>
-      <li class="ps"><a href="headers/config/variadics.html">variadics.hpp</a></li>
+      <li class="ps"><a href="headers/config/variadics.html">config.hpp</a></li>
      <li><a href="headers/control.html">control.hpp</a></li>
      <li>control/</li>
      <li class="ps"><a href="headers/control/deduce_d.html">deduce_d.hpp</a></li>
--- a/doc/headers/config/variadics.html
+++ b/doc/headers/config/variadics.html
@ -1,19 +1,19 @@
 <html>
 <head>
-  <title>config/variadics.hpp</title>
+  <title>config/config.hpp</title>
  <link rel="stylesheet" type="text/css" href="../../styles.css">
 </head>
 <body>
 		<div style="margin-left: 0px;">
-			The <b>config/variadics.hpp</b>
-header defines a macro for determining variadic macro support. The file
-is automatically included when needed internally. The end-user can
-include it also in order to use the macro. </div>
+			The <b>config/config.hpp</b>
+header defines internal configuration macros as well as a macro for determining variadic macro support. The file
+is automatically included whenever any Boost PP macros are used. The end-user can manually
+include it in order to use the BOOST_PP_VARIADICS macro, but normally should never have to do so. </div>
 		<h4>
 			Usage
 		</h4>
 		<div class="code">
-			#include <b>&lt;boost/preprocessor/config/variadics.hpp&gt;</b>
+			#include <b>&lt;boost/preprocessor/config/config.hpp&gt;</b>
 		</div>
 		<h4>
 			Contents
@ -21,7 +21,7 @@ include it also in order to use the macro. </div>
 		<ul>
 			<li><a href="../../ref/variadics.html">BOOST_PP_VARIADICS</a></li></ul>
 	<hr size="1">
-	<div style="margin-left: 0px;"><i><EFBFBD> Copyright Edward Diener 2011</i>
+	<div style="margin-left: 0px;"><i><EFBFBD> Copyright Edward Diener 2011,2014</i>
 	</div>
 	<div style="margin-left: 0px;">
 		<p><small>Distributed under the Boost Software License, Version 1.0. (See
--- a/doc/ref/add.html
+++ b/doc/ref/add.html
@ -34,7 +34,7 @@
 			It is more efficient, however, to use <b>BOOST_PP_ADD_D</b> in such a situation.
 		</div>
 		<div>
-			This macro is the most efficient when <i>x</i> is less than or equal to <i>y</i>.&nbsp;
+			This macro is the most efficient when <i>x</i> is greater than or equal to <i>y</i>.&nbsp;
 			However, the efficiency gain is not worth actually comparing the two arguments prior to invocation.&nbsp;
 			In other words, <i>x</i> should be the addend that is <i>most likely</i> to be the largest of the two operands.
 		</div>
--- a/doc/ref/add_d.html
+++ b/doc/ref/add_d.html
@ -34,7 +34,7 @@
 			If the sum of <i>x</i> and <i>y</i> is greater than <b>BOOST_PP_LIMIT_MAG</b>, the result is saturated to <b>BOOST_PP_LIMIT_MAG</b>.
 		</div>
 		<div>
-			This macro is the most efficient when <i>x</i> is less than or equal to <i>y</i>.&nbsp;
+			This macro is the most efficient when <i>x</i> is greater than or equal to <i>y</i>.&nbsp;
 			However, the efficiency gain is not worth actually comparing the two arguments prior to invocation.&nbsp;
 			In other words, <i>x</i> should be the addend that is <i>most likely</i> to be the largest of the two operands.
 		</div>
--- a/doc/ref/mul.html
+++ b/doc/ref/mul.html
@ -34,7 +34,7 @@
 			It is more efficient, however, to use <b>BOOST_PP_MUL_D</b> in such a situation.
 		</div>
 		<div>
-			This macro is the most efficient when <i>x</i> is less than or equal to <i>y</i>.&nbsp;
+			This macro is the most efficient when <i>x</i> is greater than or equal to <i>y</i>.&nbsp;
 			However, the efficiency gain is not worth actually comparing the two arguments prior to invocation.&nbsp;
 			In other words, <i>x</i> should be the value that is <i>most likely</i> to be the largest of the two operands.
 		</div>
--- a/doc/ref/mul_d.html
+++ b/doc/ref/mul_d.html
@ -34,7 +34,7 @@
 			If the product of <i>x</i> and <i>y</i> is greater than <b>BOOST_PP_LIMIT_MAG</b>, the result is saturated to <b>BOOST_PP_LIMIT_MAG</b>.
 		</div>
 		<div>
-			This macro is the most efficient when <i>x</i> is less than or equal to <i>y</i>.&nbsp;
+			This macro is the most efficient when <i>x</i> is greater than or equal to <i>y</i>.&nbsp;
 			However, the efficiency gain is not worth actually comparing the two arguments prior to invocation.&nbsp;
 			In other words, <i>x</i> should be the value that is <i>most likely</i> to be the largest of the two operands.
 		</div>
--- a/doc/ref/variadics.html
+++ b/doc/ref/variadics.html
@ -13,14 +13,14 @@
 code to check for the presence of variadic macro support. It can be
 used by the end-user for the same purpose. The macro equals 1 if
 variadic macros are supported and 0 if they are not. </div><b>Requirements</b>
-<div> <b>Header:</b> &nbsp;<a href="../headers/config/variadics.html">&lt;boost/preprocessor/config/variadics.hpp&gt;</a>
+<div> <b>Header:</b> &nbsp;<a href="../headers/config/variadics.html">&lt;boost/preprocessor/config/config.hpp&gt;</a>
 </div>
 <h4>Sample Code</h4>
 <div>
-<pre>#include &lt;<a href="../headers/config/variadics.html">boost/preprocessor/config/variadics.hpp</a>&gt;<br><br>#if <a href="variadics.html">BOOST_PP_VARIADICS</a><br>#define SOME_MACRO(...) // replacement list<br>#else<br>#define SOME_MACRO(param1,param2) // replacement list<br>#endif<br></pre>
+<pre>#include &lt;<a href="../headers/config/variadics.html">boost/preprocessor/config/config.hpp</a>&gt;<br><br>#if <a href="variadics.html">BOOST_PP_VARIADICS</a><br>#define SOME_MACRO(...) // replacement list<br>#else<br>#define SOME_MACRO(param1,param2) // replacement list<br>#endif<br></pre>
 </div>
 <hr size="1">
-<div style="margin-left: 0px;"> <i></i><i><EFBFBD> Copyright Edward Diener 2011</i> </div>
+<div style="margin-left: 0px;"> <i></i><i><EFBFBD> Copyright Edward Diener 2011,2014</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>
--- a/doc/ref/while_d_macros.html
+++ b/doc/ref/while_d_macros.html
@ -29,10 +29,12 @@
    </ul>
    comparison<br>
    <ul>
+      <li><a href="equal_d.html"><span style="     color: gray;">BOOST_PP_EQUAL_D</span></a></li>
      <li><a href="greater_d.html"><span style="     color: gray;">BOOST_PP_GREATER_D</span></a></li>
      <li><a href="greater_equal_d.html"><span style="      color: gray;">BOOST_PP_GREATER_EQUAL_D</span></a></li>
      <li><a href="less_d.html"><span style="       color: gray;">BOOST_PP_LESS_D</span></a></li>
      <li><a href="less_equal_d.html"><span style="        color: gray;">BOOST_PP_LESS_EQUAL_D</span></a></li>
+      <li><a href="not_equal_d.html"><span style="     color: gray;">BOOST_PP_NOT_EQUAL_D</span></a></li>
    </ul>
    control<br>
    <ul>
@ -51,6 +53,7 @@
      <li><a href="list_fold_right_d.html"><span style="               color: gray;">BOOST_PP_LIST_FOLD_RIGHT_d</span></a></li>
      <li><a href="list_rest_n_d.html"><span style="                color: gray;">BOOST_PP_LIST_REST_N_D</span></a></li>
      <li><a href="list_reverse_d.html"><span style="                 color: gray;">BOOST_PP_LIST_REVERSE_D</span></a></li>
+      <li><a href="list_size_d.html"><span style="                 color: gray;">BOOST_PP_LIST_SIZE_D</span></a></li>
      <li><a href="list_to_array_d.html"><span style="                  color: gray;">BOOST_PP_LIST_TO_ARRAY_D</span></a></li>
      <li><a href="list_transform_d.html"><span style="                   color: gray;">BOOST_PP_LIST_TRANSFORM_D</span></a></li>
    </ul>
--- a/include/boost/preprocessor/config/config.hpp
+++ b/include/boost/preprocessor/config/config.hpp
@ -32,7 +32,7 @@
 #    elif defined(__MWERKS__) && __MWERKS__ >= 0x3200
 #        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_STRICT())
 #    elif defined(__EDG__) || defined(__EDG_VERSION__)
-#        if defined(_MSC_VER) && __EDG_VERSION__ >= 308
+#        if defined(_MSC_VER) && (defined(__INTELLISENSE__) || __EDG_VERSION__ >= 308)
 #            define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_MSVC())
 #        else
 #            define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_EDG() | BOOST_PP_CONFIG_STRICT())
@ -75,7 +75,7 @@
 #    if defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC && !defined __EDG__ || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI
 #        define BOOST_PP_VARIADICS 0
 #    /* VC++ (C/C++) */
-#    elif defined _MSC_VER && _MSC_VER >= 1400 && !defined __EDG__ && !defined __clang__
+#    elif defined _MSC_VER && _MSC_VER >= 1400 && (!defined __EDG__ || defined(__INTELLISENSE__)) && !defined __clang__
 #        define BOOST_PP_VARIADICS 1
 #        define BOOST_PP_VARIADICS_MSVC 1
 #    /* Wave (C/C++), GCC (C++) */
@ -90,7 +90,7 @@
 # elif !BOOST_PP_VARIADICS + 1 < 2
 #    undef BOOST_PP_VARIADICS
 #    define BOOST_PP_VARIADICS 1
-#    if defined _MSC_VER && _MSC_VER >= 1400 && !(defined __EDG__ || defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __clang__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI)
+#    if defined _MSC_VER && _MSC_VER >= 1400 && (defined(__INTELLISENSE__) || !(defined __EDG__ || defined __GCCXML__ || defined __CUDACC__ || defined __PATHSCALE__ || defined __clang__ || defined __DMC__ || defined __CODEGEARC__ || defined __BORLANDC__ || defined __MWERKS__ || defined __SUNPRO_CC || defined __HP_aCC || defined __MRC__ || defined __SC__ || defined __IBMCPP__ || defined __PGI))
 #        define BOOST_PP_VARIADICS_MSVC 1
 #    endif
 # else
--- a/include/boost/preprocessor/facilities/is_empty.hpp
+++ b/include/boost/preprocessor/facilities/is_empty.hpp
@ -21,7 +21,6 @@
 #
 # else
 #
-# include <boost/preprocessor/config/config.hpp>
 # if ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MSVC() && ~BOOST_PP_CONFIG_FLAGS() & BOOST_PP_CONFIG_MWCC()
 # include <boost/preprocessor/tuple/elem.hpp>
 # include <boost/preprocessor/facilities/identity.hpp>
--- a/include/boost/preprocessor/tuple/elem.hpp
+++ b/include/boost/preprocessor/tuple/elem.hpp
@ -27,14 +27,14 @@
 #    if BOOST_PP_VARIADICS_MSVC
 #        define BOOST_PP_TUPLE_ELEM(...) BOOST_PP_TUPLE_ELEM_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_ELEM_O_, __VA_ARGS__), (__VA_ARGS__))
 #        define BOOST_PP_TUPLE_ELEM_I(m, args) BOOST_PP_TUPLE_ELEM_II(m, args)
-#        define BOOST_PP_TUPLE_ELEM_II(m, args) BOOST_PP_CAT(BOOST_PP_EXPAND(m ## args),)
+#        define BOOST_PP_TUPLE_ELEM_II(m, args) BOOST_PP_CAT(m ## args,)
 /*
  Use BOOST_PP_REM_CAT if it is a single element tuple ( which might be empty )
  else use BOOST_PP_REM. This fixes a VC++ problem with an empty tuple and BOOST_PP_TUPLE_ELEM
  functionality. See tuple_elem_bug_test.cxx.
 */
 #    	 define BOOST_PP_TUPLE_ELEM_O_2(n, tuple) \
-			BOOST_PP_VARIADIC_ELEM(n, BOOST_PP_TUPLE_IS_SINGLE_RETURN(BOOST_PP_REM_CAT,BOOST_PP_REM,tuple) tuple) \
+			BOOST_PP_VARIADIC_ELEM(n, BOOST_PP_EXPAND(BOOST_PP_TUPLE_IS_SINGLE_RETURN(BOOST_PP_REM_CAT,BOOST_PP_REM,tuple) tuple)) \
 			/**/
 #    else
 #        define BOOST_PP_TUPLE_ELEM(...) BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_ELEM_O_, __VA_ARGS__)(__VA_ARGS__)
--- a/include/boost/preprocessor/tuple/rem.hpp
+++ b/include/boost/preprocessor/tuple/rem.hpp
@ -123,8 +123,8 @@
 #    if BOOST_PP_VARIADICS_MSVC
 #        define BOOST_PP_TUPLE_REM_CTOR(...) BOOST_PP_TUPLE_REM_CTOR_I(BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_REM_CTOR_O_, __VA_ARGS__), (__VA_ARGS__))
 #        define BOOST_PP_TUPLE_REM_CTOR_I(m, args) BOOST_PP_TUPLE_REM_CTOR_II(m, args)
-#        define BOOST_PP_TUPLE_REM_CTOR_II(m, args) BOOST_PP_CAT(BOOST_PP_EXPAND(m ## args),)
-#    	 define BOOST_PP_TUPLE_REM_CTOR_O_1(tuple) BOOST_PP_TUPLE_IS_SINGLE_RETURN(BOOST_PP_REM_CAT,BOOST_PP_REM,tuple) tuple
+#        define BOOST_PP_TUPLE_REM_CTOR_II(m, args) BOOST_PP_CAT(m ## args,)
+#    	 define BOOST_PP_TUPLE_REM_CTOR_O_1(tuple) BOOST_PP_EXPAND(BOOST_PP_TUPLE_IS_SINGLE_RETURN(BOOST_PP_REM_CAT,BOOST_PP_REM,tuple) tuple)
 #    else
 #        define BOOST_PP_TUPLE_REM_CTOR(...) BOOST_PP_OVERLOAD(BOOST_PP_TUPLE_REM_CTOR_O_, __VA_ARGS__)(__VA_ARGS__)
 #    	 define BOOST_PP_TUPLE_REM_CTOR_O_1(tuple) BOOST_PP_REM tuple
Author	SHA1	Message	Date
Edward Diener	9cb039ab8b	Merge branch 'develop'	2015-03-28 04:19:20 -04:00
Edward Diener	1b3fe1570b	Put BOOST_PP_EXPAND in correct place for VC++	2015-02-02 21:19:50 -05:00
Edward Diener	4f0adfb553	Reveert removal of BOOST_PP_EXPAND	2015-02-02 18:04:58 -05:00
Edward Diener	01848af60d	Merge branch 'vctuple' into develop	2015-01-30 23:16:08 -05:00
Edward Diener	dc54fee21c	Remove BOOST_PP_EXPAND usage since it is no needed	2015-01-30 23:11:07 -05:00
Edward Diener	77a9177c31	Remove extraneous include	2015-01-30 22:15:54 -05:00
Edward Diener	f1165249fb	Merge branch 'develop'	2015-01-15 15:20:38 -05:00
Edward Diener	fd135a078f	Added BOOST_PP_LIST_SIZE_D to list of re-entrant macros.	2014-12-09 13:21:49 -05:00
Edward Diener	eedd7378f1	Added EQUAL and NOT_EQUAL to re-entrancy list.	2014-12-07 16:04:57 -05:00
Edward Diener	e1ade3ea3b	Changed explanation of which value should be greater for maximum efficiency.	2014-12-05 00:16:11 -05:00
Edward Diener	3760758d4e	When the Intellisense compiler is being used wihin the Visual Studio IDE, both __EDG__ and __INTELLISENSE__ are defined along with the usual VC++ predefines. This change adjusts the Boost PP configuration to take into account that situation.	2014-11-09 14:20:03 -05:00
Edward Diener	0baf10bfc6	Updated docs to refer to config.hpp rather than variadics.hpp.	2014-11-07 16:35:36 -05:00