aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2024-04-30 10:43:28 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2024-04-30 11:04:13 +0300
commit594beb708cf067a2cee6fea5d33621fac5cbfbb3 (patch)
tree6f2326bc562917123b8ee027ee0155d7d3b2cb55
parent76e0ed0a5abcd6ba913ce8af2eb5aacbff41ae3b (diff)
downloadydb-594beb708cf067a2cee6fea5d33621fac5cbfbb3.tar.gz
Update contrib/restricted/boost/variant to 1.85.0
6c3f604fe8b71df1cd1080dd3f73283ffe4cdada
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_binary.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_unary.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/config.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/element_index.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/forced_return.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/has_result_type.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/hash_variant.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/initializer.hpp89
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/make_variant_list.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/move.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/std_hash.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/substitute.hpp3
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/variant_io.hpp26
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/detail/visitation_impl.hpp11
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/get.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/recursive_variant.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/recursive_wrapper_fwd.hpp2
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/variant.hpp82
-rw-r--r--contrib/restricted/boost/variant/include/boost/variant/variant_fwd.hpp45
-rw-r--r--contrib/restricted/boost/variant/ya.make4
20 files changed, 27 insertions, 259 deletions
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_binary.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_binary.hpp
index 32c128bf42..1b1016c684 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_binary.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_binary.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002-2003 Eric Friedman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_unary.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_unary.hpp
index c34c0e9b36..dc73f90af2 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_unary.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/apply_visitor_unary.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002-2003 Eric Friedman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/config.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/config.hpp
index da76fe2a65..236cc982f2 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/config.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/config.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2016-2023 Antony Polukhin
+// Copyright (c) 2016-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/element_index.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/element_index.hpp
index 06cf06d773..8b529cb702 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/element_index.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/element_index.hpp
@@ -3,7 +3,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/forced_return.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/forced_return.hpp
index 6d8911b109..75904f8458 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/forced_return.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/forced_return.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2015-2023 Antony Polukhin
+// Copyright (c) 2015-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/has_result_type.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/has_result_type.hpp
index e1ca5b4023..973b36d2f2 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/has_result_type.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/has_result_type.hpp
@@ -3,7 +3,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/hash_variant.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/hash_variant.hpp
index 4eb8377213..469bc81b02 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/hash_variant.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/hash_variant.hpp
@@ -3,7 +3,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
-// Copyright (c) 2011-2023 Antony Polukhin
+// Copyright (c) 2011-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/initializer.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/initializer.hpp
index 4a54c273c2..331f375b7c 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/initializer.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/initializer.hpp
@@ -22,7 +22,6 @@
#include <boost/variant/recursive_wrapper_fwd.hpp>
#include <boost/variant/detail/move.hpp>
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
# include <boost/mpl/aux_/value_wknd.hpp>
# include <boost/mpl/int.hpp>
# include <boost/mpl/iter_fold.hpp>
@@ -30,12 +29,7 @@
# include <boost/mpl/deref.hpp>
# include <boost/mpl/pair.hpp>
# include <boost/mpl/protect.hpp>
-#else
-# include <boost/variant/variant_fwd.hpp>
-# include <boost/preprocessor/cat.hpp>
-# include <boost/preprocessor/enum.hpp>
-# include <boost/preprocessor/repeat.hpp>
-#endif
+
namespace boost {
namespace detail { namespace variant {
@@ -53,8 +47,6 @@ namespace detail { namespace variant {
// size of the variant's psuedo-variadic template parameter list.
//
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
// (detail) quoted metafunction make_initializer_node
//
// Exposes a pair whose first type is a node in the initializer hierarchy.
@@ -81,7 +73,6 @@ struct make_initializer_node
typedef typename unwrap_recursive<recursive_enabled_T>::type
public_T;
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
typedef boost::is_reference<public_T>
is_reference_content_t;
@@ -92,10 +83,6 @@ struct make_initializer_node
typedef typename boost::mpl::if_<is_reference_content_t, disable_overload<public_T>, public_T&& >::type
param2_T;
-#else
- typedef typename call_traits<public_T>::param_type
- param_T;
-#endif
public: // static functions
@@ -111,7 +98,6 @@ struct make_initializer_node
return BOOST_MPL_AUX_VALUE_WKND(index)::value; // which
}
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
static int initialize(void* dest, param2_T operand)
{
// This assert must newer trigger, because all the reference contents are
@@ -122,7 +108,6 @@ struct make_initializer_node
new(dest) value_T( boost::detail::variant::move(operand) );
return BOOST_MPL_AUX_VALUE_WKND(index)::value; // which
}
-#endif
};
friend class initializer_node;
@@ -150,61 +135,6 @@ public: // static functions
};
-#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
- // Obsolete. Remove.
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_PARAMS \
- BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) \
- /**/
-
- // Obsolete. Remove.
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_DEFINE_PARAM_T(N) \
- typedef typename unwrap_recursive< \
- BOOST_PP_CAT(recursive_enabled_T,N) \
- >::type BOOST_PP_CAT(public_T,N); \
- typedef typename call_traits< \
- BOOST_PP_CAT(public_T,N) \
- >::param_type BOOST_PP_CAT(param_T,N); \
- /**/
-
-template < BOOST_VARIANT_ENUM_PARAMS(typename recursive_enabled_T) >
-struct preprocessor_list_initializer
-{
-public: // static functions
-
- #define BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION(z,N,_) \
- typedef typename unwrap_recursive< \
- BOOST_PP_CAT(recursive_enabled_T,N) \
- >::type BOOST_PP_CAT(public_T,N); \
- typedef typename call_traits< \
- BOOST_PP_CAT(public_T,N) \
- >::param_type BOOST_PP_CAT(param_T,N); \
- static int initialize( \
- void* dest \
- , BOOST_PP_CAT(param_T,N) operand \
- ) \
- { \
- typedef typename boost::detail::make_reference_content< \
- BOOST_PP_CAT(recursive_enabled_T,N) \
- >::type internal_T; \
- \
- new(dest) internal_T(operand); \
- return (N); /*which*/ \
- } \
- /**/
-
- BOOST_PP_REPEAT(
- BOOST_VARIANT_LIMIT_TYPES
- , BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION
- , _
- )
-
- #undef BOOST_VARIANT_AUX_PP_INITIALIZE_FUNCTION
-
-};
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
}} // namespace detail::variant
} // namespace boost
@@ -216,8 +146,6 @@ public: // static functions
// most appropriate to the current compiler.
//
-#if !defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
#define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
::boost::mpl::iter_fold< \
mpl_seq \
@@ -231,19 +159,4 @@ public: // static functions
>::type::first \
/**/
-#else // defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-
- // Obsolete. Remove.
- #define BOOST_VARIANT_AUX_PP_INITIALIZER_TEMPLATE_ARGS(typename_base) \
- BOOST_VARIANT_ENUM_PARAMS(typename_base) \
- /**/
-
-#define BOOST_VARIANT_AUX_INITIALIZER_T( mpl_seq, typename_base ) \
- ::boost::detail::variant::preprocessor_list_initializer< \
- BOOST_VARIANT_ENUM_PARAMS(typename_base) \
- > \
- /**/
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
#endif // BOOST_VARIANT_DETAIL_INITIALIZER_HPP
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/make_variant_list.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/make_variant_list.hpp
index d6ad8e99a8..eafe1cb787 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/make_variant_list.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/make_variant_list.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002-2003 Eric Friedman, Itay Maman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/move.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/move.hpp
index b8eafd64cd..9788e1331e 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/move.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/move.hpp
@@ -5,7 +5,7 @@
//
// Copyright (c) 2002-2003 Eric Friedman
// Copyright (c) 2002 by Andrei Alexandrescu
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
//
// Use, modification and distribution are subject to the
// Boost Software License, Version 1.0. (See accompanying file
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/std_hash.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/std_hash.hpp
index 3e05c5c900..7335902e71 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/std_hash.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/std_hash.hpp
@@ -3,7 +3,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
//-----------------------------------------------------------------------------
//
-// Copyright (c) 2018-2023 Antony Polukhin
+// Copyright (c) 2018-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/substitute.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/substitute.hpp
index f8c05b8a27..213259d72a 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/substitute.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/substitute.hpp
@@ -22,10 +22,7 @@
#include <boost/mpl/aux_/preprocessor/repeat.hpp>
#include <boost/mpl/int_fwd.hpp>
#include <boost/mpl/limits/arity.hpp>
-#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/empty.hpp>
-#include <boost/preprocessor/arithmetic/inc.hpp>
-#include <boost/preprocessor/iterate.hpp>
namespace boost {
namespace detail { namespace variant {
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/variant_io.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/variant_io.hpp
index 63df74f24b..9e560f4e51 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/variant_io.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/variant_io.hpp
@@ -16,8 +16,6 @@
#include <iosfwd> // for std::basic_ostream forward declare
#include <boost/variant/variant_fwd.hpp>
-
-#include <boost/detail/templated_streams.hpp>
#include <boost/variant/static_visitor.hpp>
namespace boost {
@@ -29,14 +27,9 @@ namespace boost {
//
// forward declare (allows output of embedded variant< variant< ... >, ... >)
-template <
- BOOST_TEMPLATED_STREAM_ARGS(E,T)
- BOOST_TEMPLATED_STREAM_COMMA
- BOOST_VARIANT_ENUM_PARAMS(typename U)
- >
-inline BOOST_TEMPLATED_STREAM(ostream, E,T)& operator<<(
- BOOST_TEMPLATED_STREAM(ostream, E,T)& out
- , const variant< BOOST_VARIANT_ENUM_PARAMS(U) >& rhs
+template <class CharT, class Trait, typename... U>
+inline std::basic_ostream<CharT, Trait>& operator<<(
+ std::basic_ostream<CharT, Trait>& out, const variant<U...>& rhs
);
namespace detail { namespace variant {
@@ -71,18 +64,13 @@ private:
}} // namespace detail::variant
-template <
- BOOST_TEMPLATED_STREAM_ARGS(E,T)
- BOOST_TEMPLATED_STREAM_COMMA
- BOOST_VARIANT_ENUM_PARAMS(typename U)
- >
-inline BOOST_TEMPLATED_STREAM(ostream, E,T)& operator<<(
- BOOST_TEMPLATED_STREAM(ostream, E,T)& out
- , const variant< BOOST_VARIANT_ENUM_PARAMS(U) >& rhs
+template <class CharT, class Trait, typename... U>
+inline std::basic_ostream<CharT, Trait>& operator<<(
+ std::basic_ostream<CharT, Trait>& out, const variant<U...>& rhs
)
{
detail::variant::printer<
- BOOST_TEMPLATED_STREAM(ostream, E,T)
+ std::basic_ostream<CharT, Trait>
> visitor(out);
rhs.apply_visitor(visitor);
diff --git a/contrib/restricted/boost/variant/include/boost/variant/detail/visitation_impl.hpp b/contrib/restricted/boost/variant/include/boost/variant/detail/visitation_impl.hpp
index 862d839800..13fa9214d3 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/detail/visitation_impl.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/detail/visitation_impl.hpp
@@ -53,13 +53,6 @@
#endif
-// Define a compiler generic null pointer value
-#if defined(BOOST_NO_CXX11_NULLPTR)
-#define BOOST_VARIANT_NULL 0
-#else
-#define BOOST_VARIANT_NULL nullptr
-#endif
-
namespace boost {
namespace detail { namespace variant {
@@ -179,7 +172,7 @@ inline typename Visitor::result_type
visitation_impl(
int, int, Visitor&, VPCV
, mpl::true_ // is_apply_visitor_unrolled
- , NBF, W* = BOOST_VARIANT_NULL, S* = BOOST_VARIANT_NULL
+ , NBF, W* = nullptr, S* = nullptr
)
{
// should never be here at runtime!
@@ -198,7 +191,7 @@ visitation_impl(
, Visitor& visitor, VoidPtrCV storage
, mpl::false_ // is_apply_visitor_unrolled
, NoBackupFlag no_backup_flag
- , Which* = BOOST_VARIANT_NULL, step0* = BOOST_VARIANT_NULL
+ , Which* = nullptr, step0* = nullptr
)
{
// Typedef apply_visitor_unrolled steps and associated types...
diff --git a/contrib/restricted/boost/variant/include/boost/variant/get.hpp b/contrib/restricted/boost/variant/include/boost/variant/get.hpp
index 62fca60c9e..085c6f23d5 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/get.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/get.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2003 Eric Friedman, Itay Maman
-// Copyright (c) 2014-2023 Antony Polukhin
+// Copyright (c) 2014-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/recursive_variant.hpp b/contrib/restricted/boost/variant/include/boost/variant/recursive_variant.hpp
index 96ae087460..d68e202da4 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/recursive_variant.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/recursive_variant.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2003 Eric Friedman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/variant/include/boost/variant/recursive_wrapper_fwd.hpp b/contrib/restricted/boost/variant/include/boost/variant/recursive_wrapper_fwd.hpp
index b5d7e71952..b8b59ee600 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/recursive_wrapper_fwd.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/recursive_wrapper_fwd.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002 Eric Friedman, Itay Maman
-// Copyright (c) 2016-2023 Antony Polukhin
+// Copyright (c) 2016-2024 Antony Polukhin
//
// Portions Copyright (C) 2002 David Abrahams
//
diff --git a/contrib/restricted/boost/variant/include/boost/variant/variant.hpp b/contrib/restricted/boost/variant/include/boost/variant/variant.hpp
index 44657f0e5f..f28a012049 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/variant.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/variant.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2002-2003 Eric Friedman, Itay Maman
-// Copyright (c) 2012-2023 Antony Polukhin
+// Copyright (c) 2012-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
@@ -40,8 +40,6 @@
#include <boost/blank.hpp>
#include <boost/integer/common_factor_ct.hpp>
#include <boost/static_assert.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/repeat.hpp>
#include <boost/type_traits/aligned_storage.hpp>
#include <boost/type_traits/alignment_of.hpp>
#include <boost/type_traits/add_const.hpp>
@@ -1096,8 +1094,6 @@ private: // helpers, for typedefs (below)
{
};
-#if !defined(BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT)
-
private: // helpers, for typedefs (below)
typedef typename mpl::eval_if<
@@ -1141,82 +1137,6 @@ private: // internal typedefs
internal_types
>::type internal_T0;
-#else // defined(BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT)
-
-private: // helpers, for typedefs (below)
-
- typedef unwrapped_T0_ T0;
-
- #define BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS(z,N,_) \
- typedef typename mpl::eval_if< \
- is_recursive_ \
- , detail::variant::enable_recursive< \
- BOOST_PP_CAT(T,N) \
- , wknd_self_t \
- > \
- , mpl::identity< BOOST_PP_CAT(T,N) > \
- >::type BOOST_PP_CAT(recursive_enabled_T,N); \
- /**/
-
- BOOST_PP_REPEAT(
- BOOST_VARIANT_LIMIT_TYPES
- , BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS
- , _
- )
-
- #undef BOOST_VARIANT_AUX_ENABLE_RECURSIVE_TYPEDEFS
-
- #define BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS(z,N,_) \
- typedef typename unwrap_recursive< \
- BOOST_PP_CAT(recursive_enabled_T,N) \
- >::type BOOST_PP_CAT(public_T,N); \
- /**/
-
- BOOST_PP_REPEAT(
- BOOST_VARIANT_LIMIT_TYPES
- , BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS
- , _
- )
-
- #undef BOOST_VARIANT_AUX_UNWRAP_RECURSIVE_TYPEDEFS
-
-public: // public typedefs
-
- typedef typename detail::variant::make_variant_list<
- BOOST_VARIANT_ENUM_PARAMS(public_T)
- >::type types;
-
-private: // helpers, for internal typedefs (below)
-
- #define BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS(z,N,_) \
- typedef detail::make_reference_content< \
- BOOST_PP_CAT(recursive_enabled_T,N) \
- >::type BOOST_PP_CAT(internal_T,N); \
- /**/
-
- BOOST_PP_REPEAT(
- BOOST_VARIANT_LIMIT_TYPES
- , BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS
- , _
- )
-
- #undef BOOST_VARIANT_AUX_MAKE_REFERENCE_CONTENT_TYPEDEFS
-
-private: // internal typedefs
-
- typedef typename detail::variant::make_variant_list<
- BOOST_VARIANT_ENUM_PARAMS(internal_T)
- >::type internal_types;
-
-private: // static precondition assertions
-
- // NOTE TO USER :
- // variant< type-sequence > syntax is not supported on this compiler!
- //
- BOOST_MPL_ASSERT_NOT(( is_sequence_based_ ));
-
-#endif // BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT workaround
-
private: // helpers, for representation (below)
typedef typename detail::variant::find_fallback_type<
diff --git a/contrib/restricted/boost/variant/include/boost/variant/variant_fwd.hpp b/contrib/restricted/boost/variant/include/boost/variant/variant_fwd.hpp
index 1484f204d9..c5f8002431 100644
--- a/contrib/restricted/boost/variant/include/boost/variant/variant_fwd.hpp
+++ b/contrib/restricted/boost/variant/include/boost/variant/variant_fwd.hpp
@@ -4,7 +4,7 @@
//-----------------------------------------------------------------------------
//
// Copyright (c) 2003 Eric Friedman, Itay Maman
-// Copyright (c) 2013-2023 Antony Polukhin
+// Copyright (c) 2013-2024 Antony Polukhin
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
@@ -26,15 +26,6 @@
#include <boost/preprocessor/repeat.hpp>
///////////////////////////////////////////////////////////////////////////////
-// macro BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT
-//
-// Defined if variant does not support make_variant_over (see below).
-//
-#if defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-# define BOOST_VARIANT_NO_TYPE_SEQUENCE_SUPPORT
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
// macro BOOST_VARIANT_NO_FULL_RECURSIVE_VARIANT_SUPPORT
//
// Defined if make_recursive_variant cannot be supported as documented.
@@ -118,40 +109,6 @@ struct convert_void< void_ >
typedef mpl::na type;
};
-///////////////////////////////////////////////////////////////////////////////
-// (workaround) BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE
-//
-// Needed to work around compilers that don't support using-declaration
-// overloads. (See the variant::initializer workarounds below.)
-//
-
-#if defined(BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE)
-// (detail) tags voidNN -- NN defined on [0, BOOST_VARIANT_LIMIT_TYPES)
-//
-// Defines void types that are each unique and specializations of
-// convert_void that yields mpl::na for each voidNN type.
-//
-
-#define BOOST_VARIANT_DETAIL_DEFINE_VOID_N(z,N,_) \
- struct BOOST_PP_CAT(void,N); \
- \
- template <> \
- struct convert_void< BOOST_PP_CAT(void,N) > \
- { \
- typedef mpl::na type; \
- }; \
- /**/
-
-BOOST_PP_REPEAT(
- BOOST_VARIANT_LIMIT_TYPES
- , BOOST_VARIANT_DETAIL_DEFINE_VOID_N
- , _
- )
-
-#undef BOOST_VARIANT_DETAIL_DEFINE_VOID_N
-
-#endif // BOOST_NO_USING_DECLARATION_OVERLOADS_FROM_TYPENAME_BASE workaround
-
}} // namespace detail::variant
#define BOOST_VARIANT_AUX_DECLARE_PARAMS BOOST_VARIANT_ENUM_PARAMS(typename T)
diff --git a/contrib/restricted/boost/variant/ya.make b/contrib/restricted/boost/variant/ya.make
index 3560dc18f1..3bb083267a 100644
--- a/contrib/restricted/boost/variant/ya.make
+++ b/contrib/restricted/boost/variant/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(1.84.0)
+VERSION(1.85.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/variant/archive/boost-1.84.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/variant/archive/boost-1.85.0.tar.gz)
PEERDIR(
contrib/restricted/boost/assert