merge new MPL version from 'mplbook' branch

[SVN r24874]

preprocessed/include/bcc/user.hpp

@@ -1,11 +1,13 @@
 #define BOOST_NO_CONFIG
 
-#include "boost/preprocessor/config/config.hpp"
+#include <boost/preprocessor/config/config.hpp>
 
 #define BOOST_NO_TEMPLATE_TEMPLATES
-#define BOOST_MPL_NO_BIND_TEMPLATE
-#define BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION
-#define BOOST_NO_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
-#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
-#define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
-#define BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC
+#define BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION
+#define BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING
+#define BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS
+#define BOOST_MPL_CFG_NO_NESTED_FORWARDING

preprocessed/include/bcc551/user.hpp

@@ -1,10 +1,12 @@
 #define BOOST_NO_CONFIG
 
-#include "boost/preprocessor/config/config.hpp"
+#include <boost/preprocessor/config/config.hpp>
 
 #define BOOST_NO_TEMPLATE_TEMPLATES
-#define BOOST_MPL_NO_BIND_TEMPLATE
-#define BOOST_NO_NON_TYPE_TEMPLATE_PARTIAL_SPECIALIZATION
-#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
-#define BOOST_MPL_BROKEN_OVERLOAD_RESOLUTION
-#define BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC
+#define BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION
+#define BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING
+#define BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS
+#define BOOST_MPL_CFG_NO_NESTED_FORWARDING

preprocessed/include/dmc/user.hpp

@@ -0,0 +1,2 @@
+#define BOOST_NO_CONFIG
+#define BOOST_MPL_CFG_DMC_AMBIGUOUS_CTPS

preprocessed/include/gcc/user.hpp

@@ -1,3 +1,2 @@
 #define BOOST_NO_CONFIG
-#define BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING
-
+#define BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING

preprocessed/include/msvc60/user.hpp

@@ -2,8 +2,11 @@
 #define BOOST_MSVC 1200
 #define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#define BOOST_NO_TEMPLATE_TEMPLATE_PARAMETERS
+#define BOOST_NO_TEMPLATE_TEMPLATES
 #define BOOST_NO_CV_VOID_SPECIALIZATIONS
 #define BOOST_NO_INTRINSIC_WCHAR_T
 #define BOOST_NO_STD_ALLOCATOR
-#define BOOST_MPL_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_APPLY_TEMPLATE
+#define BOOST_MPL_CFG_MSVC_60_ETI_BUG
+#define BOOST_MPL_CFG_MSVC_ETI_BUG

preprocessed/include/msvc70/user.hpp

@@ -2,4 +2,6 @@
 #define BOOST_MSVC 1300
 #define BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #define BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#define BOOST_MPL_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_BIND_TEMPLATE
+#define BOOST_MPL_CFG_NO_APPLY_TEMPLATE
+#define BOOST_MPL_CFG_MSVC_ETI_BUG

preprocessed/include/mwcw/user.hpp

@@ -1,2 +1,2 @@
 #define BOOST_NO_CONFIG
-#define BOOST_BROKEN_DEFAULT_TEMPLATE_PARAMETERS_IN_NESTED_TEMPLATES
+#define BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES

preprocessed/include/plain/user.hpp

@@ -1 +1,2 @@
 #define BOOST_NO_CONFIG
+#define BOOST_MPL_AUX_LAMBDA_SUPPORT(unused1, unused2, unused3)

preprocessed/include/typeof_based/user.hpp

@@ -1,2 +1,2 @@
 #define BOOST_NO_CONFIG
-#define BOOST_MPL_TYPEOF_BASED_VECTOR_IMPL
+#define BOOST_MPL_CFG_TYPEOF_BASED_SEQUENCES