post-merge bug fixes

[SVN r24892]
2025-08-03 14:54:30 +02:00 · 2004-09-03 15:56:59 +00:00
parent fd0a7e59a0
commit fc5dc3211f
97 changed files with 253 additions and 102 deletions
--- a/include/boost/mpl/apply_wrap.hpp
+++ b/include/boost/mpl/apply_wrap.hpp
@@ -20,6 +20,7 @@

 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 #   include <boost/mpl/aux_/arity.hpp>
+#   include <boost/mpl/aux_/has_apply.hpp>
 #   include <boost/mpl/aux_/na.hpp>
 #   include <boost/mpl/aux_/msvc_never_true.hpp>
 #endif
@@ -40,6 +41,7 @@
 #   include <boost/mpl/aux_/preprocessor/add.hpp>
 #   include <boost/mpl/aux_/config/dtp.hpp>
 #   include <boost/mpl/aux_/config/eti.hpp>
+#   include <boost/mpl/aux_/config/ctps.hpp>
 #   include <boost/mpl/aux_/config/msvc.hpp>
 #   include <boost/mpl/aux_/config/workaround.hpp>

@@ -128,6 +130,9 @@ struct BOOST_PP_CAT(apply_wrap,i_)

 template<
      typename F BOOST_PP_COMMA_IF(i_) AUX778076_APPLY_WRAP_PARAMS(i_, typename T)
+#if i_ == 0
+    , typename has_apply_ = typename aux::has_apply<F>::type
+#endif
    >
 struct BOOST_PP_CAT(apply_wrap,i_)
 // metafunction forwarding confuses MSVC 7.0
@@ -142,6 +147,14 @@ struct BOOST_PP_CAT(apply_wrap,i_)
 #endif
 };

+#if i_ == 0 && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+template< typename F >
+struct BOOST_PP_CAT(apply_wrap,i_)<F,true_>
+    : F::apply
+{
+};
+#endif
+
 #   endif // workarounds

 #if defined(BOOST_MPL_CFG_MSVC_ETI_BUG)
--- a/include/boost/mpl/aux_/config/arrays.hpp
+++ b/include/boost/mpl/aux_/config/arrays.hpp
@@ -19,8 +19,9 @@

 #if    !defined(BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES) \
    && !defined(BOOST_MPL_PREPROCESSING_MODE) \
-    && BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
-    || BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+    && ( BOOST_WORKAROUND(__BORLANDC__, < 0x600) \
+        || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+        )

 #   define BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES

--- a/include/boost/mpl/aux_/config/has_apply.hpp
+++ b/include/boost/mpl/aux_/config/has_apply.hpp
@@ -0,0 +1,31 @@
+
+#ifndef BOOST_MPL_AUX_CONFIG_HAS_APPLY_HPP_INCLUDED
+#define BOOST_MPL_AUX_CONFIG_HAS_APPLY_HPP_INCLUDED
+
+// Copyright Aleksey Gurtovoy 2004
+//
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Source$
+// $Date$
+// $Revision$
+
+#include <boost/mpl/aux_/config/has_xxx.hpp>
+#include <boost/mpl/aux_/config/msvc.hpp>
+#include <boost/mpl/aux_/config/workaround.hpp>
+
+#if !defined(BOOST_MPL_CFG_NO_HAS_APPLY) \
+    && (   defined(BOOST_MPL_CFG_NO_HAS_XXX) \
+        || BOOST_WORKAROUND(__EDG_VERSION__, < 300) \
+        || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \
+        )
+
+#   define BOOST_MPL_CFG_NO_HAS_APPLY
+
+#endif
+
+#endif // BOOST_MPL_AUX_CONFIG_HAS_APPLY_HPP_INCLUDED
--- a/include/boost/mpl/aux_/config/has_xxx.hpp
+++ b/include/boost/mpl/aux_/config/has_xxx.hpp
@@ -16,7 +16,6 @@
 // $Revision$

 #include <boost/mpl/aux_/config/overload_resolution.hpp>
-#include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>

 // agurt, 11/jan/03: signals a stub-only 'has_xxx' implementation
--- a/include/boost/mpl/aux_/has_apply.hpp
+++ b/include/boost/mpl/aux_/has_apply.hpp
@@ -0,0 +1,32 @@
+
+#ifndef BOOST_MPL_AUX_HAS_APPLY_HPP_INCLUDED
+#define BOOST_MPL_AUX_HAS_APPLY_HPP_INCLUDED
+
+// Copyright Aleksey Gurtovoy 2004
+//
+// Distributed under the Boost Software License, Version 1.0. 
+// (See accompanying file LICENSE_1_0.txt or copy at 
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org/libs/mpl for documentation.
+
+// $Source$
+// $Date$
+// $Revision$
+
+#include <boost/mpl/has_xxx.hpp>
+#include <boost/mpl/aux_/config/has_apply.hpp>
+
+namespace boost { namespace mpl { namespace aux {
+#if !defined(BOOST_MPL_CFG_NO_HAS_APPLY)
+BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_apply, apply, false)
+#else
+template< typename T, typename fallback_ = false_ >
+struct has_apply
+    : fallback_
+{
+};
+#endif
+}}}
+
+#endif // BOOST_MPL_AUX_HAS_APPLY_HPP_INCLUDED
--- a/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/apply_wrap.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/bcc/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/apply_wrap.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/bcc551/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -20,8 +23,15 @@ struct apply_wrap0
 {
 };

+template< typename F >
+struct apply_wrap0< F,true_ >
+    : F::apply
+{
+};
+
 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -31,6 +41,7 @@ struct apply_wrap1

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -40,6 +51,7 @@ struct apply_wrap2

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -49,6 +61,7 @@ struct apply_wrap3

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -59,6 +72,7 @@ struct apply_wrap4
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/dmc/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/dmc/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -20,8 +23,15 @@ struct apply_wrap0
 {
 };

+template< typename F >
+struct apply_wrap0< F,true_ >
+    : F::apply
+{
+};
+
 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -31,6 +41,7 @@ struct apply_wrap1

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -40,6 +51,7 @@ struct apply_wrap2

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -49,6 +61,7 @@ struct apply_wrap3

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -59,6 +72,7 @@ struct apply_wrap4
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/gcc/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/gcc/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/apply_wrap.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc60/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -32,6 +35,7 @@ struct apply_wrap0<int>

 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -51,6 +55,7 @@ struct apply_wrap1< int,int >

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -70,6 +75,7 @@ struct apply_wrap2< int,int,int >

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -89,6 +95,7 @@ struct apply_wrap3< int,int,int,int >

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -109,6 +116,7 @@ struct apply_wrap4< int,int,int,int,int >
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/msvc70/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/apply_wrap.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/mwcw/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -22,6 +25,7 @@ struct apply_wrap0

 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -31,6 +35,7 @@ struct apply_wrap1

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -40,6 +45,7 @@ struct apply_wrap2

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -49,6 +55,7 @@ struct apply_wrap3

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -59,6 +66,7 @@ struct apply_wrap4
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ctps/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -20,8 +23,15 @@ struct apply_wrap0
 {
 };

+template< typename F >
+struct apply_wrap0< F,true_ >
+    : F::apply
+{
+};
+
 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -31,6 +41,7 @@ struct apply_wrap1

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -40,6 +51,7 @@ struct apply_wrap2

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -49,6 +61,7 @@ struct apply_wrap3

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -59,6 +72,7 @@ struct apply_wrap4
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/no_ttp/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/apply_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_fwd.hpp" header
+// Preprocessed version of "boost/mpl/apply_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/apply_wrap.hpp
@@ -6,13 +6,16 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/apply_wrap.hpp" header
+// Preprocessed version of "boost/mpl/apply_wrap.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {

 template<
      typename F
+
+    , typename has_apply_ = typename aux::has_apply<F>::type
+
    >
 struct apply_wrap0

@@ -20,8 +23,15 @@ struct apply_wrap0
 {
 };

+template< typename F >
+struct apply_wrap0< F,true_ >
+    : F::apply
+{
+};
+
 template<
      typename F, typename T1
+
    >
 struct apply_wrap1

@@ -31,6 +41,7 @@ struct apply_wrap1

 template<
      typename F, typename T1, typename T2
+
    >
 struct apply_wrap2

@@ -40,6 +51,7 @@ struct apply_wrap2

 template<
      typename F, typename T1, typename T2, typename T3
+
    >
 struct apply_wrap3

@@ -49,6 +61,7 @@ struct apply_wrap3

 template<
      typename F, typename T1, typename T2, typename T3, typename T4
+
    >
 struct apply_wrap4

@@ -59,6 +72,7 @@ struct apply_wrap4
 template<
      typename F, typename T1, typename T2, typename T3, typename T4
    , typename T5
+
    >
 struct apply_wrap5

--- a/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/bind_fwd.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/bind_fwd.hpp" header
+// Preprocessed version of "boost/mpl/bind_fwd.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/map.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/map.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/map.hpp" header
+// Preprocessed version of "boost/mpl/map.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/reverse_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/reverse_iter_fold_impl.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/aux_/Attic/reverse_iter_fold_impl.hpp" header
+// Preprocessed version of "boost/mpl/aux_/reverse_iter_fold_impl.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl { namespace aux {
--- a/include/boost/mpl/aux_/preprocessed/plain/set.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/set.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/set.hpp" header
+// Preprocessed version of "boost/mpl/set.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/times.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/times.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/times.hpp" header
+// Preprocessed version of "boost/mpl/times.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp
+++ b/include/boost/mpl/aux_/preprocessed/plain/unpack_args.hpp
@@ -6,7 +6,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 //

-// Preprocessed version of "boost/mpl/Attic/unpack_args.hpp" header
+// Preprocessed version of "boost/mpl/unpack_args.hpp" header
 // -- DO NOT modify by hand!

 namespace boost { namespace mpl {
--- a/include/boost/mpl/aux_/yes_no.hpp
+++ b/include/boost/mpl/aux_/yes_no.hpp
@@ -16,8 +16,9 @@

 #include <boost/mpl/aux_/adl_barrier.hpp>
 #include <boost/mpl/aux_/nttp_decl.hpp>
-#include <boost/mpl/aux_/config/workaround.hpp>
+#include <boost/mpl/aux_/config/arrays.hpp>
 #include <boost/mpl/aux_/config/msvc.hpp>
+#include <boost/mpl/aux_/config/workaround.hpp>

 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN

@@ -47,8 +48,7 @@ template< BOOST_MPL_AUX_NTTP_DECL(long, n) > struct weighted_tag
 #endif
 };

-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \
-    || BOOST_WORKAROUND(BOOST_MSVC, == 1300)
+#if defined(BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES)
 template<> struct weighted_tag<0>
 {
    typedef char (&type)[1];
--- a/include/boost/mpl/has_xxx.hpp
+++ b/include/boost/mpl/has_xxx.hpp
@@ -95,7 +95,8 @@ struct BOOST_PP_CAT(trait,_impl) : T \
    typedef boost::mpl::bool_<value> type; \
 }; \
 \
-template< typename T, bool fallback_ = default_ > struct trait \
+template< typename T, typename fallback_ = boost::mpl::bool_<default_> > \
+struct trait \
    : boost::mpl::if_c< \
          boost::mpl::aux::msvc_is_incomplete<T>::value \
        , boost::mpl::bool_<false> \
@@ -157,7 +158,8 @@ boost::mpl::aux::yes_tag BOOST_PP_CAT(trait,_helper_)( \
 \
 boost::mpl::aux::no_tag BOOST_PP_CAT(trait,_helper_)(...); \
 \
-template< typename T, bool fallback_ = default_ > struct trait \
+template< typename T, typename fallback_ = boost::mpl::bool_<default_> > \
+struct trait \
 { \
    typedef BOOST_PP_CAT(trait,_wrapper_)<T> t_; \
    BOOST_STATIC_CONSTANT(bool, value = \
@@ -171,7 +173,8 @@ template< typename T, bool fallback_ = default_ > struct trait \
 #   else // other SFINAE-capable compilers

 #   define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, default_) \
-template< typename T, bool fallback_ = default_ > struct trait \
+template< typename T, typename fallback_ = boost::mpl::bool_<default_> > \
+struct trait \
 { \
    struct gcc_3_2_wknd \
    { \
@@ -201,11 +204,11 @@ template< typename T, bool fallback_ = default_ > struct trait \
 // placeholder implementation

 #   define BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(trait, name, default_) \
-template< typename T, bool fallback_ = default_ > \
+template< typename T, typename fallback_ = boost::mpl::bool_<default_> > \
 struct trait \
 { \
-    BOOST_STATIC_CONSTANT(bool, value = fallback_); \
-    typedef boost::mpl::bool_<fallback_> type; \
+    BOOST_STATIC_CONSTANT(bool, value = fallback_::value); \
+    typedef fallback_ type; \
 }; \
 /**/