diff options
6 files changed, 14 insertions, 30 deletions
diff --git a/contrib/restricted/boost/mpl/.yandex_meta/default.nix b/contrib/restricted/boost/mpl/.yandex_meta/default.nix index 1b41c752502..ae46ff926ce 100644 --- a/contrib/restricted/boost/mpl/.yandex_meta/default.nix +++ b/contrib/restricted/boost/mpl/.yandex_meta/default.nix @@ -1,13 +1,13 @@ self: super: with self; { boost_mpl = stdenv.mkDerivation rec { pname = "boost_mpl"; - version = "1.88.0"; + version = "1.89.0"; src = fetchFromGitHub { owner = "boostorg"; repo = "mpl"; rev = "boost-${version}"; - hash = "sha256-mDqz+Y/LZv2XeyjnyhxCgogdzv/m4Dcnbylk6uyW5UE="; + hash = "sha256-UvgPOuVibz9GEpzDOOGgTvSunYDvErQfqsb9xvj+xic="; }; }; } diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/and.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/and.hpp index a6f48924811..3effb84622f 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/and.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/and.hpp @@ -28,26 +28,22 @@ // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)' // has to be checked in a separate condition, otherwise GCC complains // about 'and' being an alternative token -#if defined(_MSC_VER) && !defined(__cplusplus) -#ifndef __GCCXML__ -#if defined(and) +#if defined(_MSC_EXTENSIONS) +#if defined(and) # pragma push_macro("and") # undef and # define and(x) #endif #endif -#endif # define BOOST_MPL_PREPROCESSED_HEADER and.hpp # include <boost/mpl/aux_/include_preprocessed.hpp> -#if defined(_MSC_VER) && !defined(__clang__) && !defined(__cplusplus) -#ifndef __GCCXML__ -#if defined(and) +#if defined(_MSC_EXTENSIONS) +#if defined(and) # pragma pop_macro("and") #endif #endif -#endif #else diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/bitand.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/bitand.hpp index 82261d09e83..360e1540fc5 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/bitand.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/bitand.hpp @@ -19,27 +19,23 @@ // macros, see http://tinyurl.com/ycwdxco; 'defined(bitand)' // has to be checked in a separate condition, otherwise GCC complains // about 'bitand' being an alternative token -#if defined(_MSC_VER) && !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(bitand) # pragma push_macro("bitand") # undef bitand # define bitand(x) #endif #endif -#endif #define AUX778076_OP_NAME bitand_ #define AUX778076_OP_PREFIX bitand #define AUX778076_OP_TOKEN & #include <boost/mpl/aux_/arithmetic_op.hpp> -#if defined(_MSC_VER) && !defined(__clang__) && !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(bitand) # pragma pop_macro("bitand") #endif #endif -#endif #endif // BOOST_MPL_BITAND_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/bitor.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/bitor.hpp index 9bd4da253ac..b19bd6f979e 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/bitor.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/bitor.hpp @@ -19,27 +19,23 @@ // macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)' // has to be checked in a separate condition, otherwise GCC complains // about 'bitor' being an alternative token -#if defined(_MSC_VER) && !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(bitor) # pragma push_macro("bitor") # undef bitor # define bitor(x) #endif #endif -#endif #define AUX778076_OP_NAME bitor_ #define AUX778076_OP_PREFIX bitor #define AUX778076_OP_TOKEN | #include <boost/mpl/aux_/arithmetic_op.hpp> -#if defined(_MSC_VER) && !defined(__clang__) && !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(bitor) # pragma pop_macro("bitor") #endif #endif -#endif #endif // BOOST_MPL_BITOR_HPP_INCLUDED diff --git a/contrib/restricted/boost/mpl/include/boost/mpl/or.hpp b/contrib/restricted/boost/mpl/include/boost/mpl/or.hpp index 337e53ae8a1..cb90c02e9a5 100644 --- a/contrib/restricted/boost/mpl/include/boost/mpl/or.hpp +++ b/contrib/restricted/boost/mpl/include/boost/mpl/or.hpp @@ -29,26 +29,22 @@ // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)' // has to be checked in a separate condition, otherwise GCC complains // about 'or' being an alternative token -#if defined(_MSC_VER)&& !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(or) # pragma push_macro("or") # undef or # define or(x) #endif #endif -#endif # define BOOST_MPL_PREPROCESSED_HEADER or.hpp # include <boost/mpl/aux_/include_preprocessed.hpp> -#if defined(_MSC_VER) && !defined(__clang__) && !defined(__cplusplus) -#ifndef __GCCXML__ +#if defined(_MSC_EXTENSIONS) #if defined(or) # pragma pop_macro("or") #endif #endif -#endif #else diff --git a/contrib/restricted/boost/mpl/ya.make b/contrib/restricted/boost/mpl/ya.make index 3a8041c64b3..2b872302186 100644 --- a/contrib/restricted/boost/mpl/ya.make +++ b/contrib/restricted/boost/mpl/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.88.0) +VERSION(1.89.0) -ORIGINAL_SOURCE(https://github.com/boostorg/mpl/archive/boost-1.88.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/mpl/archive/boost-1.89.0.tar.gz) PEERDIR( contrib/restricted/boost/config |