[Boost-commit] svn:boost r42957 - in trunk/boost/function_types: . detail detail/pp_cc_loop detail/pp_variate_loop

From: tschwinger_at_[hidden]
Date: 2008-01-24 19:26:17

Author: t_schwinger
Date: 2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
New Revision: 42957
URL: http://svn.boost.org/trac/boost/changeset/42957

Log:
simplifies preprocessing code

Text files modified: 
   trunk/boost/function_types/detail/pp_cc_loop/master.hpp            |     8 ++++----                                
   trunk/boost/function_types/detail/pp_cc_loop/preprocessed.hpp      |    18 +++++++++---------                      
   trunk/boost/function_types/detail/pp_loop.hpp                      |     4 ++--                                    
   trunk/boost/function_types/detail/pp_variate_loop/master.hpp       |     2 +-                                      
   trunk/boost/function_types/detail/pp_variate_loop/preprocessed.hpp |    40 ++++++++++++++++++++--------------------
   trunk/boost/function_types/property_tags.hpp                       |     2 +-                                      
   6 files changed, 37 insertions(+), 37 deletions(-)

Modified: trunk/boost/function_types/detail/pp_cc_loop/master.hpp
==============================================================================
--- trunk/boost/function_types/detail/pp_cc_loop/master.hpp	(original)
+++ trunk/boost/function_types/detail/pp_cc_loop/master.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -42,7 +42,7 @@
 #     define BOOST_FT_cc_name implicit_cc
 #     define BOOST_FT_cc BOOST_PP_EMPTY
 #     define BOOST_FT_cond callable_builtin
-#     include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+#     include BOOST_FT_cc_file
 #     undef BOOST_FT_cond
 #     undef BOOST_FT_cc_name
 #     undef BOOST_FT_cc
@@ -54,7 +54,7 @@
 BOOST_PP_EXPAND(#)   define BOOST_FT_cc BOOST_PP_EMPTY
 BOOST_PP_EXPAND(#)   define BOOST_FT_cond callable_builtin
 #define _()
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND _()( <BOOST_FT_cc_file> )
+BOOST_PP_EXPAND(#)   include BOOST_FT_cc_file
 #undef _
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cond
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cc_name
@@ -85,7 +85,7 @@
 
 #   if BOOST_FT_cond
 #     define BOOST_FT_config_valid 1
-#     include BOOST_PP_EXPAND(<BOOST_FT_cc_file>)
+#     include BOOST_FT_cc_file
 #   endif
 
 #   undef BOOST_FT_cond
@@ -121,7 +121,7 @@
 BOOST_PP_EXPAND(#) if BOOST_FT_cond
 BOOST_PP_EXPAND(#)   define BOOST_FT_config_valid 1
 #define _()
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND _()(<BOOST_FT_cc_file>)
+BOOST_PP_EXPAND(#)   include BOOST_FT_cc_file
 #undef _
 BOOST_PP_EXPAND(#) endif
 

Modified: trunk/boost/function_types/detail/pp_cc_loop/preprocessed.hpp
==============================================================================
--- trunk/boost/function_types/detail/pp_cc_loop/preprocessed.hpp	(original)
+++ trunk/boost/function_types/detail/pp_cc_loop/preprocessed.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -15,7 +15,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_IMPLICIT
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -27,7 +27,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_CDECL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -39,7 +39,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_STDCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -51,7 +51,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_PASCAL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -63,7 +63,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_FASTCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -75,7 +75,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_CLRCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -87,7 +87,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_THISCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -99,7 +99,7 @@
 # define BOOST_FT_cond BOOST_FT_CC_IMPLICIT_THISCALL
 # if BOOST_FT_cond
 # define BOOST_FT_config_valid 1
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # endif
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
@@ -110,7 +110,7 @@
 # define BOOST_FT_cc_name implicit_cc
 # define BOOST_FT_cc BOOST_PP_EMPTY
 # define BOOST_FT_cond 0x00000001
-# include BOOST_PP_EXPAND ( <BOOST_FT_cc_file> )
+# include BOOST_FT_cc_file
 # undef BOOST_FT_cond
 # undef BOOST_FT_cc_name
 # undef BOOST_FT_cc

Modified: trunk/boost/function_types/detail/pp_loop.hpp
==============================================================================
--- trunk/boost/function_types/detail/pp_loop.hpp	(original)
+++ trunk/boost/function_types/detail/pp_loop.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -28,9 +28,9 @@
 #if defined(BOOST_FT_al_path)
 
 #   define BOOST_FT_cc_file \
-        boost/function_types/detail/pp_variate_loop/preprocessed.hpp
+        <boost/function_types/detail/pp_variate_loop/preprocessed.hpp>
 #   define BOOST_FT_variate_file \
-        boost/function_types/detail/pp_arity_loop.hpp
+        <boost/function_types/detail/pp_arity_loop.hpp>
 
 #   ifndef BOOST_FT_type_function
 #   define BOOST_FT_type_function(cc,name) BOOST_FT_SYNTAX( \

Modified: trunk/boost/function_types/detail/pp_variate_loop/master.hpp
==============================================================================
--- trunk/boost/function_types/detail/pp_variate_loop/master.hpp	(original)
+++ trunk/boost/function_types/detail/pp_variate_loop/master.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -140,7 +140,7 @@
 #     endif
 #   endif
 BOOST_PP_EXPAND(#)   define BOOST_FT_flags BOOST_PP_SLOT(1)
-BOOST_PP_EXPAND(#)   include BOOST_PP_EXPAND BOOST_PP_EMPTY()(<BOOST_FT_variate_file>)
+BOOST_PP_EXPAND(#)   include BOOST_FT_variate_file
 
 BOOST_PP_EXPAND(#)   undef BOOST_FT_cv
 BOOST_PP_EXPAND(#)   undef BOOST_FT_ell

Modified: trunk/boost/function_types/detail/pp_variate_loop/preprocessed.hpp
==============================================================================
--- trunk/boost/function_types/detail/pp_variate_loop/preprocessed.hpp	(original)
+++ trunk/boost/function_types/detail/pp_variate_loop/preprocessed.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -15,7 +15,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 519
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -28,7 +28,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 263
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -42,7 +42,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1543
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -55,7 +55,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1287
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -68,7 +68,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2567
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -81,7 +81,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2311
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -94,7 +94,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3591
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -107,7 +107,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3335
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -123,7 +123,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 523
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -136,7 +136,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 267
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -151,7 +151,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 531
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -164,7 +164,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 275
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -181,7 +181,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 609
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -194,7 +194,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv 
 # define BOOST_FT_flags 353
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -207,7 +207,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1633
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -220,7 +220,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const
 # define BOOST_FT_flags 1377
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -233,7 +233,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2657
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -246,7 +246,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv volatile
 # define BOOST_FT_flags 2401
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -259,7 +259,7 @@
 # define BOOST_FT_nullary_param BOOST_FT_NULLARY_PARAM
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3681
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param
@@ -272,7 +272,7 @@
 # define BOOST_FT_nullary_param
 # define BOOST_FT_cv const volatile
 # define BOOST_FT_flags 3425
-# include BOOST_PP_EXPAND ( <BOOST_FT_variate_file> )
+# include BOOST_FT_variate_file
 # undef BOOST_FT_cv
 # undef BOOST_FT_ell
 # undef BOOST_FT_nullary_param

Modified: trunk/boost/function_types/property_tags.hpp
==============================================================================
--- trunk/boost/function_types/property_tags.hpp	(original)
+++ trunk/boost/function_types/property_tags.hpp	2008-01-24 19:26:16 EST (Thu, 24 Jan 2008)
@@ -141,7 +141,7 @@
 #include <boost/function_types/detail/pp_tags/preprocessed.hpp>
 
 namespace boost { namespace function_types {
-#define BOOST_FT_cc_file boost/function_types/detail/pp_tags/cc_tag.hpp
+#define BOOST_FT_cc_file <boost/function_types/detail/pp_tags/cc_tag.hpp>
 #include <boost/function_types/detail/pp_loop.hpp>
 } } // namespace boost::function_types