diff options
| author | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-08 16:19:35 +0300 |
|---|---|---|
| committer | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-08 16:19:35 +0300 |
| commit | 3aaac9ab67e4e37f3e9b520bee36f4b67643e29c (patch) | |
| tree | b1db47bdcc7036cfd337d284559a8206a5757842 | |
| parent | 8e492d11441dfbaf153eb935c4e1de7ad7e2ea37 (diff) | |
| download | ydb-3aaac9ab67e4e37f3e9b520bee36f4b67643e29c.tar.gz | |
Update contrib/restricted/boost/mpl to 1.79.0
35 files changed, 158 insertions, 57 deletions
diff --git a/contrib/restricted/boost/mpl/LICENSE b/contrib/restricted/boost/mpl/LICENSE new file mode 100644 index 00000000000..36b7cd93cdf --- /dev/null +++ b/contrib/restricted/boost/mpl/LICENSE @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/contrib/restricted/boost/mpl/README.md b/contrib/restricted/boost/mpl/README.md new file mode 100644 index 00000000000..b8806d4c3d3 --- /dev/null +++ b/contrib/restricted/boost/mpl/README.md @@ -0,0 +1,34 @@ +MPL, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), provides a general-purpose, high-level C++ template metaprogramming framework of compile-time algorithms, sequences and metafunctions. + +### License + +Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). + +### Properties + +* C++03 +* Header Only + +### Build Status + +Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | +:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | +[`master`](https://github.com/boostorg/mpl/tree/master) | [](https://travis-ci.org/boostorg/mpl) | [](https://ci.appveyor.com/project/jeking3/mpl-nrhfm/branch/master) | [](https://scan.coverity.com/projects/boostorg-mpl) | [](https://codecov.io/gh/boostorg/mpl/branch/master)| [](https://pdimov.github.io/boostdep-report/master/mpl.html) | [](http://www.boost.org/doc/libs/master/doc/html/mpl.html) | [](http://www.boost.org/development/tests/master/developer/mpl.html) +[`develop`](https://github.com/boostorg/mpl/tree/develop) | [](https://travis-ci.org/boostorg/mpl) | [](https://ci.appveyor.com/project/jeking3/mpl-nrhfm/branch/develop) | [](https://scan.coverity.com/projects/boostorg-mpl) | [](https://codecov.io/gh/boostorg/mpl/branch/develop) | [](https://pdimov.github.io/boostdep-report/develop/mpl.html) | [](http://www.boost.org/doc/libs/develop/doc/html/mpl.html) | [](http://www.boost.org/development/tests/develop/developer/mpl.html) + +### Directories + +| Name | Purpose | +| ----------- | ------------------------------ | +| `doc` | documentation | +| `example` | examples | +| `include` | headers | +| `test` | unit tests | + +### More information + +* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-mpl) +* [Report bugs](https://github.com/boostorg/mpl/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well. +* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[mpl]` tag at the beginning of the subject line. + diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/assert.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/assert.hpp index 1af1b0587e1..a0a5e3610d3 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/assert.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/assert.hpp @@ -39,7 +39,7 @@ #include <boost/mpl/if.hpp> #endif -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || (BOOST_MPL_CFG_GCC != 0) \ || BOOST_WORKAROUND(__IBMCPP__, <= 600) # define BOOST_MPL_CFG_ASSERT_USE_RELATION_NAMES @@ -47,7 +47,7 @@ #if BOOST_WORKAROUND(__MWERKS__, < 0x3202) \ || BOOST_WORKAROUND(__EDG_VERSION__, <= 238) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) # define BOOST_MPL_CFG_ASSERT_BROKEN_POINTER_TO_POINTER_TO_MEMBER #endif @@ -55,7 +55,7 @@ // agurt, 10/nov/06: use enums for Borland (which cannot cope with static constants) // and GCC (which issues "unused variable" warnings when static constants are used // at a function scope) -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || (BOOST_MPL_CFG_GCC != 0) || (BOOST_MPL_CFG_GPU != 0) || defined(__PGI) # define BOOST_MPL_AUX_ASSERT_CONSTANT(T, expr) enum { expr } #else @@ -184,16 +184,27 @@ template< typename P > struct assert_arg_pred_not typedef typename assert_arg_pred_impl<p>::type type; }; +#if defined(BOOST_GCC) && BOOST_GCC >= 80000 +#define BOOST_MPL_IGNORE_PARENTHESES_WARNING +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wparentheses" +#endif + template< typename Pred > -failed ************ (Pred::************ +failed ************ (Pred::************ assert_arg( void (*)(Pred), typename assert_arg_pred<Pred>::type ) ); template< typename Pred > -failed ************ (boost::mpl::not_<Pred>::************ +failed ************ (boost::mpl::not_<Pred>::************ assert_not_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type ) ); +#ifdef BOOST_MPL_IGNORE_PARENTHESES_WARNING +#undef BOOST_MPL_IGNORE_PARENTHESES_WARNING +#pragma GCC diagnostic pop +#endif + template< typename Pred > AUX778076_ASSERT_ARG(assert<false>) assert_arg( void (*)(Pred), typename assert_arg_pred_not<Pred>::type ); @@ -432,8 +443,17 @@ BOOST_MPL_AUX_ASSERT_CONSTANT( \ /**/ #endif -#define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \ +#if 0 +// Work around BOOST_MPL_ASSERT_MSG_IMPL generating multiple definition linker errors on VC++8. +// #if defined(BOOST_MSVC) && BOOST_MSVC < 1500 +# include <boost/static_assert.hpp> +# define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \ +BOOST_STATIC_ASSERT_MSG( c, #msg ) \ +/**/ +#else +# define BOOST_MPL_ASSERT_MSG( c, msg, types_ ) \ BOOST_MPL_ASSERT_MSG_IMPL( BOOST_MPL_AUX_PP_COUNTER(), c, msg, types_ ) \ /**/ +#endif #endif // BOOST_MPL_ASSERT_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/common_name_wknd.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/common_name_wknd.hpp index 00758b243ed..d1310336d7c 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/common_name_wknd.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/common_name_wknd.hpp @@ -16,7 +16,7 @@ #include <boost/mpl/aux_/config/workaround.hpp> -#if BOOST_WORKAROUND(__BORLANDC__, < 0x561) +#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x561) // agurt, 12/nov/02: to suppress the bogus "Cannot have both a template class // and function named 'xxx'" diagnostic # define BOOST_MPL_AUX_COMMON_NAME_WKND(name) \ @@ -29,6 +29,6 @@ template< typename > void name(); \ # define BOOST_MPL_AUX_COMMON_NAME_WKND(name) /**/ -#endif // __BORLANDC__ +#endif // BOOST_BORLANDC #endif // BOOST_MPL_AUX_COMMON_NAME_WKND_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/adl.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/adl.hpp index e9bdf1156b0..93d944c1c90 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/adl.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/adl.hpp @@ -27,7 +27,7 @@ #if !defined(BOOST_MPL_CFG_NO_ADL_BARRIER_NAMESPACE) \ && ( BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400)) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) \ || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3202)) \ || BOOST_WORKAROUND(BOOST_INTEL_CXX_VERSION, BOOST_TESTED_AT(810)) \ diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/arrays.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/arrays.hpp index a9ea68ad678..3a81b3d8161 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/arrays.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/arrays.hpp @@ -19,7 +19,7 @@ #if !defined(BOOST_MPL_CFG_NO_DEPENDENT_ARRAY_TYPES) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && ( BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + && ( BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \ ) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bcc.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bcc.hpp index fe4941a5983..74d4a6eee5b 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bcc.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bcc.hpp @@ -18,8 +18,8 @@ #if !defined(BOOST_MPL_CFG_BCC590_WORKAROUNDS) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && BOOST_WORKAROUND(__BORLANDC__, >= 0x590) \ - && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) + && BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x590) \ + && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_BCC590_WORKAROUNDS diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bind.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bind.hpp index 10bcb94b8b4..9f0ed2b76db 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bind.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/bind.hpp @@ -21,7 +21,7 @@ #if !defined(BOOST_MPL_CFG_NO_BIND_TEMPLATE) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ && ( BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ ) # define BOOST_MPL_CFG_NO_BIND_TEMPLATE diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/compiler.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/compiler.hpp index 7d3e3b6622f..3c6322b93f0 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/compiler.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/compiler.hpp @@ -32,10 +32,10 @@ # elif BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0304)) # define BOOST_MPL_CFG_COMPILER_DIR gcc -# elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +# elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) # define BOOST_MPL_CFG_COMPILER_DIR bcc551 -# elif BOOST_WORKAROUND(__BORLANDC__, >= 0x590) +# elif BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x590) # define BOOST_MPL_CFG_COMPILER_DIR bcc # else # define BOOST_MPL_CFG_COMPILER_DIR bcc_pre590 diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ctps.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ctps.hpp index af78f47ffda..7769d406b06 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ctps.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ctps.hpp @@ -19,7 +19,7 @@ #if !defined(BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && BOOST_WORKAROUND(__BORLANDC__, < 0x582) + && BOOST_WORKAROUND(BOOST_BORLANDC, < 0x582) # define BOOST_MPL_CFG_NO_NONTYPE_TEMPLATE_PARTIAL_SPEC diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/dtp.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/dtp.hpp index 4379b6b2fcf..e4d548b6087 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/dtp.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/dtp.hpp @@ -24,8 +24,8 @@ #if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && BOOST_WORKAROUND(__BORLANDC__, >= 0x560) \ - && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) + && BOOST_WORKAROUND(BOOST_BORLANDC, >= 0x560) \ + && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES @@ -35,7 +35,7 @@ #if !defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ && ( BOOST_WORKAROUND(__MWERKS__, <= 0x3001) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES) \ ) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/forwarding.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/forwarding.hpp index b4296ad9612..0880f4ce564 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/forwarding.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/forwarding.hpp @@ -18,7 +18,7 @@ #if !defined(BOOST_MPL_CFG_NO_NESTED_FORWARDING) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) + && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_NO_NESTED_FORWARDING diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/integral.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/integral.hpp index 144542d9c34..47ed120eb9a 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/integral.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/integral.hpp @@ -19,7 +19,7 @@ #if !defined(BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) + && BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_BCC_INTEGRAL_CONSTANTS diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/operators.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/operators.hpp index 3fb9db30572..27c7fd3a188 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/operators.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/operators.hpp @@ -20,7 +20,7 @@ #if !defined(BOOST_MPL_CFG_USE_OPERATORS_OVERLOADING) \ && ( BOOST_WORKAROUND(BOOST_MSVC, <= 1300) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ || BOOST_WORKAROUND(__EDG_VERSION__, <= 245) \ || BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, <= 0x0295) \ || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600)) \ diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/overload_resolution.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/overload_resolution.hpp index 61e4486e9bc..04254bd7fbb 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/overload_resolution.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/overload_resolution.hpp @@ -18,7 +18,7 @@ #if !defined(BOOST_MPL_CFG_BROKEN_OVERLOAD_RESOLUTION) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ - && ( BOOST_WORKAROUND(__BORLANDC__, < 0x590) \ + && ( BOOST_WORKAROUND(BOOST_BORLANDC, < 0x590) \ || BOOST_WORKAROUND(__MWERKS__, < 0x3001) \ ) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/preprocessor.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/preprocessor.hpp index 82ebc68fe0c..be5f889ee3c 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/preprocessor.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/preprocessor.hpp @@ -18,7 +18,7 @@ #if !defined(BOOST_MPL_CFG_BROKEN_PP_MACRO_EXPANSION) \ && ( BOOST_WORKAROUND(__MWERKS__, <= 0x3003) \ - || BOOST_WORKAROUND(__BORLANDC__, < 0x582) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, < 0x582) \ || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \ ) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ttp.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ttp.hpp index 3aff3f84df0..95cbf86eda5 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ttp.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/config/ttp.hpp @@ -20,7 +20,7 @@ #if !defined(BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS) \ && ( defined(BOOST_NO_TEMPLATE_TEMPLATES) \ - || BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT( 0x590) ) \ + || BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT( 0x590) ) \ ) # define BOOST_MPL_CFG_NO_TEMPLATE_TEMPLATE_PARAMETERS @@ -31,7 +31,7 @@ #if !defined(BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING) \ && !defined(BOOST_MPL_PREPROCESSING_MODE) \ && ( BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0302)) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) \ ) # define BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/count_impl.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/count_impl.hpp index 2f1200c6c84..743e5da368a 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/count_impl.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/count_impl.hpp @@ -26,7 +26,7 @@ namespace boost { namespace mpl { template< typename Tag > struct count_impl { template< typename Sequence, typename T > struct apply -#if BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x561)) +#if BOOST_WORKAROUND(BOOST_BORLANDC,BOOST_TESTED_AT(0x561)) { typedef typename count_if< Sequence,same_as<T> >::type type; BOOST_STATIC_CONSTANT(int, value = BOOST_MPL_AUX_VALUE_WKND(type)::value); diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/fold_impl_body.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/fold_impl_body.hpp index 02dd645f723..c5e16601472 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/fold_impl_body.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/fold_impl_body.hpp @@ -60,7 +60,7 @@ struct AUX778076_FOLD_IMPL_NAME; #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) -# if !BOOST_WORKAROUND(__BORLANDC__, < 0x600) +# if !BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) # define BOOST_PP_ITERATION_PARAMS_1 \ (3,(0, BOOST_MPL_LIMIT_UNROLLING, <boost/mpl/aux_/fold_impl_body.hpp>)) @@ -125,7 +125,7 @@ struct AUX778076_FOLD_IMPL_NAME<-1,Last,Last,State,ForwardOp> typedef Last iterator; }; -# else // BOOST_WORKAROUND(__BORLANDC__, < 0x600) +# else // BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) // Borland have some serious problems with the unrolled version, so // we always use a basic implementation @@ -164,7 +164,7 @@ struct AUX778076_FOLD_IMPL_NAME<N,Last,Last,State,ForwardOp > typedef state type; }; -# endif // BOOST_WORKAROUND(__BORLANDC__, < 0x600) +# endif // BOOST_WORKAROUND(BOOST_BORLANDC, < 0x600) #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/has_rebind.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/has_rebind.hpp index eb4eda613c6..a35afea2dfd 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/has_rebind.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/has_rebind.hpp @@ -25,7 +25,7 @@ # include <boost/mpl/if.hpp> # include <boost/mpl/bool.hpp> # include <boost/mpl/aux_/msvc_is_class.hpp> -#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +#elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # include <boost/mpl/if.hpp> # include <boost/mpl/bool.hpp> # include <boost/mpl/aux_/yes_no.hpp> @@ -62,7 +62,7 @@ struct has_rebind template< typename T > struct has_rebind_tag {}; no_tag operator|(has_rebind_tag<int>, void const volatile*); -# if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +# if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) template< typename T > struct has_rebind { @@ -71,7 +71,7 @@ struct has_rebind sizeof(has_rebind_tag<int>() | get()) == sizeof(yes_tag) ); }; -# else // __BORLANDC__ +# else // BOOST_BORLANDC template< typename T > struct has_rebind_impl { @@ -90,7 +90,7 @@ struct has_rebind >::type { }; -# endif // __BORLANDC__ +# endif // BOOST_BORLANDC #endif diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/integral_wrapper.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/integral_wrapper.hpp index 6bc05f7e96e..8748fbb93a1 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/integral_wrapper.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/integral_wrapper.hpp @@ -63,7 +63,7 @@ struct AUX_WRAPPER_NAME public: typedef AUX_WRAPPER_INST(next_value) next; typedef AUX_WRAPPER_INST(prior_value) prior; -#elif BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ +#elif BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \ || BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(502)) \ || (BOOST_WORKAROUND(__HP_aCC, <= 53800) && (BOOST_WORKAROUND(__hpxstd98, != 1))) typedef AUX_WRAPPER_INST( BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)) ) next; diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/lambda_support.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/lambda_support.hpp index 5b2af585835..acc30b5c635 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/lambda_support.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/lambda_support.hpp @@ -110,7 +110,7 @@ template< typename T > struct has_rebind_tag; typedef BOOST_PP_CAT(name,_rebind) rebind; \ /**/ -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) \ template< BOOST_MPL_PP_PARAMS(i,typename T) > \ ::boost::mpl::aux::yes_tag operator|( \ @@ -134,7 +134,7 @@ template< BOOST_MPL_PP_PARAMS(i,typename T) > \ # define BOOST_MPL_AUX_LAMBDA_SUPPORT_HAS_REBIND(i, name, params) /**/ #endif -# if !defined(__BORLANDC__) +# if !defined(BOOST_BORLANDC) # define BOOST_MPL_AUX_LAMBDA_SUPPORT(i, name, params) \ BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(i, name, params) \ }; \ @@ -160,7 +160,7 @@ class BOOST_PP_CAT(name,_rebind) \ typedef typename name< BOOST_MPL_PP_PARAMS(i,U) >::type type; \ }; \ /**/ -# endif // __BORLANDC__ +# endif // BOOST_BORLANDC #endif // __EDG_VERSION__ diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/nested_type_wknd.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/nested_type_wknd.hpp index 4207abdbc54..cc8de7c25cd 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/nested_type_wknd.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/nested_type_wknd.hpp @@ -18,7 +18,7 @@ #include <boost/mpl/aux_/config/workaround.hpp> #if BOOST_WORKAROUND(BOOST_MPL_CFG_GCC, BOOST_TESTED_AT(0x0302)) \ - || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ + || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \ || BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x530)) \ || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x840)) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/enum.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/enum.hpp index 64c5e6a8f6b..92c503194b5 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/enum.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/enum.hpp @@ -29,6 +29,10 @@ BOOST_PP_CAT(BOOST_MPL_PP_ENUM_,n)(param) \ /**/ +# define BOOST_MPL_PP_ENUM_Z(z_ignored, n, param) \ + BOOST_PP_CAT(BOOST_MPL_PP_ENUM_,n)(param) \ + /**/ + # define BOOST_MPL_PP_ENUM_0(p) # define BOOST_MPL_PP_ENUM_1(p) p # define BOOST_MPL_PP_ENUM_2(p) p,p @@ -57,6 +61,14 @@ ) \ /**/ +# define BOOST_MPL_PP_ENUM_Z(z, n, param) \ + BOOST_PP_REPEAT_ ## z( \ + n \ + , BOOST_MPL_PP_AUX_ENUM_FUNC \ + , param \ + ) \ + /**/ + #endif #endif // BOOST_MPL_AUX_PREPROCESSOR_ENUM_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/params.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/params.hpp index acad321903f..c3ee6c1d039 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/params.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/preprocessor/params.hpp @@ -29,6 +29,10 @@ BOOST_PP_CAT(BOOST_MPL_PP_PARAMS_,n)(p) \ /**/ +# define BOOST_MPL_PP_PARAMS_Z(z_ignored,n,p) \ + BOOST_PP_CAT(BOOST_MPL_PP_PARAMS_,n)(p) \ + /**/ + # define BOOST_MPL_PP_PARAMS_0(p) # define BOOST_MPL_PP_PARAMS_1(p) p##1 # define BOOST_MPL_PP_PARAMS_2(p) p##1,p##2 @@ -60,6 +64,14 @@ ) \ /**/ +# define BOOST_MPL_PP_PARAMS_Z(z, n, param) \ + BOOST_PP_REPEAT_ ## z( \ + n \ + , BOOST_MPL_PP_AUX_PARAM_FUNC \ + , param \ + ) \ + /**/ + #endif #endif // BOOST_MPL_AUX_PREPROCESSOR_PARAMS_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/size_impl.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/size_impl.hpp index 50f5ee91895..21fbe632b57 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/size_impl.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/size_impl.hpp @@ -29,7 +29,7 @@ template< typename Tag > struct size_impl { template< typename Sequence > struct apply -#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) +#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) : distance< typename begin<Sequence>::type , typename end<Sequence>::type diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/static_cast.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/static_cast.hpp index f72d1c7c9b3..58192dd91ea 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/aux_/static_cast.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/aux_/static_cast.hpp @@ -16,7 +16,7 @@ #include <boost/mpl/aux_/config/workaround.hpp> -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x561)) \ +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x561)) \ || BOOST_WORKAROUND(__GNUC__, < 3) \ || BOOST_WORKAROUND(__MWERKS__, <= 0x3001) # define BOOST_MPL_AUX_STATIC_CAST(T, expr) (T)(expr) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/has_xxx.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/has_xxx.hpp index 82e67ddca4c..a59c35d0af4 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/has_xxx.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/has_xxx.hpp @@ -33,7 +33,7 @@ #include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_trailing_params.hpp> -#if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) ) +#if BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) ) # include <boost/type_traits/is_class.hpp> #endif @@ -196,7 +196,7 @@ struct trait \ }; \ /**/ -# elif BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x590) ) +# elif BOOST_WORKAROUND( BOOST_BORLANDC, BOOST_TESTED_AT(0x590) ) # define BOOST_MPL_HAS_XXX_TRAIT_NAMED_BCB_DEF(trait, trait_tester, name, default_) \ template< typename T, bool IS_CLASS > \ @@ -334,7 +334,7 @@ struct trait \ // correct name but different number of arguments. # define BOOST_MPL_HAS_MEMBER_MULTI_SUBSTITUTE(z, n, args) \ template< \ - template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename V) > class V \ + template< BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), typename V) > class V \ > \ struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME(args, n) { \ }; \ @@ -503,7 +503,7 @@ struct trait \ z, n, args \ ) \ template< \ - template< BOOST_PP_ENUM_PARAMS(BOOST_PP_INC(n), typename U) > class U \ + template< BOOST_PP_ENUM_PARAMS_Z(z, BOOST_PP_INC(n), typename U) > class U \ > \ struct BOOST_MPL_HAS_MEMBER_INTROSPECTION_SUBSTITUTE_NAME_WITH_TEMPLATE_SFINAE( \ args, n \ diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/if.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/if.hpp index b6bdf6c6922..3b0ae19228e 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/if.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/if.hpp @@ -46,7 +46,7 @@ struct if_c<false,T1,T2> }; // agurt, 05/sep/04: nondescriptive parameter names for the sake of DigitalMars -// (and possibly MWCW < 8.0); see http://article.gmane.org/gmane.comp.lib.boost.devel/108959 +// (and possibly MWCW < 8.0); see https://lists.boost.org/Archives/boost/2004/09/71383.php template< typename BOOST_MPL_AUX_NA_PARAM(T1) , typename BOOST_MPL_AUX_NA_PARAM(T2) diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/integral_c.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/integral_c.hpp index 7a692dcab64..987a2853a89 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/integral_c.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/integral_c.hpp @@ -33,7 +33,7 @@ #if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \ - && !BOOST_WORKAROUND(__BORLANDC__, <= 0x551) + && !BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551) BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN // 'bool' constant doesn't have 'next'/'prior' members template< bool C > diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/lower_bound.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/lower_bound.hpp index 75eae9add14..ea4a4aed09b 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/lower_bound.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/lower_bound.hpp @@ -19,7 +19,7 @@ #include <boost/mpl/aux_/na_spec.hpp> #include <boost/mpl/aux_/config/workaround.hpp> -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_STRIPPED_DOWN_LOWER_BOUND_IMPL #endif diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/numeric_cast.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/numeric_cast.hpp index 6541470445c..30bddf54c7a 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/numeric_cast.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/numeric_cast.hpp @@ -21,7 +21,7 @@ // resolves conflicts with 'boost::numeric_cast' function template. // use it in your own code _only_ if you care about compatibility with // these outdated compilers! -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570) ) +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x570) ) # define BOOST_MPL_AUX_NUMERIC_CAST numeric_cast_ #else # define BOOST_MPL_AUX_NUMERIC_CAST numeric_cast diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/string.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/string.hpp index e7898562df4..fd3100c6090 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/string.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/string.hpp @@ -500,11 +500,11 @@ namespace boost { namespace mpl }; #define M0(z, n, data) \ - template<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, int C), int J> \ - struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)>, n, J> \ + template<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, int C), int J> \ + struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)>, n, J> \ { \ enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == J + 1) }; \ - typedef mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> string; \ + typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string; \ typedef std::bidirectional_iterator_tag category; \ typedef \ mpl::string_iterator<string, n + eomc_, eomc_ ? 0 : J + 1> \ @@ -514,11 +514,11 @@ namespace boost { namespace mpl prior; \ typedef mpl::char_<BOOST_MPL_MULTICHAR_AT(BOOST_PP_CAT(C, n), J)> type; \ }; \ - template<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, int C)> \ - struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)>, n, 0> \ + template<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, int C)> \ + struct string_iterator<mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)>, n, 0> \ { \ enum { eomc_ = (BOOST_MPL_MULTICHAR_LENGTH(BOOST_PP_CAT(C, n)) == 1) }; \ - typedef mpl::string<BOOST_PP_ENUM_PARAMS(BOOST_MPL_STRING_MAX_PARAMS, C)> string; \ + typedef mpl::string<BOOST_PP_ENUM_PARAMS_Z(z, BOOST_MPL_STRING_MAX_PARAMS, C)> string; \ typedef std::bidirectional_iterator_tag category; \ typedef \ mpl::string_iterator<string, n + eomc_, !eomc_> \ diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/upper_bound.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/upper_bound.hpp index ff943e60e3e..6c954edc33e 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/upper_bound.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/upper_bound.hpp @@ -19,7 +19,7 @@ #include <boost/mpl/aux_/na_spec.hpp> #include <boost/mpl/aux_/config/workaround.hpp> -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x610)) # define BOOST_MPL_CFG_STRIPPED_DOWN_UPPER_BOUND_IMPL #endif diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/vector/aux_/at.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/vector/aux_/at.hpp index 0a7583ccf1f..d7b14d42fd6 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/vector/aux_/at.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/vector/aux_/at.hpp @@ -65,7 +65,7 @@ template< BOOST_MPL_AUX_NTTP_DECL(long, n_) > struct at_impl< aux::vector_tag<n_> > { template< typename Vector, typename N > struct apply -#if !defined(__BORLANDC__) +#if !defined(BOOST_BORLANDC) : v_at< Vector , BOOST_MPL_AUX_VALUE_WKND(N)::value |