speedups

[SVN r15272]

include/boost/preprocessor/config/config.hpp

@@ -15,78 +15,32 @@
 #
 # /* BOOST_PP_CONFIG_FLAGS */
 #
-# define BOOST_PP_CONFIG_STRICT 0x0001
-# define BOOST_PP_CONFIG_IDEAL 0x0002
+# define BOOST_PP_CONFIG_STRICT() 0x0001
+# define BOOST_PP_CONFIG_IDEAL() 0x0002
 #
-# define BOOST_PP_CONFIG_MSVC 0x0004
-# define BOOST_PP_CONFIG_MWCW 0x0008
-# define BOOST_PP_CONFIG_BCC 0x0010
-# define BOOST_PP_CONFIG_EDG 0x0020
+# define BOOST_PP_CONFIG_MSVC() 0x0004
+# define BOOST_PP_CONFIG_MWCC() 0x0008
+# define BOOST_PP_CONFIG_BCC() 0x0010
+# define BOOST_PP_CONFIG_EDG() 0x0020
 #
 # ifndef BOOST_PP_CONFIG_FLAGS
-#    if defined(__EDG__)
-#        define BOOST_PP_CONFIG_FLAGS (BOOST_PP_CONFIG_EDG | BOOST_PP_CONFIG_STRICT)
-#    elif defined(_MSC_VER)
-#        define BOOST_PP_CONFIG_FLAGS (BOOST_PP_CONFIG_MSVC)
+#    if defined(__EDG__) || defined(__EDG_VERSION)
+#        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_EDG() | BOOST_PP_CONFIG_STRICT())
 #    elif defined(__MWERKS__)
-#        define BOOST_PP_CONFIG_FLAGS (BOOST_PP_CONFIG_MWCW)
+#        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_MWCC())
 #    elif defined(__BORLANDC__)
-#        define BOOST_PP_CONFIG_FLAGS (BOOST_PP_CONFIG_BCC)
+#        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_BCC())
+#    elif defined(_MSC_VER)
+#        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_MSVC())
 #    else
-#        define BOOST_PP_CONFIG_FLAGS (BOOST_PP_CONFIG_STRICT | BOOST_PP_CONFIG_IDEAL)
+#        define BOOST_PP_CONFIG_FLAGS() (BOOST_PP_CONFIG_STRICT())
 #    endif
 # endif
 #
-# /* BOOST_PP_CONFIG_VARIADIC */
-#
-# if __STDC_VERSION__ >= 199901L && !defined(__cplusplus)
-#    define BOOST_PP_CONFIG_VARIADIC_DEF 1
-# else
-#    define BOOST_PP_CONFIG_VARIADIC_DEF 0
-# endif
-#
-# ifndef BOOST_PP_CONFIG_VARIADIC
-#    define BOOST_PP_CONFIG_VARIADIC BOOST_PP_CONFIG_VARIADIC_DEF
-# endif
-#
-# /* BOOST_PP_CONFIG_UNROLLED */
-#
-# define BOOST_PP_CONFIG_UNROLLED_DEF 0
-#
-# ifndef BOOST_PP_CONFIG_UNROLLED
-#    define BOOST_PP_CONFIG_UNROLLED BOOST_PP_CONFIG_UNROLLED_DEF
-# endif
-#
-# /* BOOST_PP_CONFIG_WARNINGS */
-#
-# ifndef NDEBUG
-#    define BOOST_PP_CONFIG_WARNINGS_DEF 1
-# else
-#    define BOOST_PP_CONFIG_WARNINGS_DEF 0
-# endif
-#
-# ifndef BOOST_PP_CONFIG_WARNINGS
-#    define BOOST_PP_CONFIG_WARNINGS BOOST_PP_CONFIG_WARNINGS_DEF
-# endif
-#
-# /* BOOST_PP_CONFIG_ERRORS */
-#
-# ifndef NDEBUG
-#    define BOOST_PP_CONFIG_ERRORS_DEF 1
-# else
-#    define BOOST_PP_CONFIG_ERRORS_DEF 0
-# endif
-#
-# ifndef BOOST_PP_CONFIG_ERRORS
-#    define BOOST_PP_CONFIG_ERRORS BOOST_PP_CONFIG_ERRORS_DEF
-# endif
-#
 # /* BOOST_PP_CONFIG_EXTENDED_LINE_INFO */
 #
-# define BOOST_PP_CONFIG_EXTENDED_LINE_INFO_DEF 0
-#
 # ifndef BOOST_PP_CONFIG_EXTENDED_LINE_INFO
-#    define BOOST_PP_CONFIG_EXTENDED_LINE_INFO BOOST_PP_CONFIG_EXTENDED_LINE_INFO_DEF
+#    define BOOST_PP_CONFIG_EXTENDED_LINE_INFO 0
 # endif
 #
 # endif

include/boost/preprocessor/config/limits.hpp

@@ -15,62 +15,15 @@
 # ifndef BOOST_PREPROCESSOR_CONFIG_LIMITS_HPP
 # define BOOST_PREPROCESSOR_CONFIG_LIMITS_HPP
 #
-# include <boost/preprocessor/config/config.hpp>
-#
-# /* BOOST_PP_LIMIT_MAG */
-#
 # define BOOST_PP_LIMIT_MAG 256
-#
-# /* BOOST_PP_LIMIT_TUPLE */
-#
 # define BOOST_PP_LIMIT_TUPLE 25
-#
-# /* BOOST_PP_LIMIT_DIM */
-#
 # define BOOST_PP_LIMIT_DIM 3
-#
-# /* BOOST_PP_LIMIT_REPEAT */
-#
-# if BOOST_PP_CONFIG_UNROLLED
-#    define BOOST_PP_LIMIT_REPEAT 128
-# else
-#    define BOOST_PP_LIMIT_REPEAT 256
-# endif
-#
-# /* BOOST_PP_LIMIT_WHILE */
-#
+# define BOOST_PP_LIMIT_REPEAT 256
 # define BOOST_PP_LIMIT_WHILE 256
-#
-# /* BOOST_PP_LIMIT_FOR */
-#
 # define BOOST_PP_LIMIT_FOR 256
-#
-# /* BOOST_PP_LIMIT_ITERATION */
-#
 # define BOOST_PP_LIMIT_ITERATION 256
-#
-# /* BOOST_PP_LIMIT_ITERATION_DIM */
-#
-# define BOOST_PP_LIMIT_ITERATION_DIM 5
-#
-# /* BOOST_PP_LIMIT_SLOT_SIG */
-#
+# define BOOST_PP_LIMIT_ITERATION_DIM 3
 # define BOOST_PP_LIMIT_SLOT_SIG 10
-#
-# /* BOOST_PP_LIMIT_SLOT_COUNT */
-#
 # define BOOST_PP_LIMIT_SLOT_COUNT 5
 #
-# /* BOOST_PP_INFINITY */
-#
-# define BOOST_PP_INFINITY (-1)
-#
-# /* BOOST_PP_LIMIT_BOOL */
-#
-# if ~BOOST_PP_CONFIG_FLAGS & BOOST_PP_CONFIG_EDG
-#    define BOOST_PP_LIMIT_BOOL BOOST_PP_INFINITY
-# else
-#    define BOOST_PP_LIMIT_BOOL BOOST_PP_LIMIT_MAG
-# endif
-#
 # endif