fixed crash on empty optional serialization

175 files changed, 78 insertions, 3397 deletions

diff --git a/contrib/restricted/boost/boost/test/auto_unit_test.hpp b/contrib/restricted/boost/boost/test/auto_unit_test.hpp
deleted file mode 100644
index 99acd162ab..0000000000
--- a/contrib/restricted/boost/boost/test/auto_unit_test.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//! @file
-//! @brief Deprecated header.
-//! @deprecated Use @c boost/test/unit_test.hpp instead.
-// ***************************************************************************
-
-#ifndef BOOST_TEST_AUTO_UNIT_TEST_HPP_071894GER
-#define BOOST_TEST_AUTO_UNIT_TEST_HPP_071894GER
-
-#include <boost/test/unit_test.hpp>
-
-#endif // BOOST_TEST_AUTO_UNIT_TEST_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/data/config.hpp b/contrib/restricted/boost/boost/test/data/config.hpp
deleted file mode 100644
index 7a9d03be98..0000000000
--- a/contrib/restricted/boost/boost/test/data/config.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief common dataset macros
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_CONFIG_HPP_112611GER
-#define BOOST_TEST_DATA_CONFIG_HPP_112611GER
-
-// Boost.Test
-#include <boost/test/detail/config.hpp>
-#include <boost/test/detail/throw_exception.hpp>
-
-// STL
-#include <stdexcept> // for std::logic_error
-
-// availability on features: preprocessed by doxygen
-
-#if defined(BOOST_NO_CXX11_HDR_RANDOM) || defined(BOOST_TEST_DOXYGEN_DOC__)
-//! Defined when the random dataset feature is not available
-#define BOOST_TEST_NO_RANDOM_DATASET_AVAILABLE
-
-#endif
-
-#if defined(BOOST_NO_CXX11_HDR_TUPLE) || defined(BOOST_TEST_DOXYGEN_DOC__)
-
-//! Defined when grid composition of datasets is not available
-#define BOOST_TEST_NO_GRID_COMPOSITION_AVAILABLE
-
-//! Defined when zip composition of datasets is not available
-#define BOOST_TEST_NO_ZIP_COMPOSITION_AVAILABLE
-
-#endif
-
-//____________________________________________________________________________//
-
-#define BOOST_TEST_DS_ERROR( msg )        BOOST_TEST_I_THROW( std::logic_error( msg ) )
-#define BOOST_TEST_DS_ASSERT( cond, msg ) BOOST_TEST_I_ASSRT( cond, std::logic_error( msg ) )
-
-#endif // BOOST_TEST_DATA_CONFIG_HPP_112611GER
diff --git a/contrib/restricted/boost/boost/test/data/dataset.hpp b/contrib/restricted/boost/boost/test/data/dataset.hpp
deleted file mode 100644
index 3f576ab357..0000000000
--- a/contrib/restricted/boost/boost/test/data/dataset.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief dataset interfaces
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_DATASET_HPP_102211GER
-#define BOOST_TEST_DATA_DATASET_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/monomorphic.hpp>
-
-#endif // BOOST_TEST_DATA_DATASET_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/for_each_sample.hpp b/contrib/restricted/boost/boost/test/data/for_each_sample.hpp
deleted file mode 100644
index 4785b038cc..0000000000
--- a/contrib/restricted/boost/boost/test/data/for_each_sample.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines for_each_sample algorithm
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_FOR_EACH_SAMPLE_HPP_102211GER
-#define BOOST_TEST_DATA_FOR_EACH_SAMPLE_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/size.hpp>
-#include <boost/test/data/index_sequence.hpp>
-#include <boost/test/data/monomorphic/sample_merge.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-// STL
-#include <tuple>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-// needed for std::min
-#include <algorithm>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-// ************************************************************************** //
-// **************              data::invoke_action             ************** //
-// ************************************************************************** //
-
-template<typename Action, typename T>
-inline void
-invoke_action( Action const& action, T && arg, std::false_type /* is_tuple */ )
-{
-    action( std::forward<T>(arg) );
-}
-
-//____________________________________________________________________________//
-
-template<typename Action, typename T, std::size_t ...I>
-inline void
-invoke_action_impl( Action const& action,
-                    T && args,
-                    index_sequence<I...> const& )
-{
-    action( std::get<I>(std::forward<T>(args))... );
-}
-
-//____________________________________________________________________________//
-
-template<typename Action, typename T>
-inline void
-invoke_action( Action const& action, T&& args, std::true_type /* is_tuple */ )
-{
-    invoke_action_impl( action,
-                        std::forward<T>(args),
-                        typename make_index_sequence< 0,
-                                                      std::tuple_size<typename std::decay<T>::type>::value
-                                                    >::type{} );
-
-}
-
-//____________________________________________________________________________//
-
-// ************************************************************************** //
-// **************                for_each_sample               ************** //
-// ************************************************************************** //
-
-template<typename DataSet, typename Action>
-inline typename std::enable_if<monomorphic::is_dataset<DataSet>::value,void>::type
-for_each_sample( DataSet &&         samples,
-                 Action const&      act,
-                 data::size_t       number_of_samples = BOOST_TEST_DS_INFINITE_SIZE )
-{
-    data::size_t size = (std::min)( samples.size(), number_of_samples );
-    BOOST_TEST_DS_ASSERT( !size.is_inf(), "Dataset has infinite size. Please specify the number of samples" );
-
-    auto it = samples.begin();
-
-    while( size-- > 0 ) {
-        invoke_action( act,
-                       *it,
-                       typename monomorphic::ds_detail::is_tuple<decltype(*it)>::type());
-        ++it;
-    }
-}
-
-//____________________________________________________________________________//
-
-template<typename DataSet, typename Action>
-inline typename std::enable_if<!monomorphic::is_dataset<DataSet>::value,void>::type
-for_each_sample( DataSet &&     samples,
-                 Action const&      act,
-                 data::size_t       number_of_samples = BOOST_TEST_DS_INFINITE_SIZE )
-{
-    data::for_each_sample( data::make( std::forward<DataSet>(samples) ),
-                           act,
-                           number_of_samples );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_FOR_EACH_SAMPLE_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/generators.hpp b/contrib/restricted/boost/boost/test/data/generators.hpp
deleted file mode 100644
index e9bd4c17b5..0000000000
--- a/contrib/restricted/boost/boost/test/data/generators.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief specific generators
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-
-// Boost.Test
-#include <boost/test/data/monomorphic/generators/xrange.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-
diff --git a/contrib/restricted/boost/boost/test/data/index_sequence.hpp b/contrib/restricted/boost/boost/test/data/index_sequence.hpp
deleted file mode 100644
index 21af7e504c..0000000000
--- a/contrib/restricted/boost/boost/test/data/index_sequence.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines c++14 index_sequence implementation
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_INDEX_SEQUENCE_HPP
-#define BOOST_TEST_DATA_INDEX_SEQUENCE_HPP
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-// ************************************************************************** //
-// **************             data::index_sequence             ************** //
-// ************************************************************************** //
-
-template <std::size_t... Ns>
-struct index_sequence {};
-
-template<typename IS1, typename IS2>
-struct merge_index_sequence;
-
-template <std::size_t... Ns1, std::size_t... Ns2>
-struct merge_index_sequence<index_sequence<Ns1...>, index_sequence<Ns2...>> {
-    typedef index_sequence<Ns1..., Ns2...> type;
-};
-
-template <std::size_t B, std::size_t E, typename Enabler = void>
-struct make_index_sequence {
-    typedef typename merge_index_sequence<typename make_index_sequence<B,(B+E)/2>::type,
-                                          typename make_index_sequence<(B+E)/2,E>::type>::type type;
-};
-
-template <std::size_t B, std::size_t E>
-struct make_index_sequence<B,E,typename std::enable_if<E==B+1,void>::type> {
-    typedef index_sequence<B> type;
-};
-
-template <typename... T>
-using index_sequence_for = typename make_index_sequence<0, sizeof...(T)>::type;
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_INDEX_SEQUENCE_HPP
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic.hpp b/contrib/restricted/boost/boost/test/data/monomorphic.hpp
deleted file mode 100644
index 31d7b01b32..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief Monomorphic dataset interfaces
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_HPP_102211GER
-#define BOOST_TEST_DATA_MONOMORPHIC_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/monomorphic/array.hpp>
-#include <boost/test/data/monomorphic/collection.hpp>
-#include <boost/test/data/monomorphic/initializer_list.hpp>
-#include <boost/test/data/monomorphic/generate.hpp>
-#include <boost/test/data/monomorphic/generators.hpp>
-#include <boost/test/data/monomorphic/grid.hpp>
-#include <boost/test/data/monomorphic/join.hpp>
-#include <boost/test/data/monomorphic/singleton.hpp>
-#include <boost/test/data/monomorphic/zip.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/array.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/array.hpp
deleted file mode 100644
index 6f7ed8eb3b..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/array.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-///Defines monomorphic dataset based on C type arrays
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_ARRAY_HPP_121411GER
-#define BOOST_TEST_DATA_MONOMORPHIC_ARRAY_HPP_121411GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                     array                    ************** //
-// ************************************************************************** //
-
-/// Dataset view of a C array
-template<typename T>
-class array {
-public:
-    typedef T sample;
-
-    enum { arity = 1 };
-
-    typedef T const* iterator;
-
-    // Constructor
-    array( T const* arr_, std::size_t size_ )
-    : m_arr( arr_ )
-    , m_size( size_ )
-    {}
-
-    // dataset interface
-    data::size_t    size() const    { return m_size; }
-    iterator        begin() const   { return m_arr; }
-
-private:
-    // Data members
-    T const*        m_arr;
-    std::size_t     m_size;
-};
-
-//____________________________________________________________________________//
-
-//! An array dataset is a dataset
-template<typename T>
-struct is_dataset<array<T>> : mpl::true_ {};
-
-} // namespace monomorphic
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename T, std::size_t size>
-inline monomorphic::array<typename boost::remove_const<T>::type>
-make( T (&a)[size] )
-{
-    return monomorphic::array<typename boost::remove_const<T>::type>( a, size );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_ARRAY_HPP_121411GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/collection.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/collection.hpp
deleted file mode 100644
index 71a4863f41..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/collection.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-///Defines monomorphic dataset based on forward iterable sequence
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_COLLECTION_HPP_102211GER
-#define BOOST_TEST_DATA_MONOMORPHIC_COLLECTION_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                  collection                  ************** //
-// ************************************************************************** //
-
-
-//!@brief Dataset from a forward iterable container (collection)
-//!
-//! This dataset is applicable to any container implementing a forward iterator. Note that
-//! container with one element will be considered as singletons.
-//! This dataset is constructible with the @ref boost::unit_test::data::make function.
-template<typename C>
-class collection {
-    typedef typename boost::decay<C>::type col_type;
-public:
-    typedef typename col_type::value_type sample;
-
-    enum { arity = 1 };
-
-    typedef typename col_type::const_iterator iterator;
-
-    //! Constructor consumed a temporary collection or stores a reference 
-    explicit        collection( C&& col ) : m_col( std::forward<C>(col) ) {}
-
-    //! Move constructor
-    collection( collection&& c ) : m_col( std::forward<C>( c.m_col ) ) {}
-
-    //! Returns the underlying collection
-    C const&        col() const             { return m_col; }
-
-    //! dataset interface
-    data::size_t    size() const            { return m_col.size(); }
-    iterator        begin() const           { return m_col.begin(); }
-
-private:
-    // Data members
-    C               m_col;
-};
-
-//____________________________________________________________________________//
-
-//! A collection from a forward iterable container is a dataset.
-template<typename C>
-struct is_dataset<collection<C>> : mpl::true_ {};
-
-} // namespace monomorphic
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename C>
-inline typename std::enable_if<is_container_forward_iterable<C>::value,monomorphic::collection<C>>::type
-make( C&& c )
-{
-    return monomorphic::collection<C>( std::forward<C>(c) );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_COLLECTION_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/fwd.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/fwd.hpp
deleted file mode 100644
index dcd1b84165..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/fwd.hpp
+++ /dev/null
@@ -1,180 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Forward declares monomorphic datasets interfaces
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_FWD_HPP_102212GER
-#define BOOST_TEST_DATA_MONOMORPHIC_FWD_HPP_102212GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/size.hpp>
-
-#include <boost/test/utils/is_forward_iterable.hpp>
-
-// Boost
-#include <boost/type_traits/remove_const.hpp>
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/is_array.hpp>
-#include <boost/mpl/bool.hpp>
-
-// STL
-#include <tuple>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-// STL
-#include <initializer_list>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-namespace monomorphic {
-
-
-#if !defined(BOOST_TEST_DOXYGEN_DOC__)
-
-template<typename T, typename Specific>
-class dataset;
-
-template<typename T>
-class singleton;
-
-template<typename C>
-class collection;
-
-template<typename T>
-class array;
-
-template<typename T>
-class init_list;
-
-#endif
-
-// ************************************************************************** //
-// **************            monomorphic::is_dataset           ************** //
-// ************************************************************************** //
-
-//! Helper metafunction indicating if the specified type is a dataset.
-template<typename DataSet>
-struct is_dataset : mpl::false_ {};
-
-//____________________________________________________________________________//
-
-//! A reference to a dataset is a dataset
-template<typename DataSet>
-struct is_dataset<DataSet&> : is_dataset<DataSet> {};
-
-//____________________________________________________________________________//
-
-//! A const dataset is a dataset
-template<typename DataSet>
-struct is_dataset<DataSet const> : is_dataset<DataSet> {};
-
-} // namespace monomorphic
-
-// ************************************************************************** //
-// **************                  data::make                  ************** //
-// ************************************************************************** //
-
-//! @brief Creates a dataset from a value, a collection or an array
-//!
-//! This function has several overloads:
-//! @code
-//! // returns ds if ds is already a dataset
-//! template <typename DataSet> DataSet make(DataSet&& ds); 
-//!
-//! // creates a singleton dataset, for non forward iterable and non dataset type T
-//! // (a C string is not considered as a sequence).
-//! template <typename T> monomorphic::singleton<T> make(T&& v); 
-//! monomorphic::singleton<char*> make( char* str );
-//! monomorphic::singleton<char const*> make( char const* str );
-//!
-//! // creates a collection dataset, for forward iterable and non dataset type C
-//! template <typename C> monomorphic::collection<C> make(C && c);
-//!
-//! // creates an array dataset
-//! template<typename T, std::size_t size> monomorphic::array<T> make( T (&a)[size] );
-//! @endcode
-template<typename DataSet>
-inline typename std::enable_if<monomorphic::is_dataset<DataSet>::value,DataSet>::type
-make(DataSet&& ds)
-{
-    return std::forward<DataSet>( ds );
-}
-
-//____________________________________________________________________________//
-
-// warning: doxygen is apparently unable to handle @overload from different files, so if the overloads
-// below are not declared with @overload in THIS file, they do not appear in the documentation.
-
-//! @overload boost::unit_test::data::make()
-template<typename T>
-inline typename std::enable_if<!is_container_forward_iterable<T>::value && 
-                               !monomorphic::is_dataset<T>::value &&
-                               !is_array<typename remove_reference<T>::type>::value, 
-                               monomorphic::singleton<T>>::type
-make( T&& v );
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename C>
-inline typename std::enable_if<is_container_forward_iterable<C>::value,monomorphic::collection<C>>::type
-make( C&& c );
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename T, std::size_t size>
-inline monomorphic::array< typename boost::remove_const<T>::type >
-make( T (&a)[size] );
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-inline monomorphic::singleton<char*>
-make( char* str );
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-inline monomorphic::singleton<char const*>
-make( char const* str );
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename T>
-inline monomorphic::init_list<T>
-make( std::initializer_list<T>&& );
-
-//____________________________________________________________________________//
-
-namespace result_of {
-
-//! Result of the make call.
-template<typename DataSet>
-struct make {
-    typedef decltype( data::make( declval<DataSet>() ) ) type;
-};
-
-} // namespace result_of
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_FWD_HPP_102212GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/generate.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/generate.hpp
deleted file mode 100644
index 614ef3aad5..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/generate.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines generic interface for monomorphic dataset based on generator
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATE_HPP_112011GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATE_HPP_112011GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/core/ref.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                  generated_by                ************** //
-// ************************************************************************** //
-
-/*!@brief Generators interface
- *
- * This class implements the dataset concept over a generator. Examples of generators are:
- * - xrange_t
- * - random_t
- *
- * The generator concept is the following:
- * - the type of the generated samples is given by field @c sample
- * - the member function @c capacity should return the size of the collection being generated (potentially infinite)
- * - the member function @c next should change the state of the generator to the next generated value
- * - the member function @c reset should put the state of the object in the same state as right after its instanciation
- */
-template<typename Generator>
-class generated_by {
-public:
-    typedef typename Generator::sample sample;
-
-    enum { arity = 1 };
-
-    struct iterator {
-        // Constructor
-        explicit    iterator( Generator& gen )
-        : m_gen( &gen )
-        {
-            if(m_gen->capacity() > 0) {
-                m_gen->reset();
-                ++*this;
-            }
-        }
-
-        // forward iterator interface
-        sample const&   operator*() const   { return m_curr_sample; }
-        void            operator++()        { m_curr_sample = m_gen->next(); }
-
-    private:
-        // Data members
-        Generator*  m_gen;
-        sample      m_curr_sample;
-    };
-
-    typedef Generator generator_type;
-
-    // Constructor
-    explicit        generated_by( Generator&& G )
-    : m_generator( std::forward<Generator>(G) )
-    {}
-
-    // Move constructor
-    generated_by( generated_by&& rhs )
-    : m_generator( std::forward<Generator>(rhs.m_generator) )
-    {}
-
-    //! Size of the underlying dataset
-    data::size_t    size() const            { return m_generator.capacity(); }
-
-    //! Iterator on the beginning of the dataset
-    iterator        begin() const           { return iterator( boost::ref(const_cast<Generator&>(m_generator)) ); }
-
-private:
-    // Data members
-    Generator       m_generator;
-};
-
-//____________________________________________________________________________//
-
-//! A generated dataset is a dataset.
-template<typename Generator>
-struct is_dataset<generated_by<Generator>> : mpl::true_ {};
-
-} // namespace monomorphic
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATE_HPP_112011GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/generators.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/generators.hpp
deleted file mode 100644
index 108d4ba58d..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/generators.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-///Defines specific generators
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-
-// Boost.Test
-#include <boost/test/data/monomorphic/generators/xrange.hpp>
-#include <boost/test/data/monomorphic/generators/random.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_HPP_112011GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/generators/keywords.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/generators/keywords.hpp
deleted file mode 100644
index de6a4e89e5..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/generators/keywords.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-/// Keywords used in generator interfaces
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_KEYWORDS_HPP_101512GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_KEYWORDS_HPP_101512GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/utils/named_params.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-namespace {
-nfp::keyword<struct begin_t>    begin;
-nfp::keyword<struct end_t>      end;
-nfp::keyword<struct step_t>     step;
-} // local namespace
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_KEYWORDS_HPP_101512GER
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/generators/random.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/generators/random.hpp
deleted file mode 100644
index 24a1df3c64..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/generators/random.hpp
+++ /dev/null
@@ -1,198 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief Random generator
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_RANDOM_HPP_101512GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_RANDOM_HPP_101512GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-
-
-
-#if !defined(BOOST_TEST_NO_RANDOM_DATASET_AVAILABLE) || defined(BOOST_TEST_DOXYGEN_DOC__)
-
-#include <boost/test/data/monomorphic/generate.hpp>
-#include <boost/test/data/monomorphic/generators/keywords.hpp>
-
-// STL
-#include <random>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-namespace {
-nfp::keyword<struct seed_t>         seed;
-nfp::keyword<struct distribution_t> distribution;
-nfp::keyword<struct engine_t>       engine;
-} // local namespace
-
-namespace monomorphic {
-
-namespace ds_detail {
-template<typename SampleType>
-struct default_distribution {
-    typedef typename mpl::if_<std::is_integral<SampleType>,
-                              std::uniform_int_distribution<SampleType>,
-                              std::uniform_real_distribution<SampleType>>::type type;
-};
-
-} // namespace ds_detail
-
-// ************************************************************************** //
-// **************                   random_t                   ************** //
-// ************************************************************************** //
-
-/*!@brief Generator for the random sequences
- *
- * This class implements the generator concept (see @ref boost::unit_test::data::monomorphic::generated_by) for implementing
- * a random number generator.
- */
-template<typename SampleType        = double, 
-         typename DistributionType  = typename ds_detail::default_distribution<SampleType>::type,
-         typename EngineType        = std::default_random_engine>
-class random_t {
-public:
-    typedef SampleType          sample;
-    typedef DistributionType    distr_type;
-    typedef EngineType          engine_type;
-
-    random_t()
-    : m_distribution()
-    , m_engine( std::random_device()() )
-    {}
-    explicit random_t( distr_type&& d )
-    : m_distribution( std::forward<distr_type>(d) )
-    , m_engine( std::random_device()() ){}
-    random_t( engine_type&& e, distr_type&& d )
-    : m_distribution( std::forward<distr_type>(d) )
-    , m_engine( std::forward<engine_type>(e) ){}
-
-    // Generator interface
-    data::size_t        capacity() const    { return BOOST_TEST_DS_INFINITE_SIZE; }
-    SampleType          next() 
-    {
-        return m_distribution( m_engine );
-    }
-    void                reset()             {}
-    
-    //! Sets the seed of the pseudo-random number engine.
-    template<typename SeedType>
-    void seed( SeedType&& seed )            { m_engine.seed( std::forward<SeedType>( seed ) ); }
-
-private:
-    // Data members
-    DistributionType    m_distribution;
-    EngineType          m_engine;
-};
-
-//____________________________________________________________________________//
-
-} // namespace monomorphic
-
-
-//! @brief Returns an infinite sequence of random numbers. 
-//!
-//! The following overloads are available:
-//! @code
-//! auto d = random();
-//! auto d = random(begin, end);
-//! auto d = random(params);
-//! @endcode
-//! 
-//!   
-//! - The first overload uses the default distribution, which is uniform and which elements 
-//!   are @c double type (the values are in [0, 1) ). 
-//! - The second overload generates numbers in the given interval. The distribution is uniform (in [begin, end) 
-//!   for real numbers, and in [begin, end] for integers). The type of the distribution is deduced from the type
-//!   of the @c begin and @c end parameters.
-//! - The third overload generates numbers using the named parameter inside @c params , which are:
-//!   - @c distribution: the distribution used. In this overload, since the type of the samples cannot be deduced, 
-//!     the samples are of type @c double and the distribution is uniform real in [0, 1).
-//!   - @c seed: the seed for generating the values
-//!   - @c engine: the random number generator engine
-//!
-//! The function returns an object that implements the dataset API.
-//! @note This function is available only for C++11 capable compilers.
-inline monomorphic::generated_by< monomorphic::random_t<>> random()
-{
-    return monomorphic::generated_by<monomorphic::random_t<>>( monomorphic::random_t<>() );
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::random()
-template<typename SampleType>
-inline monomorphic::generated_by< monomorphic::random_t<SampleType>>
-random( SampleType begin, SampleType end )
-{
-    typedef monomorphic::random_t<SampleType> Gen;
-    typedef typename Gen::distr_type distr_type;
-    return monomorphic::generated_by<Gen>( Gen( distr_type(begin,end) ) );
-}
-
-//____________________________________________________________________________//
-
-namespace ds_detail {
-template<typename Params>
-struct random_gen_type {
-    typedef typename nfp::param_type<Params,decltype(distribution),std::uniform_real_distribution<>>::type distr_type;
-    typedef typename nfp::param_type<Params,decltype(engine),std::default_random_engine>::type engine_type;
-    typedef typename distr_type::result_type sample_type;
-
-    typedef monomorphic::random_t<sample_type,distr_type,engine_type> type;
-};
-
-}
-
-
-/// @overload boost::unit_test::data::random()
-template<typename Params>
-inline monomorphic::generated_by<typename ds_detail::random_gen_type<Params>::type>
-random( Params const& params )
-{
-    typedef typename ds_detail::random_gen_type<Params>::type Gen;
-    typedef typename Gen::distr_type distr_type;
-    typedef typename Gen::engine_type engine_type;
-
-    std::random_device rd;
-    engine_type E;
-//    engine_type E( rd );
-    if( params.has(engine) )
-        E = params[engine];
-
-    distr_type D;
-    if( params.has(distribution) )
-        D = params[distribution];
-
-    Gen G( std::move(E), std::move(D) );
-
-    if( params.has(seed) )
-        G.seed( params[seed] );
-
-    return monomorphic::generated_by<Gen>( std::move(G) );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_NO_RANDOM_DATASET_AVAILABLE
-
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_RANDOM_HPP_101512GER
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/generators/xrange.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/generators/xrange.hpp
deleted file mode 100644
index 02da352adf..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/generators/xrange.hpp
+++ /dev/null
@@ -1,224 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-///Defines range generator
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_XRANGE_HPP_112011GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_XRANGE_HPP_112011GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-#include <boost/test/data/monomorphic/generators/keywords.hpp>
-#include <boost/test/data/monomorphic/generate.hpp>
-
-// Boost
-#include <boost/optional.hpp>
-#include <boost/utility/enable_if.hpp>
-#include <boost/type_traits/is_unsigned.hpp>
-
-// STL
-#include <limits>
-#include <cmath>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************             monomorphic::xrange_t            ************** //
-// ************************************************************************** //
-
-
-/*!@brief Generator for the range sequences
- *
- * This class implements the generator concept (see @ref boost::unit_test::data::monomorphic::generated_by) for implementing
- * a range like sequence of numbers.
- */
-template<typename SampleType, typename StepType=SampleType>
-class xrange_t {
-public:
-    typedef SampleType sample;
-
-    xrange_t( SampleType const& begin_, StepType const& step_, data::size_t size_ )
-    : m_begin( begin_ )
-    , m_curr( begin_ )
-    , m_step( step_ )
-    , m_index( 0 )
-    , m_size( size_ )
-    {}
-
-    // Generator interface
-    data::size_t    capacity() const { return m_size; }
-    SampleType      next()
-    {
-        if( m_index == m_size )
-            return m_curr;
-
-        SampleType res = m_curr;
-
-        m_curr += m_step;
-        ++m_index;
-
-        return res;
-    }
-    void                reset()
-    {
-        m_curr  = m_begin;
-        m_index = 0;
-    }
-
-private:
-    // Data members
-    SampleType      m_begin;
-    SampleType      m_curr;
-    StepType        m_step;
-    data::size_t    m_index;
-    data::size_t    m_size;
-};
-
-//____________________________________________________________________________//
-
-namespace ds_detail {
-
-template<typename SampleType, typename StepType=SampleType>
-struct make_xrange {
-    static StepType    abs( StepType s, boost::true_type* )   { return s; }
-    static StepType    abs( StepType s, boost::false_type* )  { return std::abs(s); }
-
-    typedef xrange_t<SampleType, StepType> range_gen;
-
-    template<typename Params>
-    static generated_by<range_gen>
-    _( Params const& params )
-    {
-        SampleType           begin_val  = params.has( data::begin )  ? params[data::begin] : SampleType();
-        optional<SampleType> end_val    = params.has( data::end )    ? params[data::end]   : optional<SampleType>();
-        StepType             step_val   = params.has( data::step )   ? params[data::step]  : 1;
-
-        BOOST_TEST_DS_ASSERT( step_val != 0, "Range step can't be zero" );
-
-        data::size_t size;
-        if( !end_val.is_initialized() )
-            size = BOOST_TEST_DS_INFINITE_SIZE;
-        else {
-            BOOST_TEST_DS_ASSERT( (step_val < 0) ^ (begin_val < *end_val), "Invalid step direction" );
-
-            SampleType  abs_distance    = step_val < 0 ? begin_val - *end_val : *end_val-begin_val;
-            StepType    abs_step        = make_xrange::abs(step_val, (typename boost::is_unsigned<StepType>::type*)0 );
-            std::size_t s = static_cast<std::size_t>(abs_distance/abs_step);
-
-            if( static_cast<SampleType>(s*abs_step) < abs_distance )
-                s++;
-
-            size = s;
-        }
-
-        return generated_by<range_gen>( range_gen( begin_val, step_val, size ) );
-    }
-};
-
-} // namespace ds_detail
-} // namespace monomorphic
-
-//____________________________________________________________________________//
-
-//! Creates a range (sequence) dataset.
-//!
-//! The following overloads are available:
-//! @code
-//! auto d = xrange();
-//! auto d = xrange(end_val);
-//! auto d = xrange(end_val, param);
-//! auto d = xrange(begin_val, end_val);
-//! auto d = xrange(begin_val, end_val, step_val);
-//! auto d = xrange(param);
-//! @endcode
-//!
-//! - @c begin_val indicates the start of the sequence (default to 0).
-//! - @c end_val is the end of the sequence. If ommited, the dataset has infinite size.\n
-//! - @c step_val is the step between two consecutive elements of the sequence, and defaults to 1.\n
-//! - @c param is the named parameters that describe the sequence. The following parameters are accepted:
-//!   - @c begin: same meaning @c begin_val
-//!   - @c end: same meaning as @c end_val
-//!   - @c step: same meaning as @c step_val
-//!
-//!
-//! The returned value is an object that implements the dataset API.
-//!
-//! @note the step size cannot be null, and it should be positive if @c begin_val < @c end_val, negative otherwise.
-template<typename SampleType, typename Params>
-inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>>
-xrange( Params const& params )
-{
-    return monomorphic::ds_detail::make_xrange<SampleType>::_( params );
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::xrange()
-template<typename SampleType>
-inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>>
-xrange( SampleType const& end_val )
-{
-    return monomorphic::ds_detail::make_xrange<SampleType>::_( data::end=end_val );
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::xrange()
-template<typename SampleType, typename Params>
-inline typename enable_if_c<nfp::is_named_param_pack<Params>::value,
-                            monomorphic::generated_by<monomorphic::xrange_t<SampleType>>>::type
-xrange( SampleType const& end_val, Params const& params )
-{
-    return monomorphic::ds_detail::make_xrange<SampleType>::_(( params, data::end=end_val ));
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::xrange()
-template<typename SampleType>
-inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>>
-xrange( SampleType const& begin_val, SampleType const& end_val )
-{
-    return monomorphic::ds_detail::make_xrange<SampleType>::_((
-                data::begin=begin_val,
-                data::end=end_val ));
-}
-
-//____________________________________________________________________________//
-
-
-
-/// @overload boost::unit_test::data::xrange()
-template<typename SampleType,typename StepType>
-inline monomorphic::generated_by<monomorphic::xrange_t<SampleType>>
-xrange( SampleType const& begin_val, SampleType const& end_val, StepType const& step_val )
-{
-    return monomorphic::ds_detail::make_xrange<SampleType,StepType>::_(( 
-                data::begin=begin_val, 
-                data::end=end_val,
-                data::step=step_val ));
-}
-
-//____________________________________________________________________________//
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GENERATORS_XRANGE_HPP_112011GER
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/grid.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/grid.hpp
deleted file mode 100644
index 2cf66189a0..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/grid.hpp
+++ /dev/null
@@ -1,183 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-/// Defines monomorphic dataset n+m dimentional *. Samples in this
-/// dataset is grid of elements in DataSet1 and DataSet2. There will be total
-/// |DataSet1| * |DataSet2| samples
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_GRID_HPP_101512GER
-#define BOOST_TEST_DATA_MONOMORPHIC_GRID_HPP_101512GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-#if !defined(BOOST_TEST_NO_GRID_COMPOSITION_AVAILABLE) || defined(BOOST_TEST_DOXYGEN_DOC__)
-
-#include <boost/test/data/monomorphic/fwd.hpp>
-#include <boost/test/data/monomorphic/sample_merge.hpp>
-
-#include <boost/mpl/identity.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                       grid                    ************** //
-// ************************************************************************** //
-
-
-//! Implements the dataset resulting from a cartesian product/grid operation on datasets.
-//!
-//! The arity of the resulting dataset is the sum of the arity of its operands.
-template<typename DataSet1, typename DataSet2>
-class grid {
-    typedef typename boost::decay<DataSet1>::type   dataset1_decay;
-    typedef typename boost::decay<DataSet2>::type   dataset2_decay;
-
-    typedef typename dataset1_decay::iterator       dataset1_iter;
-    typedef typename dataset2_decay::iterator       dataset2_iter;
-
-public:
-
-    struct iterator {
-        // Constructor
-        explicit    iterator( dataset1_iter iter1, DataSet2 const& ds2 )
-        : m_iter1( std::move( iter1 ) )
-        , m_iter2( std::move( ds2.begin() ) )
-        , m_ds2( &ds2 )
-        , m_ds2_pos( 0 )
-        {}
-
-        using iterator_sample = decltype(
-            sample_merge( *std::declval<dataset1_iter>(),
-                          *std::declval<dataset2_iter>()) );
-
-        // forward iterator interface
-        auto            operator*() const -> iterator_sample {
-            return sample_merge( *m_iter1, *m_iter2 );
-        }
-        void            operator++()
-        {
-            ++m_ds2_pos;
-            if( m_ds2_pos != m_ds2->size() )
-                ++m_iter2;
-            else {
-                m_ds2_pos = 0;
-                ++m_iter1;
-                m_iter2 = std::move( m_ds2->begin() );
-            }
-        }
-
-    private:
-        // Data members
-        dataset1_iter   m_iter1;
-        dataset2_iter   m_iter2;
-        dataset2_decay const* m_ds2;
-        data::size_t    m_ds2_pos;
-    };
-
-public:
-    enum { arity = boost::decay<DataSet1>::type::arity + boost::decay<DataSet2>::type::arity };
-
-    //! Constructor
-    grid( DataSet1&& ds1, DataSet2&& ds2 )
-    : m_ds1( std::forward<DataSet1>( ds1 ) )
-    , m_ds2( std::forward<DataSet2>( ds2 ) )
-    {}
-
-    //! Move constructor
-    grid( grid&& j )
-    : m_ds1( std::forward<DataSet1>( j.m_ds1 ) )
-    , m_ds2( std::forward<DataSet2>( j.m_ds2 ) )
-    {}
-
-    // dataset interface
-    data::size_t    size() const    { return m_ds1.size() * m_ds2.size(); }
-    iterator        begin() const   { return iterator( m_ds1.begin(), m_ds2 ); }
-
-private:
-    // Data members
-    DataSet1             m_ds1;
-    DataSet2             m_ds2;
-};
-
-//____________________________________________________________________________//
-
-// A grid dataset is a dataset
-template<typename DataSet1, typename DataSet2>
-struct is_dataset<grid<DataSet1,DataSet2>> : mpl::true_ {};
-
-//____________________________________________________________________________//
-
-namespace result_of {
-
-/// Result type of the grid operation on dataset.
-template<typename DS1Gen, typename DS2Gen>
-struct grid {
-    typedef monomorphic::grid<typename DS1Gen::type,typename DS2Gen::type> type;
-};
-
-} // namespace result_of
-
-//____________________________________________________________________________//
-
-//! Grid operation
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::grid<mpl::identity<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator*( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    BOOST_TEST_DS_ASSERT( !ds1.size().is_inf() && !ds2.size().is_inf(), "Grid axes can't have infinite size" );
-
-    return grid<DataSet1,DataSet2>( std::forward<DataSet1>( ds1 ),  std::forward<DataSet2>( ds2 ) );
-}
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::operator*
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && !is_dataset<DataSet2>::value,
-                                        result_of::grid<mpl::identity<DataSet1>,data::result_of::make<DataSet2>>
->::type
-operator*( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return std::forward<DataSet1>(ds1) * data::make(std::forward<DataSet2>(ds2));
-}
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::operator*
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<!is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::grid<data::result_of::make<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator*( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return data::make(std::forward<DataSet1>(ds1)) * std::forward<DataSet2>(ds2);
-}
-
-} // namespace monomorphic
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_NO_GRID_COMPOSITION_AVAILABLE
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_GRID_HPP_101512GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/initializer_list.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/initializer_list.hpp
deleted file mode 100644
index 3221597396..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/initializer_list.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-///@file
-///Defines monomorphic dataset based on C++11 initializer_list template
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_INITIALIZATION_LIST_HPP_091515GER
-#define BOOST_TEST_DATA_MONOMORPHIC_INITIALIZATION_LIST_HPP_091515GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                     array                    ************** //
-// ************************************************************************** //
-
-/// Dataset view of a C array
-template<typename T>
-class init_list {
-public:
-    typedef T sample;
-
-    enum { arity = 1 };
-
-    typedef T const* iterator;
-
-    //! Constructor swallows initializer_list
-    init_list( std::initializer_list<T>&& il )
-    : m_data( std::forward<std::initializer_list<T>>( il ) )
-    {}
-
-    //! dataset interface
-    data::size_t    size() const    { return m_data.size(); }
-    iterator        begin() const   { return m_data.begin(); }
-
-private:
-    // Data members
-    std::initializer_list<T> m_data;    
-};
-
-//____________________________________________________________________________//
-
-//! An array dataset is a dataset
-template<typename T>
-struct is_dataset<init_list<T>> : mpl::true_ {};
-
-} // namespace monomorphic
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::make()
-template<typename T>
-inline monomorphic::init_list<T>
-make( std::initializer_list<T>&& il )
-{
-    return monomorphic::init_list<T>( std::forward<std::initializer_list<T>>( il ) );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_INITIALIZATION_LIST_HPP_091515GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/join.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/join.hpp
deleted file mode 100644
index f817994dd3..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/join.hpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//! @file
-//! Defines dataset join operation
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_JOIN_HPP_112711GER
-#define BOOST_TEST_DATA_MONOMORPHIC_JOIN_HPP_112711GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                      join                    ************** //
-// ************************************************************************** //
-
-//! Defines a new dataset from the concatenation of two datasets
-//!
-//! The size of the resulting dataset is the sum of the two underlying datasets. The arity of the datasets
-//! should match.
-template<typename DataSet1, typename DataSet2>
-class join {
-    typedef typename boost::decay<DataSet1>::type   dataset1_decay;
-    typedef typename boost::decay<DataSet2>::type   dataset2_decay;
-
-    typedef typename dataset1_decay::iterator       dataset1_iter;
-    typedef typename dataset2_decay::iterator       dataset2_iter;
-public:
-    typedef typename dataset1_decay::sample         sample;
-
-    enum { arity = dataset1_decay::arity };
-
-    struct iterator {
-        // Constructor
-        explicit    iterator( dataset1_iter it1, dataset2_iter it2, data::size_t first_size )
-        : m_it1( std::move( it1 ) )
-        , m_it2( std::move( it2 ) )
-        , m_first_size( first_size )
-        {}
-
-        // forward iterator interface
-        sample const&       operator*() const   { return m_first_size > 0 ? *m_it1 : *m_it2; }
-        void                operator++()        { if( m_first_size > 0 ) { --m_first_size; ++m_it1; } else ++m_it2; }
-
-    private:
-        // Data members
-        dataset1_iter       m_it1;
-        dataset2_iter       m_it2;
-        data::size_t        m_first_size;
-    };
-
-    //! Constructor 
-    join( DataSet1&& ds1, DataSet2&& ds2 )
-    : m_ds1( std::forward<DataSet1>( ds1 ) )
-    , m_ds2( std::forward<DataSet2>( ds2 ) )
-    {}
-
-    //! Move constructor
-    join( join&& j )
-    : m_ds1( std::forward<DataSet1>( j.m_ds1 ) )
-    , m_ds2( std::forward<DataSet2>( j.m_ds2 ) )
-    {}
-
-    //! dataset interface
-    data::size_t    size() const    { return m_ds1.size() + m_ds2.size(); }
-    iterator        begin() const   { return iterator( m_ds1.begin(), m_ds2.begin(), m_ds1.size() ); }
-
-private:
-    // Data members
-    DataSet1        m_ds1;
-    DataSet2        m_ds2;
-};
-
-//____________________________________________________________________________//
-
-// A joined dataset  is a dataset.
-template<typename DataSet1, typename DataSet2>
-struct is_dataset<join<DataSet1,DataSet2>> : mpl::true_ {};
-
-//____________________________________________________________________________//
-
-namespace result_of {
-
-//! Result type of the join operation on datasets.
-template<typename DataSet1Gen, typename DataSet2Gen>
-struct join {
-    typedef monomorphic::join<typename DataSet1Gen::type,typename DataSet2Gen::type> type;
-};
-
-} // namespace result_of
-
-//____________________________________________________________________________//
-
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::join<mpl::identity<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator+( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return join<DataSet1,DataSet2>( std::forward<DataSet1>( ds1 ),  std::forward<DataSet2>( ds2 ) );
-}
-
-//____________________________________________________________________________//
-
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && !is_dataset<DataSet2>::value,
-                                        result_of::join<mpl::identity<DataSet1>,data::result_of::make<DataSet2>>
->::type
-operator+( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return std::forward<DataSet1>( ds1 ) + data::make( std::forward<DataSet2>( ds2 ) );
-}
-
-//____________________________________________________________________________//
-
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<!is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::join<data::result_of::make<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator+( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return data::make( std::forward<DataSet1>(ds1) ) + std::forward<DataSet2>( ds2 );
-}
-
-} // namespace monomorphic
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_JOIN_HPP_112711GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/sample_merge.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/sample_merge.hpp
deleted file mode 100644
index d7535beff7..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/sample_merge.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines helper routines and types for merging monomorphic samples
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_SAMPLE_MERGE_HPP
-#define BOOST_TEST_DATA_MONOMORPHIC_SAMPLE_MERGE_HPP
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/index_sequence.hpp>
-
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-//____________________________________________________________________________//
-
-namespace ds_detail {
-
-template <class T>
-struct is_tuple : std::false_type {};
-
-template <class ...T>
-struct is_tuple<std::tuple<T...>> : std::true_type {};
-
-template <class T>
-struct is_tuple<T&&> : is_tuple<typename std::decay<T>::type> {};
-
-template <class T>
-struct is_tuple<T&> : is_tuple<typename std::decay<T>::type> {};
-
-template<typename T>
-inline auto as_tuple_impl_xvalues( T const & arg, std::false_type  /* is_rvalue_ref */ )
-  -> decltype(std::tuple<T const&>(arg)) {
-    //return std::tuple<T const&>(arg);
-    return std::forward_as_tuple(arg);
-}
-
-template<typename T>
-inline auto as_tuple_impl_xvalues( T && arg, std::true_type  /* is_rvalue_ref */ )
-  -> decltype(std::make_tuple(std::forward<T>(arg))) {
-    return std::make_tuple(std::forward<T>(arg));
-}
-
-
-template<typename T>
-inline auto as_tuple_impl( T && arg, std::false_type  /* is_tuple = nullptr */ )
-  -> decltype(as_tuple_impl_xvalues(std::forward<T>(arg),
-              typename std::is_rvalue_reference<T&&>::type())) {
-    return as_tuple_impl_xvalues(std::forward<T>(arg),
-                                 typename std::is_rvalue_reference<T&&>::type());
-}
-
-//____________________________________________________________________________//
-
-template<typename T>
-inline T &&
-as_tuple_impl(T && arg, std::true_type  /* is_tuple */ ) {
-    return std::forward<T>(arg);
-}
-
-template<typename T>
-inline auto as_tuple( T && arg )
-  -> decltype( as_tuple_impl(std::forward<T>(arg),
-                             typename ds_detail::is_tuple<T>::type()) ) {
-  return as_tuple_impl(std::forward<T>(arg),
-                       typename ds_detail::is_tuple<T>::type());
-}
-
-//____________________________________________________________________________//
-
-} // namespace ds_detail
-
-template<typename T1, typename T2>
-inline auto
-sample_merge( T1 && a1, T2 && a2 )
-    -> decltype( std::tuple_cat(ds_detail::as_tuple(std::forward<T1>(a1)),
-                                ds_detail::as_tuple(std::forward<T2>(a2)) ) ) {
-    return std::tuple_cat(ds_detail::as_tuple(std::forward<T1>(a1)),
-                          ds_detail::as_tuple(std::forward<T2>(a2)));
-}
-
-} // namespace monomorphic
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_SAMPLE_MERGE_HPP
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/singleton.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/singleton.hpp
deleted file mode 100644
index b0abd0eabb..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/singleton.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines single element monomorphic dataset
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_SINGLETON_HPP_102211GER
-#define BOOST_TEST_DATA_MONOMORPHIC_SINGLETON_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/monomorphic/fwd.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                    singleton                  ************** //
-// ************************************************************************** //
-
-/// Models a single element data set
-template<typename T>
-class singleton {
-public:
-    typedef typename boost::decay<T>::type sample;
-
-    enum { arity = 1 };
-
-    struct iterator {
-        // Constructor
-        explicit            iterator( singleton<T> const* owner ) 
-        : m_owner( owner ) 
-        {}
-
-        // forward iterator interface 
-        sample const&       operator*() const   { return m_owner->value(); }
-        void                operator++() {}
-
-    private:
-        singleton<T> const* m_owner;
-    };
-
-    //! Constructor
-    explicit        singleton( T&& value ) : m_value( std::forward<T>( value ) ) {}
-
-    //! Move constructor
-    singleton( singleton&& s ) : m_value( std::forward<T>( s.m_value ) ) {}
-
-    //! Value access method
-    T const&        value() const   { return m_value; }
-
-    //! dataset interface
-    data::size_t    size() const    { return 1; }
-    iterator        begin() const   { return iterator( this ); }
-
-private:
-    // Data members
-    T               m_value;
-};
-
-//____________________________________________________________________________//
-
-// a singleton is a dataset
-template<typename T>
-struct is_dataset<singleton<T>> : mpl::true_ {};
-
-//____________________________________________________________________________//
-
-} // namespace monomorphic
-
-/// @overload boost::unit_test::data::make()
-template<typename T>
-inline typename std::enable_if<!is_container_forward_iterable<T>::value && 
-                               !monomorphic::is_dataset<T>::value &&
-                               !boost::is_array<typename boost::remove_reference<T>::type>::value, 
-                               monomorphic::singleton<T>
->::type
-make( T&& v )
-{
-    return monomorphic::singleton<T>( std::forward<T>( v ) );
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::make
-inline monomorphic::singleton<char*>
-make( char* str )
-{
-    return monomorphic::singleton<char*>( std::move(str) );
-}
-
-//____________________________________________________________________________//
-
-/// @overload boost::unit_test::data::make
-inline monomorphic::singleton<char const*>
-make( char const* str )
-{
-    return monomorphic::singleton<char const*>( std::move(str) );
-}
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_SINGLETON_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/monomorphic/zip.hpp b/contrib/restricted/boost/boost/test/data/monomorphic/zip.hpp
deleted file mode 100644
index 5fc65d0e20..0000000000
--- a/contrib/restricted/boost/boost/test/data/monomorphic/zip.hpp
+++ /dev/null
@@ -1,194 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// Defines monomorphic dataset based on zipping of 2 other monomorphic datasets
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_MONOMORPHIC_ZIP_HPP_102211GER
-#define BOOST_TEST_DATA_MONOMORPHIC_ZIP_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-#if !defined(BOOST_TEST_NO_ZIP_COMPOSITION_AVAILABLE) || defined(BOOST_TEST_DOXYGEN_DOC__)
-
-#include <boost/test/data/monomorphic/fwd.hpp>
-#include <boost/test/data/monomorphic/sample_merge.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-
-namespace boost {
-namespace unit_test {
-namespace data {
-namespace monomorphic {
-
-// ************************************************************************** //
-// **************                       zip                    ************** //
-// ************************************************************************** //
-
-//! Zip datasets
-//!
-//! A zip of two datasets is a dataset whose arity is the sum of the operand datasets arity. The size is given by
-//! the function creating the instance (see @c operator^ on datasets).
-template<typename DataSet1, typename DataSet2>
-class zip {
-    typedef typename boost::decay<DataSet1>::type   dataset1_decay;
-    typedef typename boost::decay<DataSet2>::type   dataset2_decay;
-
-    typedef typename dataset1_decay::iterator       dataset1_iter;
-    typedef typename dataset2_decay::iterator       dataset2_iter;
-
-public:
-    enum { arity = dataset1_decay::arity + dataset2_decay::arity };
-
-    struct iterator {
-        // Constructor
-        explicit    iterator( dataset1_iter iter1, dataset2_iter iter2 )
-        : m_iter1( std::move( iter1 ) )
-        , m_iter2( std::move( iter2 ) )
-        {}
-
-        using iterator_sample = decltype(
-            sample_merge( *std::declval<dataset1_iter>(),
-                          *std::declval<dataset2_iter>()) );
-
-        // forward iterator interface
-        auto            operator*() const -> iterator_sample {
-            return sample_merge( *m_iter1, *m_iter2 );
-        }
-        void            operator++()        { ++m_iter1; ++m_iter2; }
-
-    private:
-        // Data members
-        dataset1_iter   m_iter1;
-        dataset2_iter   m_iter2;
-    };
-
-    typedef typename iterator::iterator_sample   sample;
-
-    //! Constructor
-    //!
-    //! The datasets are moved and not copied.
-    zip( DataSet1&& ds1, DataSet2&& ds2, data::size_t size )
-    : m_ds1( std::forward<DataSet1>( ds1 ) )
-    , m_ds2( std::forward<DataSet2>( ds2 ) )
-    , m_size( size )
-    {}
-
-    //! Move constructor
-    zip( zip&& j )
-    : m_ds1( std::forward<DataSet1>( j.m_ds1 ) )
-    , m_ds2( std::forward<DataSet2>( j.m_ds2 ) )
-    , m_size( j.m_size )
-    {}
-
-    // dataset interface
-    data::size_t    size() const    { return m_size; }
-    iterator        begin() const   { return iterator( m_ds1.begin(), m_ds2.begin() ); }
-
-private:
-    // Data members
-    DataSet1        m_ds1;
-    DataSet2        m_ds2;
-    data::size_t    m_size;
-};
-
-//____________________________________________________________________________//
-
-//! Zipped datasets results in a dataset.
-template<typename DataSet1, typename DataSet2>
-struct is_dataset<zip<DataSet1,DataSet2>> : mpl::true_ {};
-
-//____________________________________________________________________________//
-
-namespace ds_detail {
-
-//! Handles the sise of the resulting zipped dataset.
-template<typename DataSet1, typename DataSet2>
-inline data::size_t
-zip_size( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    data::size_t ds1_size = ds1.size();
-    data::size_t ds2_size = ds2.size();
-
-    if( ds1_size == ds2_size )
-        return ds1_size;
-
-    if( ds1_size == 1 || ds1_size.is_inf() )
-        return ds2_size;
-
-    if( ds2_size == 1  || ds2_size.is_inf() )
-        return ds1_size;
-
-    BOOST_TEST_DS_ERROR( "Can't zip datasets of different sizes" );
-}
-
-} // namespace ds_detail
-
-//____________________________________________________________________________//
-
-namespace result_of {
-
-//! Result type of the zip operator.
-template<typename DS1Gen, typename DS2Gen>
-struct zip {
-    typedef monomorphic::zip<typename DS1Gen::type,typename DS2Gen::type> type;
-};
-
-} // namespace result_of
-
-//____________________________________________________________________________//
-
-//! Overload operator for zip support
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::zip<mpl::identity<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator^( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return zip<DataSet1,DataSet2>( std::forward<DataSet1>( ds1 ),
-                                   std::forward<DataSet2>( ds2 ),
-                                   ds_detail::zip_size( ds1, ds2 ) );
-}
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::monomorphic::operator^()
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<is_dataset<DataSet1>::value && !is_dataset<DataSet2>::value,
-                                        result_of::zip<mpl::identity<DataSet1>,data::result_of::make<DataSet2>>
->::type
-operator^( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return std::forward<DataSet1>( ds1 ) ^ data::make( std::forward<DataSet2>( ds2 ) );
-}
-
-//____________________________________________________________________________//
-
-//! @overload boost::unit_test::data::monomorphic::operator^()
-template<typename DataSet1, typename DataSet2>
-inline typename boost::lazy_enable_if_c<!is_dataset<DataSet1>::value && is_dataset<DataSet2>::value,
-                                        result_of::zip<data::result_of::make<DataSet1>,mpl::identity<DataSet2>>
->::type
-operator^( DataSet1&& ds1, DataSet2&& ds2 )
-{
-    return data::make( std::forward<DataSet1>( ds1 ) ) ^ std::forward<DataSet2>( ds2 );
-}
-
-} // namespace monomorphic
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_NO_ZIP_COMPOSITION_AVAILABLE
-
-#endif // BOOST_TEST_DATA_MONOMORPHIC_ZIP_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/size.hpp b/contrib/restricted/boost/boost/test/data/size.hpp
deleted file mode 100644
index 3e9ba96795..0000000000
--- a/contrib/restricted/boost/boost/test/data/size.hpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief simple dataset size abstraction (can be infinite)
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_SIZE_HPP_102211GER
-#define BOOST_TEST_DATA_SIZE_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-
-// STL
-#include <iosfwd>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-// ************************************************************************** //
-// **************                    size_t                    ************** //
-// ************************************************************************** //
-
-//! Utility for handling the size of a datasets
-class size_t {
-    struct dummy { void nonnull() {} };
-    typedef void (dummy::*safe_bool)();
-public:
-    // Constructors
-    size_t( std::size_t s = 0 )         : m_value( s ), m_infinity( false ) {}
-    explicit        size_t( bool )      : m_value( 0 ), m_infinity( true ) {}
-    template<typename T>
-    size_t( T v )                       : m_value( static_cast<std::size_t>(v) ), m_infinity( false ) {}
-
-    // Access methods
-    std::size_t     value() const       { return m_value; }
-    bool            is_inf() const      { return m_infinity; }
-    operator        safe_bool() const   { return is_inf() || m_value != 0 ? &dummy::nonnull : 0; }
-
-    // Unary operators
-    data::size_t    operator--()        { if( !is_inf() ) m_value--; return *this; }
-    data::size_t    operator--(int)     { data::size_t res(*this); if( !is_inf() ) m_value--; return res; }
-    data::size_t    operator++()        { if( !is_inf() ) m_value++; return *this; }
-    data::size_t    operator++(int)     { data::size_t res(*this); if( !is_inf() ) m_value++; return res; }
-
-    // Binary operators
-    data::size_t&   operator+=( std::size_t rhs ) { if( !is_inf() ) m_value += rhs; return *this; }
-    data::size_t&   operator+=( data::size_t rhs )
-    {
-        if( !is_inf() ) {
-            if( rhs.is_inf() )
-                *this = rhs;
-            else
-                m_value += rhs.value();
-        }
-        return *this;
-    }
-    data::size_t&   operator-=( std::size_t rhs ) { if( !is_inf() ) m_value -= rhs; return *this; }
-    data::size_t&   operator-=( data::size_t rhs )
-    {
-        if( !is_inf() ) {
-            if( value() < rhs.value() )
-                m_value = 0;
-            else
-                m_value -= rhs.value();
-        }
-        return *this;
-    }
-
-private:
-    // Data members
-    std::size_t     m_value;
-    bool            m_infinity;
-};
-
-namespace { const data::size_t BOOST_TEST_DS_INFINITE_SIZE( true ); }
-
-//____________________________________________________________________________//
-
-// Binary operators
-inline bool operator>(data::size_t lhs, std::size_t rhs)    { return lhs.is_inf()  || (lhs.value() > rhs); }
-inline bool operator>(std::size_t lhs, data::size_t rhs)    { return !rhs.is_inf() && (lhs > rhs.value()); }
-inline bool operator>(data::size_t lhs, data::size_t rhs)   { return lhs.is_inf() ^ rhs.is_inf() ? lhs.is_inf() : lhs.value() > rhs.value(); }
-
-inline bool operator>=(data::size_t lhs, std::size_t rhs )  { return lhs.is_inf()  || (lhs.value() >= rhs); }
-inline bool operator>=(std::size_t lhs, data::size_t rhs)   { return !rhs.is_inf() && (lhs >= rhs.value()); }
-inline bool operator>=(data::size_t lhs, data::size_t rhs)  { return lhs.is_inf() ^ rhs.is_inf() ? lhs.is_inf() : lhs.value() >= rhs.value(); }
-
-inline bool operator<(data::size_t lhs, std::size_t rhs)    { return !lhs.is_inf() && (lhs.value() < rhs); }
-inline bool operator<(std::size_t lhs, data::size_t rhs)    { return rhs.is_inf()  || (lhs < rhs.value()); }
-inline bool operator<(data::size_t lhs, data::size_t rhs)   { return lhs.is_inf() ^ rhs.is_inf() ? rhs.is_inf() : lhs.value() < rhs.value(); }
-
-inline bool operator<=(data::size_t lhs, std::size_t rhs)   { return !lhs.is_inf() && (lhs.value() <= rhs); }
-inline bool operator<=(std::size_t lhs, data::size_t rhs)   { return rhs.is_inf()  || (lhs <= rhs.value()); }
-inline bool operator<=(data::size_t lhs, data::size_t rhs)  { return lhs.is_inf() ^ rhs.is_inf() ? rhs.is_inf() : lhs.value() <= rhs.value(); }
-
-inline bool operator==(data::size_t lhs, std::size_t rhs)   { return !lhs.is_inf() && (lhs.value() == rhs); }
-inline bool operator==(std::size_t lhs, data::size_t rhs)   { return !rhs.is_inf() && (lhs == rhs.value()); }
-inline bool operator==(data::size_t lhs, data::size_t rhs)  { return !(lhs.is_inf() ^ rhs.is_inf()) && lhs.value() == rhs.value(); }
-
-inline bool operator!=(data::size_t lhs, std::size_t rhs)   { return lhs.is_inf() || (lhs.value() != rhs); }
-inline bool operator!=(std::size_t lhs, data::size_t rhs)   { return rhs.is_inf() || (lhs != rhs.value()); }
-inline bool operator!=(data::size_t lhs, data::size_t rhs)  { return lhs.is_inf() ^ rhs.is_inf() || lhs.value() != rhs.value(); }
-
-inline data::size_t operator+(data::size_t lhs, std::size_t rhs)  { return lhs.is_inf() ? lhs : data::size_t( lhs.value()+rhs ); }
-inline data::size_t operator+(std::size_t lhs, data::size_t rhs)  { return rhs.is_inf() ? rhs : data::size_t( lhs+rhs.value() ); }
-inline data::size_t operator+(data::size_t lhs, data::size_t rhs) { return lhs.is_inf() || rhs.is_inf() ? data::size_t(true) : data::size_t( lhs.value()+rhs.value() ); }
-
-inline data::size_t operator*(data::size_t lhs, std::size_t rhs)  { return lhs.is_inf() ? lhs : data::size_t( lhs.value()*rhs ); }
-inline data::size_t operator*(std::size_t lhs, data::size_t rhs)  { return rhs.is_inf() ? rhs : data::size_t( lhs*rhs.value() ); }
-inline data::size_t operator*(data::size_t lhs, data::size_t rhs) { return lhs.is_inf() || rhs.is_inf() ? data::size_t(true) : data::size_t( lhs.value()*rhs.value() ); }
-
-//____________________________________________________________________________//
-
-template<typename CharT1, typename Tr>
-inline std::basic_ostream<CharT1,Tr>&
-operator<<( std::basic_ostream<CharT1,Tr>& os, data::size_t const& s )
-{
-    if( s.is_inf() )
-        os << "infinity";
-    else
-        os << s.value();
-
-    return os;
-}
-
-//____________________________________________________________________________//
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_SIZE_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/data/test_case.hpp b/contrib/restricted/boost/boost/test/data/test_case.hpp
deleted file mode 100644
index 01dc91b06a..0000000000
--- a/contrib/restricted/boost/boost/test/data/test_case.hpp
+++ /dev/null
@@ -1,325 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief test case family based on data generator
-// ***************************************************************************
-
-#ifndef BOOST_TEST_DATA_TEST_CASE_HPP_102211GER
-#define BOOST_TEST_DATA_TEST_CASE_HPP_102211GER
-
-// Boost.Test
-#include <boost/test/data/config.hpp>
-#include <boost/test/data/dataset.hpp>
-#include <boost/test/data/for_each_sample.hpp>
-#include <boost/test/tree/test_unit.hpp>
-
-// Boost
-#include <boost/preprocessor/repetition/enum_params.hpp>
-#include <boost/preprocessor/repetition/enum_binary_params.hpp>
-#include <boost/preprocessor/repetition/repeat_from_to.hpp>
-
-#include <boost/preprocessor/variadic/to_seq.hpp>
-#include <boost/preprocessor/variadic/size.hpp>
-#include <boost/preprocessor/cat.hpp>
-#include <boost/preprocessor/seq/for_each_i.hpp>
-#include <boost/preprocessor/seq/for_each.hpp>
-#include <boost/preprocessor/seq/enum.hpp>
-#include <boost/preprocessor/control/iif.hpp>
-#include <boost/preprocessor/comparison/equal.hpp>
-
-#include <boost/bind.hpp>
-#include <boost/type_traits/is_copy_constructible.hpp>
-
-#include <boost/test/tools/detail/print_helper.hpp>
-#include <boost/test/utils/string_cast.hpp>
-
-#include <list>
-#include <string>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) \
-   && !defined(BOOST_TEST_DATASET_MAX_ARITY)
-# define BOOST_TEST_DATASET_MAX_ARITY 10
-#endif
-
-//____________________________________________________________________________//
-
-namespace boost {
-namespace unit_test {
-namespace data {
-
-namespace ds_detail {
-
-// ************************************************************************** //
-// **************                     seed                     ************** //
-// ************************************************************************** //
-
-struct seed {
-    template<typename DataSet>
-    typename data::result_of::make<DataSet>::type
-    operator->*( DataSet&& ds ) const
-    {
-        return data::make( std::forward<DataSet>( ds ) );
-    }
-};
-
-
-#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
-    !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
-    !defined(BOOST_NO_CXX11_DECLTYPE) && \
-    !defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES) && \
-    !defined(BOOST_NO_CXX11_SMART_PTR)
-
-#define BOOST_TEST_DATASET_VARIADIC
-template <class T>
-struct parameter_holder {
-    std::shared_ptr<T> value;
-
-    parameter_holder(T && value_)
-        : value(std::make_shared<T>(std::move(value_)))
-    {}
-
-    operator T const&() const {
-        return *value;
-    }
-};
-
-template <class T>
-parameter_holder<typename std::remove_reference<T>::type>
-boost_bind_rvalue_holder_helper_impl(T&& value, boost::false_type /* is copy constructible */) {
-    return parameter_holder<typename std::remove_reference<T>::type>(std::forward<T>(value));
-}
-
-template <class T>
-T&& boost_bind_rvalue_holder_helper_impl(T&& value, boost::true_type /* is copy constructible */) {
-    return std::forward<T>(value);
-}
-
-template <class T>
-auto boost_bind_rvalue_holder_helper(T&& value)
-  -> decltype(boost_bind_rvalue_holder_helper_impl(
-                  std::forward<T>(value),
-                  typename boost::is_copy_constructible<typename std::remove_reference<T>::type>::type()))
-{
-    // need to use boost::is_copy_constructible because std::is_copy_constructible is broken on MSVC12
-    return boost_bind_rvalue_holder_helper_impl(
-              std::forward<T>(value),
-              typename boost::is_copy_constructible<typename std::remove_reference<T>::type>::type());
-}
-
-#endif
-
-
-// ************************************************************************** //
-// **************                 test_case_gen                ************** //
-// ************************************************************************** //
-
-template<typename TestCase,typename DataSet>
-class test_case_gen : public test_unit_generator {
-public:
-    // Constructor
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    test_case_gen( const_string tc_name, const_string tc_file, std::size_t tc_line, DataSet&& ds )
-    : m_tc_name( ut_detail::normalize_test_case_name( tc_name ) )
-    , m_tc_file( tc_file )
-    , m_tc_line( tc_line )
-    , m_tc_index( 0 )
-    {
-        data::for_each_sample( std::forward<DataSet>( ds ), *this );
-    }
-    test_case_gen( test_case_gen&& gen )
-    : m_tc_name( gen.m_tc_name )
-    , m_tc_file( gen.m_tc_file )
-    , m_tc_line( gen.m_tc_line )
-    , m_tc_index( gen.m_tc_index )
-    , m_test_cases( std::move(gen.m_test_cases) )
-    {}
-#else
-    test_case_gen( const_string tc_name, const_string tc_file, std::size_t tc_line, DataSet const& ds )
-    : m_tc_name( ut_detail::normalize_test_case_name( tc_name ) )
-    , m_tc_file( tc_file )    
-    , m_tc_line( tc_line )
-    , m_tc_index( 0 )
-    {
-        data::for_each_sample( ds, *this );
-    }
-#endif
-
-    virtual test_unit* next() const
-    {
-        if( m_test_cases.empty() )
-            return 0;
-
-        test_unit* res = m_test_cases.front();
-        m_test_cases.pop_front();
-
-        return res;
-    }
-
-#if !defined(BOOST_TEST_DATASET_VARIADIC)
-    // see BOOST_TEST_DATASET_MAX_ARITY to increase the default supported arity
-    // there is also a limit on boost::bind
-#define TC_MAKE(z,arity,_)                                                              \
-    template<BOOST_PP_ENUM_PARAMS(arity, typename Arg)>                                 \
-    void    operator()( BOOST_PP_ENUM_BINARY_PARAMS(arity, Arg, const& arg) ) const     \
-    {                                                                                   \
-        m_test_cases.push_back( new test_case( genTestCaseName(), m_tc_file, m_tc_line, \
-           boost::bind( &TestCase::template test_method<BOOST_PP_ENUM_PARAMS(arity,Arg)>,\
-           BOOST_PP_ENUM_PARAMS(arity, arg) ) ) );                                      \
-    }                                                                                   \
-
-    BOOST_PP_REPEAT_FROM_TO(1, BOOST_TEST_DATASET_MAX_ARITY, TC_MAKE, _)
-#else
-    template<typename ...Arg>
-    void    operator()(Arg&& ... arg) const
-    {
-        m_test_cases.push_back(
-            new test_case( genTestCaseName(),
-                           m_tc_file,
-                           m_tc_line,
-                           std::bind( &TestCase::template test_method<Arg...>,
-                                      boost_bind_rvalue_holder_helper(std::forward<Arg>(arg))...)));
-    }
-#endif
-
-private:
-    std::string  genTestCaseName() const
-    {
-        return "_" + utils::string_cast(m_tc_index++);
-    }
-
-    // Data members
-    std::string                     m_tc_name;
-    const_string                    m_tc_file;
-    std::size_t                     m_tc_line;
-    mutable std::size_t             m_tc_index;
-    mutable std::list<test_unit*>   m_test_cases;
-};
-
-//____________________________________________________________________________//
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-template<typename TestCase,typename DataSet>
-test_case_gen<TestCase,DataSet>
-make_test_case_gen( const_string tc_name, const_string tc_file, std::size_t tc_line, DataSet&& ds )
-{
-    return test_case_gen<TestCase,DataSet>( tc_name, tc_file, tc_line, std::forward<DataSet>(ds) );
-}
-#else
-template<typename TestCase,typename DataSet>
-test_case_gen<TestCase,DataSet>
-make_test_case_gen( const_string tc_name, const_string tc_file, std::size_t tc_line, DataSet const& ds )
-{
-    return test_case_gen<TestCase,DataSet>( tc_name, tc_file, tc_line, ds );
-}
-#endif
-
-//____________________________________________________________________________//
-
-} // namespace ds_detail
-
-// ************************************************************************** //
-// **************             BOOST_DATA_TEST_CASE             ************** //
-// ************************************************************************** //
-
-#define BOOST_DATA_TEST_CASE_PARAM(r, _, i, param)  (BOOST_PP_CAT(Arg, i) const& param)
-#define BOOST_DATA_TEST_CONTEXT(r, _, param)  << BOOST_STRINGIZE(param) << " = " << boost::test_tools::tt_detail::print_helper(param) << "; "
-
-#define BOOST_DATA_TEST_CASE_PARAMS( params )                           \
-    BOOST_PP_SEQ_ENUM(                                                  \
-        BOOST_PP_SEQ_FOR_EACH_I(BOOST_DATA_TEST_CASE_PARAM, _, params)) \
-/**/
-
-#define BOOST_DATA_TEST_CASE_IMPL(arity, F, test_name, dataset, params) \
-struct BOOST_PP_CAT(test_name, case) : public F {                       \
-    template<BOOST_PP_ENUM_PARAMS(arity, typename Arg)>                 \
-    static void test_method( BOOST_DATA_TEST_CASE_PARAMS( params ) )    \
-    {                                                                   \
-        BOOST_TEST_CHECKPOINT('"' << #test_name << "\" fixture entry.");\
-        BOOST_PP_CAT(test_name, case) t;                                \
-        BOOST_TEST_CHECKPOINT('"' << #test_name << "\" entry.");        \
-        BOOST_TEST_CONTEXT( ""                                          \
-            BOOST_PP_SEQ_FOR_EACH(BOOST_DATA_TEST_CONTEXT, _, params))  \
-        t._impl(BOOST_PP_SEQ_ENUM(params));                             \
-        BOOST_TEST_CHECKPOINT('"' << #test_name << "\" exit.");         \
-    }                                                                   \
-private:                                                                \
-    template<BOOST_PP_ENUM_PARAMS(arity, typename Arg)>                 \
-    void _impl(BOOST_DATA_TEST_CASE_PARAMS( params ));                  \
-};                                                                      \
-                                                                        \
-BOOST_AUTO_TEST_SUITE( test_name )                                      \
-                                                                        \
-BOOST_AUTO_TU_REGISTRAR( BOOST_PP_CAT(test_name, case) )(               \
-    boost::unit_test::data::ds_detail::make_test_case_gen<              \
-                                      BOOST_PP_CAT(test_name, case)>(   \
-          BOOST_STRINGIZE( test_name ),                                 \
-          __FILE__, __LINE__,                                           \
-          boost::unit_test::data::ds_detail::seed{} ->* dataset ),      \
-    boost::unit_test::decorator::collector::instance() );               \
-                                                                        \
-BOOST_AUTO_TEST_SUITE_END()                                             \
-                                                                        \
-    template<BOOST_PP_ENUM_PARAMS(arity, typename Arg)>                 \
-    void BOOST_PP_CAT(test_name, case)::_impl(                          \
-                                BOOST_DATA_TEST_CASE_PARAMS( params ) ) \
-/**/
-
-#define BOOST_DATA_TEST_CASE_WITH_PARAMS( F, test_name, dataset, ... )  \
-    BOOST_DATA_TEST_CASE_IMPL( BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),     \
-                               F, test_name, dataset,                   \
-                               BOOST_PP_VARIADIC_TO_SEQ(__VA_ARGS__) )  \
-/**/
-#define BOOST_DATA_TEST_CASE_NO_PARAMS( F, test_name, dataset )         \
-    BOOST_DATA_TEST_CASE_WITH_PARAMS( F, test_name, dataset, sample )   \
-/**/
-
-#if BOOST_PP_VARIADICS_MSVC
-
-#define BOOST_DATA_TEST_CASE( ... )                                     \
-    BOOST_PP_CAT(                                                       \
-    BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),2), \
-                     BOOST_DATA_TEST_CASE_NO_PARAMS,                    \
-                     BOOST_DATA_TEST_CASE_WITH_PARAMS) (                \
-                        BOOST_AUTO_TEST_CASE_FIXTURE, __VA_ARGS__), )   \
-/**/
-
-#define BOOST_DATA_TEST_CASE_F( F, ... )                                \
-    BOOST_PP_CAT(                                                       \
-    BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),2), \
-                     BOOST_DATA_TEST_CASE_NO_PARAMS,                    \
-                     BOOST_DATA_TEST_CASE_WITH_PARAMS) (                \
-                        F, __VA_ARGS__), )                              \
-/**/
-
-#else
-
-#define BOOST_DATA_TEST_CASE( ... )                                     \
-    BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),2), \
-                     BOOST_DATA_TEST_CASE_NO_PARAMS,                    \
-                     BOOST_DATA_TEST_CASE_WITH_PARAMS) (                \
-                        BOOST_AUTO_TEST_CASE_FIXTURE, __VA_ARGS__)      \
-/**/
-
-#define BOOST_DATA_TEST_CASE_F( F, ... )                                \
-    BOOST_PP_IIF(BOOST_PP_EQUAL(BOOST_PP_VARIADIC_SIZE(__VA_ARGS__),2), \
-                     BOOST_DATA_TEST_CASE_NO_PARAMS,                    \
-                     BOOST_DATA_TEST_CASE_WITH_PARAMS) (                \
-                        F, __VA_ARGS__)                                 \
-/**/
-#endif
-
-} // namespace data
-} // namespace unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_DATA_TEST_CASE_HPP_102211GER
-
diff --git a/contrib/restricted/boost/boost/test/floating_point_comparison.hpp b/contrib/restricted/boost/boost/test/floating_point_comparison.hpp
deleted file mode 100644
index e889274477..0000000000
--- a/contrib/restricted/boost/boost/test/floating_point_comparison.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//! @file
-//! @brief Deprecated header
-//! @deprecated Use boost/test/tools/floating_point_comparison.hpp instead
-// ***************************************************************************
-
-// Boost.Test
-#include <boost/test/tools/floating_point_comparison.hpp>
diff --git a/contrib/restricted/boost/boost/test/included/execution_monitor.hpp b/contrib/restricted/boost/boost/test/included/execution_monitor.hpp
deleted file mode 100644
index cff2adc9a0..0000000000
--- a/contrib/restricted/boost/boost/test/included/execution_monitor.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//  File        : $RCSfile$
-//
-//  Version     : $Revision$
-//
-//  Description : included variant of Execution Monitor to be used independently
-// ***************************************************************************
-
-#ifndef BOOST_INCLUDED_EXECUTION_MONITOR_HPP_051410GER
-#define BOOST_INCLUDED_EXECUTION_MONITOR_HPP_051410GER
-
-#include <boost/test/impl/execution_monitor.ipp>
-#include <boost/test/impl/debug.ipp>
-
-#endif // BOOST_INCLUDED_EXECUTION_MONITOR_HPP_051410GER
diff --git a/contrib/restricted/boost/boost/test/included/prg_exec_monitor.hpp b/contrib/restricted/boost/boost/test/included/prg_exec_monitor.hpp
deleted file mode 100644
index ff48ce5594..0000000000
--- a/contrib/restricted/boost/boost/test/included/prg_exec_monitor.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//  File        : $RCSfile$
-//
-//  Version     : $Revision$
-//
-//  Description : included (vs. linked ) version of Program Execution Monitor
-// ***************************************************************************
-
-#ifndef BOOST_INCLUDED_PRG_EXEC_MONITOR_HPP_071894GER
-#define BOOST_INCLUDED_PRG_EXEC_MONITOR_HPP_071894GER
-
-#include <boost/test/impl/execution_monitor.ipp>
-#include <boost/test/impl/debug.ipp>
-#include <boost/test/impl/cpp_main.ipp>
-
-#define BOOST_TEST_INCLUDED
-#include <boost/test/prg_exec_monitor.hpp>
-
-#endif // BOOST_INCLUDED_PRG_EXEC_MONITOR_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/included/test_exec_monitor.hpp b/contrib/restricted/boost/boost/test/included/test_exec_monitor.hpp
deleted file mode 100644
index e75b4698f2..0000000000
--- a/contrib/restricted/boost/boost/test/included/test_exec_monitor.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//
-/// @file
-/// @brief Included (vs. linked) version of Test Execution Monitor
-// ***************************************************************************
-
-#ifndef BOOST_INCLUDED_TEST_EXEC_MONITOR_HPP_071894GER
-#define BOOST_INCLUDED_TEST_EXEC_MONITOR_HPP_071894GER
-
-#include <boost/test/impl/compiler_log_formatter.ipp>
-#include <boost/test/impl/junit_log_formatter.ipp>
-#include <boost/test/impl/debug.ipp>
-#include <boost/test/impl/decorator.ipp>
-#include <boost/test/impl/execution_monitor.ipp>
-#include <boost/test/impl/framework.ipp>
-#include <boost/test/impl/plain_report_formatter.ipp>
-#include <boost/test/impl/progress_monitor.ipp>
-#include <boost/test/impl/results_collector.ipp>
-#include <boost/test/impl/results_reporter.ipp>
-#include <boost/test/impl/test_framework_init_observer.ipp>
-#include <boost/test/impl/test_main.ipp>
-#include <boost/test/impl/test_tools.ipp>
-#include <boost/test/impl/test_tree.ipp>
-#include <boost/test/impl/unit_test_log.ipp>
-#include <boost/test/impl/unit_test_main.ipp>
-#include <boost/test/impl/unit_test_monitor.ipp>
-#include <boost/test/impl/unit_test_parameters.ipp>
-#include <boost/test/impl/xml_log_formatter.ipp>
-#include <boost/test/impl/xml_report_formatter.ipp>
-
-#define BOOST_TEST_INCLUDED
-#include <boost/test/test_exec_monitor.hpp>
-
-#endif // BOOST_INCLUDED_TEST_EXEC_MONITOR_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/included/unit_test.hpp b/contrib/restricted/boost/boost/test/included/unit_test.hpp
deleted file mode 100644
index 90882eb178..0000000000
--- a/contrib/restricted/boost/boost/test/included/unit_test.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//
-//!@file
-//!@brief Included (vs. linked) version of Unit Test Framework
-// ***************************************************************************
-
-#ifndef BOOST_INCLUDED_UNIT_TEST_FRAMEWORK_HPP_071894GER
-#define BOOST_INCLUDED_UNIT_TEST_FRAMEWORK_HPP_071894GER
-
-#define BOOST_TEST_INCLUDED
-
-#include <boost/test/impl/compiler_log_formatter.ipp>
-#include <boost/test/impl/junit_log_formatter.ipp>
-#include <boost/test/impl/debug.ipp>
-#include <boost/test/impl/decorator.ipp>
-#include <boost/test/impl/framework.ipp>
-#include <boost/test/impl/execution_monitor.ipp>
-#include <boost/test/impl/plain_report_formatter.ipp>
-#include <boost/test/impl/progress_monitor.ipp>
-#include <boost/test/impl/results_collector.ipp>
-#include <boost/test/impl/results_reporter.ipp>
-#include <boost/test/impl/test_framework_init_observer.ipp>
-#include <boost/test/impl/test_tools.ipp>
-#include <boost/test/impl/test_tree.ipp>
-#include <boost/test/impl/unit_test_log.ipp>
-#include <boost/test/impl/unit_test_main.ipp>
-#include <boost/test/impl/unit_test_monitor.ipp>
-#include <boost/test/impl/unit_test_parameters.ipp>
-#include <boost/test/impl/xml_log_formatter.ipp>
-#include <boost/test/impl/xml_report_formatter.ipp>
-
-#include <boost/test/unit_test.hpp>
-
-#endif // BOOST_INCLUDED_UNIT_TEST_FRAMEWORK_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/included/unit_test_framework.hpp b/contrib/restricted/boost/boost/test/included/unit_test_framework.hpp
deleted file mode 100644
index 5bf366ad80..0000000000
--- a/contrib/restricted/boost/boost/test/included/unit_test_framework.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @deprecated
-// ***************************************************************************
-
-#include <boost/test/included/unit_test.hpp>
diff --git a/contrib/restricted/boost/boost/test/minimal.hpp b/contrib/restricted/boost/boost/test/minimal.hpp
deleted file mode 100644
index c52295309e..0000000000
--- a/contrib/restricted/boost/boost/test/minimal.hpp
+++ /dev/null
@@ -1,156 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Deprecated implementation of simple minimal testing
-/// @deprecated
-/// To convert to Unit Test Framework simply rewrite:
-/// @code
-/// #include <boost/test/minimal.hpp>
-///
-/// int test_main( int, char *[] )
-/// {
-///   ...
-/// }
-/// @endcode
-/// as
-/// @code
-/// #include <boost/test/included/unit_test.hpp>
-///
-/// BOOST_AUTO_TEST_CASE(test_main)
-/// {
-///   ...
-/// }
-/// @endcode
-// ***************************************************************************
-
-#ifndef BOOST_TEST_MINIMAL_HPP_071894GER
-#define BOOST_TEST_MINIMAL_HPP_071894GER
-
-#define BOOST_CHECK(exp)       \
-  ( (exp)                      \
-      ? static_cast<void>(0)   \
-      : boost::minimal_test::report_error(#exp,__FILE__,__LINE__, BOOST_CURRENT_FUNCTION) )
-
-#define BOOST_REQUIRE(exp)     \
-  ( (exp)                      \
-      ? static_cast<void>(0)   \
-      : boost::minimal_test::report_critical_error(#exp,__FILE__,__LINE__,BOOST_CURRENT_FUNCTION))
-
-#define BOOST_ERROR( msg_ )    \
-        boost::minimal_test::report_error( (msg_),__FILE__,__LINE__, BOOST_CURRENT_FUNCTION, true )
-#define BOOST_FAIL( msg_ )     \
-        boost::minimal_test::report_critical_error( (msg_),__FILE__,__LINE__, BOOST_CURRENT_FUNCTION, true )
-
-//____________________________________________________________________________//
-
-// Boost.Test
-#include <boost/test/detail/global_typedef.hpp>
-#include <boost/test/impl/execution_monitor.ipp>
-#include <boost/test/impl/debug.ipp>
-#include <boost/test/utils/class_properties.hpp>
-#include <boost/test/utils/basic_cstring/io.hpp>
-
-// Boost
-#include <boost/cstdlib.hpp>            // for exit codes
-#include <boost/current_function.hpp>   // for BOOST_CURRENT_FUNCTION
-
-// STL
-#include <iostream>                     // std::cerr, std::endl
-#include <string>                       // std::string
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-int test_main( int argc, char* argv[] );  // prototype for users test_main()
-
-namespace boost {
-namespace minimal_test {
-
-typedef boost::unit_test::const_string const_string;
-
-inline unit_test::counter_t& errors_counter() { static unit_test::counter_t ec = 0; return ec; }
-
-inline void
-report_error( const char* msg, const char* file, int line, const_string func_name, bool is_msg = false )
-{
-    ++errors_counter();
-    std::cerr << file << "(" << line << "): ";
-
-    if( is_msg )
-        std::cerr << msg;
-    else
-        std::cerr << "test " << msg << " failed";
-
-    if( func_name != "(unknown)" )
-        std::cerr << " in function: '" << func_name << "'";
-
-    std::cerr << std::endl;
-}
-
-inline void
-report_critical_error( const char* msg, const char* file, int line, const_string func_name, bool is_msg = false )
-{
-    report_error( msg, file, line, func_name, is_msg );
-
-    throw boost::execution_aborted();
-}
-
-class caller {
-public:
-    // constructor
-    caller( int argc, char** argv )
-    : m_argc( argc ), m_argv( argv ) {}
-
-    // execution monitor hook implementation
-    int operator()() { return test_main( m_argc, m_argv ); }
-
-private:
-    // Data members
-    int         m_argc;
-    char**      m_argv;
-}; // monitor
-
-} // namespace minimal_test
-} // namespace boost
-
-//____________________________________________________________________________//
-
-int BOOST_TEST_CALL_DECL main( int argc, char* argv[] )
-{
-    using namespace boost::minimal_test;
-
-    try {
-        ::boost::execution_monitor ex_mon;
-        int run_result = ex_mon.execute( caller( argc, argv ) );
-
-        BOOST_CHECK( run_result == 0 || run_result == boost::exit_success );
-    }
-    catch( boost::execution_exception const& exex ) {
-        if( exex.code() != boost::execution_exception::no_error )
-            BOOST_ERROR( (std::string( "exception \"" ) + exex.what() + "\" caught").c_str() );
-        std::cerr << "\n**** Testing aborted.";
-    }
-
-    if( boost::minimal_test::errors_counter() != 0 ) {
-        std::cerr << "\n**** " << errors_counter()
-                  << " error" << (errors_counter() > 1 ? "s" : "" ) << " detected\n";
-
-        return boost::exit_test_failure;
-    }
-
-    std::cout << "\n**** no errors detected\n";
-
-    return boost::exit_success;
-}
-
-//____________________________________________________________________________//
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_MINIMAL_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/output_test_stream.hpp b/contrib/restricted/boost/boost/test/output_test_stream.hpp
deleted file mode 100644
index 26eaf320ac..0000000000
--- a/contrib/restricted/boost/boost/test/output_test_stream.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief Deprecated header.
-//!@deprecated Use boost/test/tools/output_test_stream.hpp instead
-// ***************************************************************************
-
-// Boost.Test
-#include <boost/test/tools/output_test_stream.hpp>
diff --git a/contrib/restricted/boost/boost/test/parameterized_test.hpp b/contrib/restricted/boost/boost/test/parameterized_test.hpp
deleted file mode 100644
index cc9487abc2..0000000000
--- a/contrib/restricted/boost/boost/test/parameterized_test.hpp
+++ /dev/null
@@ -1,176 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-//!@file
-//!@brief generators and helper macros for parameterized tests
-// ***************************************************************************
-
-#ifndef BOOST_TEST_PARAMETERIZED_TEST_HPP_021102GER
-#define BOOST_TEST_PARAMETERIZED_TEST_HPP_021102GER
-
-// Boost.Test
-#include <boost/test/unit_test_suite.hpp>
-#include <boost/test/utils/string_cast.hpp>
-
-// Boost
-#include <boost/type_traits/remove_reference.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
-#include <boost/bind.hpp>
-#include <boost/function/function1.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-#define BOOST_PARAM_TEST_CASE( function, begin, end )                      \
-boost::unit_test::make_test_case( function,                                \
-                                  BOOST_TEST_STRINGIZE( function ),        \
-                                  __FILE__, __LINE__,                      \
-                                  (begin), (end) )                         \
-/**/
-
-#define BOOST_PARAM_CLASS_TEST_CASE( function, tc_instance, begin, end )   \
-boost::unit_test::make_test_case( function,                                \
-                                  BOOST_TEST_STRINGIZE( function ),        \
-                                  __FILE__, __LINE__,                      \
-                                  (tc_instance),                           \
-                                  (begin), (end) )                         \
-/**/
-
-namespace boost {
-namespace unit_test {
-
-namespace ut_detail {
-
-// ************************************************************************** //
-// **************           param_test_case_generator          ************** //
-// ************************************************************************** //
-
-template<typename ParamType, typename ParamIter>
-class param_test_case_generator : public test_unit_generator {
-public:
-    param_test_case_generator( boost::function<void (ParamType)> const& test_func,
-                               const_string                             tc_name,
-                               const_string                             tc_file,
-                               std::size_t                              tc_line,
-                               ParamIter                                par_begin,
-                               ParamIter                                par_end )
-    : m_test_func( test_func )
-    , m_tc_name( ut_detail::normalize_test_case_name( tc_name ) )
-    , m_tc_file( tc_file )
-    , m_tc_line( tc_line )
-    , m_par_begin( par_begin )
-    , m_par_end( par_end )
-    , m_index( 0 )
-    {}
-
-    virtual test_unit* next() const
-    {
-        if( m_par_begin == m_par_end )
-            return (test_unit*)0;
-
-        test_unit* res = new test_case( m_tc_name + "_" + utils::string_cast(m_index), m_tc_file, m_tc_line, boost::bind( m_test_func, *m_par_begin ) );
-
-        ++m_par_begin;
-        ++m_index;
-
-        return res;
-    }
-
-private:
-    // Data members
-    boost::function<void (ParamType)>    m_test_func;
-    std::string             m_tc_name;
-    const_string            m_tc_file;
-    std::size_t             m_tc_line;
-    mutable ParamIter       m_par_begin;
-    ParamIter               m_par_end;
-    mutable std::size_t     m_index;
-};
-
-//____________________________________________________________________________//
-
-template<typename UserTestCase,typename ParamType>
-struct user_param_tc_method_invoker {
-    typedef void (UserTestCase::*test_method)( ParamType );
-
-    // Constructor
-    user_param_tc_method_invoker( shared_ptr<UserTestCase> inst, test_method test_method )
-    : m_inst( inst ), m_test_method( test_method ) {}
-
-    void operator()( ParamType p ) { ((*m_inst).*m_test_method)( p ); }
-
-    // Data members
-    shared_ptr<UserTestCase> m_inst;
-    test_method              m_test_method;
-};
-
-//____________________________________________________________________________//
-
-} // namespace ut_detail
-
-template<typename ParamType, typename ParamIter>
-inline ut_detail::param_test_case_generator<ParamType,ParamIter>
-make_test_case( boost::function<void (ParamType)> const& test_func,
-                const_string                             tc_name,
-                const_string                             tc_file,
-                std::size_t                              tc_line,
-                ParamIter                                par_begin,
-                ParamIter                                par_end )
-{
-    return ut_detail::param_test_case_generator<ParamType,ParamIter>( test_func, tc_name, tc_file, tc_line, par_begin, par_end );
-}
-
-//____________________________________________________________________________//
-
-template<typename ParamType, typename ParamIter>
-inline ut_detail::param_test_case_generator<
-    BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter>
-make_test_case( void (*test_func)( ParamType ),
-                const_string  tc_name,
-                const_string  tc_file,
-                std::size_t   tc_line,
-                ParamIter     par_begin,
-                ParamIter     par_end )
-{
-    typedef BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type param_value_type;
-    return ut_detail::param_test_case_generator<param_value_type,ParamIter>( test_func, tc_name, tc_file, tc_line, par_begin, par_end );
-}
-
-//____________________________________________________________________________//
-
-template<typename UserTestCase,typename ParamType, typename ParamIter>
-inline ut_detail::param_test_case_generator<
-    BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter>
-make_test_case( void (UserTestCase::*test_method )( ParamType ),
-                const_string                           tc_name,
-                const_string                           tc_file,
-                std::size_t                            tc_line,
-                boost::shared_ptr<UserTestCase> const& user_test_case,
-                ParamIter                              par_begin,
-                ParamIter                              par_end )
-{
-    typedef BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type param_value_type;
-    return ut_detail::param_test_case_generator<param_value_type,ParamIter>(
-               ut_detail::user_param_tc_method_invoker<UserTestCase,ParamType>( user_test_case, test_method ),
-               tc_name,
-               tc_file,
-               tc_line,
-               par_begin,
-               par_end );
-}
-
-//____________________________________________________________________________//
-
-} // unit_test
-} // namespace boost
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif // BOOST_TEST_PARAMETERIZED_TEST_HPP_021102GER
-
diff --git a/contrib/restricted/boost/boost/test/predicate_result.hpp b/contrib/restricted/boost/boost/test/predicate_result.hpp
deleted file mode 100644
index 9b57363713..0000000000
--- a/contrib/restricted/boost/boost/test/predicate_result.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Deprecated header
-/// @deprecated Use boost/test/tools/assertion_result.hpp instead
-// ***************************************************************************
-
-// Boost.Test
-#include <boost/test/tools/assertion_result.hpp>
diff --git a/contrib/restricted/boost/boost/test/prg_exec_monitor.hpp b/contrib/restricted/boost/boost/test/prg_exec_monitor.hpp
deleted file mode 100644
index f072e215db..0000000000
--- a/contrib/restricted/boost/boost/test/prg_exec_monitor.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Entry point for the end user into the Program Execution Monitor.
-///
-/// Use this header to forward declare function prg_exec_monitor_main and to automatically define a main
-/// function for you. If you prefer to use your own main you are free to do so, but you need to define
-/// BOOST_TEST_NO_MAIN before incuding this header. To initiate your main program body execution you
-/// would use statement like this:
-/// @code ::boost::prg_exec_monitor_main( &my_main, argc, argv ); @endcode
-/// Also this header facilitate auto linking with the Program Execution Monitor library if this feature
-/// is supported
-// ***************************************************************************
-
-#ifndef BOOST_PRG_EXEC_MONITOR_HPP_071894GER
-#define BOOST_PRG_EXEC_MONITOR_HPP_071894GER
-
-#include <boost/test/detail/config.hpp>
-
-//____________________________________________________________________________//
-
-// ************************************************************************** //
-// **************                 Auto Linking                 ************** //
-// ************************************************************************** //
-
-// Automatically link to the correct build variant where possible.
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
-    !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
-#  define BOOST_LIB_NAME boost_prg_exec_monitor
-
-// If we're importing code from a dll, then tell auto_link.hpp about it:
-#  if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_TEST_DYN_LINK)
-#    define BOOST_DYN_LINK
-#  endif
-
-#  include <boost/config/auto_link.hpp>
-
-#endif  // auto-linking disabled
-
-// ************************************************************************** //
-// **************               prg_exec_monitor_main          ************** //
-// ************************************************************************** //
-
-namespace boost {
-
-/// @brief Wrapper around the main function
-///
-/// Call this routine instead of your own main body implementation directly. This routine impements all the monitoring
-/// functionality. THe monitor behavior is configurable by using the environment variable BOOST_TEST_CATCH_SYSTEM_ERRORS.
-/// If set to string value "no", the monitor will not attempt to catch system errors (signals)
-/// @param[in] cpp_main main function body. Should have the same signature as regular main function
-/// @param[in] argc, argv command line arguments
-int BOOST_TEST_DECL prg_exec_monitor_main( int (*cpp_main)( int argc, char* argv[] ), int argc, char* argv[] );
-
-} // boost
-
-#if defined(BOOST_TEST_DYN_LINK) && !defined(BOOST_TEST_NO_MAIN)
-
-// ************************************************************************** //
-// **************        main function for tests using dll     ************** //
-// ************************************************************************** //
-
-// prototype for user's cpp_main()
-int cpp_main( int argc, char* argv[] );
-
-int BOOST_TEST_CALL_DECL
-main( int argc, char* argv[] )
-{
-    return ::boost::prg_exec_monitor_main( &cpp_main, argc, argv );
-}
-
-//____________________________________________________________________________//
-
-#endif // BOOST_TEST_DYN_LINK && !BOOST_TEST_NO_MAIN
-
-#endif // BOOST_PRG_EXEC_MONITOR_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/test_case_template.hpp b/contrib/restricted/boost/boost/test/test_case_template.hpp
deleted file mode 100644
index c01bd0738a..0000000000
--- a/contrib/restricted/boost/boost/test/test_case_template.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Deprecated header.
-/// @deprecated Use @c boost/test/unit_test.hpp instead
-// ***************************************************************************
-
-#include <boost/test/unit_test.hpp>
diff --git a/contrib/restricted/boost/boost/test/test_exec_monitor.hpp b/contrib/restricted/boost/boost/test/test_exec_monitor.hpp
deleted file mode 100644
index 0450809335..0000000000
--- a/contrib/restricted/boost/boost/test/test_exec_monitor.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Deprecated implementation of Test Execution Monitor
-///
-/// To convert to Unit Test Framework simply rewrite:
-/// @code
-/// #include <boost/test/test_exec_monitor.hpp>
-///
-/// int test_main( int, char *[] )
-/// {
-///   ...
-/// }
-/// @endcode
-/// as
-/// @code
-/// #include <boost/test/unit_test.hpp>
-///
-/// BOOST_AUTO_TEST_CASE(test_main)
-/// {
-///   ...
-/// }
-/// @endcode
-/// and link with boost_unit_test_framework library *instead of* boost_test_exec_monitor
-// ***************************************************************************
-
-#ifndef BOOST_TEST_EXEC_MONITOR_HPP_071894GER
-#define BOOST_TEST_EXEC_MONITOR_HPP_071894GER
-
-// Boost.Test
-#include <boost/test/test_tools.hpp>
-
-//____________________________________________________________________________//
-
-// ************************************************************************** //
-// **************                 Auto Linking                 ************** //
-// ************************************************************************** //
-
-// Automatically link to the correct build variant where possible.
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
-    !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
-
-#  define BOOST_LIB_NAME boost_test_exec_monitor
-#  include <boost/config/auto_link.hpp>
-
-#endif  // auto-linking disabled
-
-#endif // BOOST_TEST_EXEC_MONITOR_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/unit_test.hpp b/contrib/restricted/boost/boost/test/unit_test.hpp
deleted file mode 100644
index e6a236a1b5..0000000000
--- a/contrib/restricted/boost/boost/test/unit_test.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  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/test for the library home page.
-//
-/// @file
-/// @brief Entry point into the Unit Test Framework
-///
-/// This header should be the only header necessary to include to start using the framework
-// ***************************************************************************
-
-#ifndef BOOST_TEST_UNIT_TEST_HPP_071894GER
-#define BOOST_TEST_UNIT_TEST_HPP_071894GER
-
-// Boost.Test
-#include <boost/test/test_tools.hpp>
-#include <boost/test/unit_test_suite.hpp>
-
-//____________________________________________________________________________//
-
-// ************************************************************************** //
-// **************                 Auto Linking                 ************** //
-// ************************************************************************** //
-
-#if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
-    !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
-#  define BOOST_LIB_NAME boost_unit_test_framework
-
-#  if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_TEST_DYN_LINK)
-#    define BOOST_DYN_LINK
-#  endif
-
-#  include <boost/config/auto_link.hpp>
-
-#endif  // auto-linking disabled
-
-// ************************************************************************** //
-// **************                  unit_test_main              ************** //
-// ************************************************************************** //
-
-namespace boost { namespace unit_test {
-
-int BOOST_TEST_DECL unit_test_main( init_unit_test_func init_func, int argc, char* argv[] );
-
-}
-
-// !! ?? to remove
-namespace unit_test_framework=unit_test;
-
-}
-
-#if defined(BOOST_TEST_DYN_LINK) && defined(BOOST_TEST_MAIN) && !defined(BOOST_TEST_NO_MAIN)
-
-// ************************************************************************** //
-// **************        main function for tests using dll     ************** //
-// ************************************************************************** //
-
-int BOOST_TEST_CALL_DECL
-main( int argc, char* argv[] )
-{
-    return ::boost::unit_test::unit_test_main( &init_unit_test, argc, argv );
-}
-
-//____________________________________________________________________________//
-
-#endif // BOOST_TEST_DYN_LINK && BOOST_TEST_MAIN && !BOOST_TEST_NO_MAIN
-
-#endif // BOOST_TEST_UNIT_TEST_HPP_071894GER
diff --git a/contrib/restricted/boost/boost/test/utils/nullstream.hpp b/contrib/restricted/boost/boost/test/utils/nullstream.hpp
deleted file mode 100644
index 27b17fae14..0000000000
--- a/contrib/restricted/boost/boost/test/utils/nullstream.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-//  (C) Copyright Gennadiy Rozental 2001.
-//  (C) Copyright Daryle Walker 2000-2001.
-//  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/test for the library home page.
-//
-//  File        : $RCSfile$
-//
-//  Version     : $Revision$
-//
-//  Description : simulate /dev/null stream
-// ***************************************************************************
-
-#ifndef BOOST_TEST_UTILS_NULLSTREAM_HPP
-#define BOOST_TEST_UTILS_NULLSTREAM_HPP
-
-// STL
-#include <ostream>    // for std::basic_ostream
-#include <streambuf>  // for std::basic_streambuf
-#include <string>     // for std::char_traits
-
-// Boost
-#include <boost/utility/base_from_member.hpp>
-
-#include <boost/test/detail/suppress_warnings.hpp>
-
-//____________________________________________________________________________//
-
-namespace boost {
-
-// ************************************************************************** //
-// **************                 basic_nullbuf                ************** //
-// ************************************************************************** //
-//  Class for a buffer that reads nothing and writes to nothing.
-//  Idea from an Usenet post by Tom <the_wid@my-deja.com> at
-//  27 Oct 2000 14:06:21 GMT on comp.lang.c++.
-
-template<typename CharType, class CharTraits = ::std::char_traits<CharType> >
-class basic_nullbuf : public ::std::basic_streambuf<CharType, CharTraits> {
-    typedef ::std::basic_streambuf<CharType, CharTraits>  base_type;
-public:
-    // Types
-    typedef typename base_type::char_type    char_type;
-    typedef typename base_type::traits_type  traits_type;
-    typedef typename base_type::int_type     int_type;
-    typedef typename base_type::pos_type     pos_type;
-    typedef typename base_type::off_type     off_type;
-
-    // Use automatic default constructor and destructor
-
-protected:
-    // The default implementations of the miscellaneous virtual
-    // member functions are sufficient.
-
-    // The default implementations of the input & putback virtual
-    // member functions, being nowhere but EOF, are sufficient.
-
-    // The output virtual member functions need to be changed to
-    // accept anything without any problems, instead of being at EOF.
-    virtual  ::std::streamsize  xsputn( char_type const* /*s*/, ::std::streamsize n )   { return n; } // "s" is unused
-    virtual  int_type           overflow( int_type c = traits_type::eof() )         { return traits_type::not_eof( c ); }
-};
-
-typedef basic_nullbuf<char>      nullbuf;
-typedef basic_nullbuf<wchar_t>  wnullbuf;
-
-// ************************************************************************** //
-// **************               basic_onullstream              ************** //
-// ************************************************************************** //
-//  Output streams based on basic_nullbuf.
-
-#ifdef BOOST_MSVC
-# pragma warning(push)
-# pragma warning(disable: 4355) // 'this' : used in base member initializer list
-#endif
-
-template< typename CharType, class CharTraits = ::std::char_traits<CharType> >
-class basic_onullstream : private boost::base_from_member<basic_nullbuf<CharType, CharTraits> >
-                        , public ::std::basic_ostream<CharType, CharTraits> {
-    typedef boost::base_from_member<basic_nullbuf<CharType, CharTraits> >   pbase_type;
-    typedef ::std::basic_ostream<CharType, CharTraits>                      base_type;
-public:
-    // Constructor
-    basic_onullstream() : pbase_type(), base_type( &this->pbase_type::member ) {}
-};
-
-#ifdef BOOST_MSVC
-# pragma warning(default: 4355)
-# pragma warning(pop)
-#endif
-
-typedef basic_onullstream<char>      onullstream;
-typedef basic_onullstream<wchar_t>  wonullstream;
-
-}  // namespace boost
-
-//____________________________________________________________________________//
-
-#include <boost/test/detail/enable_warnings.hpp>
-
-#endif  // BOOST_TEST_UTILS_NULLSTREAM_HPP
diff --git a/contrib/restricted/boost/test/CONTRIBUTE.md b/contrib/restricted/boost/test/CONTRIBUTE.md
new file mode 100644
index 0000000000..e9773acdf2
--- /dev/null
+++ b/contrib/restricted/boost/test/CONTRIBUTE.md
@@ -0,0 +1,25 @@
+# How to contribute to Boost.Test
+
+## Ticket
+We like having a ticket stating the bug or the feature you want to implement. We use a dedicated ticket 
+management for this that can be found here: https://svn.boost.org/ . Please create a ticket there 
+by selecting the component `test`.
+
+## Pull requests
+We welcome any contribution in the form of a pull request. Each PR is never integrated exactly as submitted,
+we first run our internal unit tests on several platforms, and work the PR if needed.
+
+To ease the work of the maintainer and make the integration of your changes faster, please
+
+- base all your PR on the latest develop, rebase if develop changed since you forked the library
+- ensure that your changes are not creating any regression in the current test bed (see below on how to run
+  the unit tests)
+- provide a test case that reproduces the problem you encountered
+- integrate your unit test into the `Jamfile.v2` of the test folder
+
+# Running the unit tests
+Please make sure that the current set of tests pass for the changes that you submit. 
+To run the tests, see [this document](test/README.md).
+
+# Compile the documentation
+The instructions for compiling the documentation are provided in [this document](doc/README.md). 
diff --git a/contrib/restricted/boost/test/README.md b/contrib/restricted/boost/test/README.md
new file mode 100644
index 0000000000..ebf4f73f85
--- /dev/null
+++ b/contrib/restricted/boost/test/README.md
@@ -0,0 +1,39 @@
+![boosttest logo](doc/html/images/boost.test.logo.png)
+
+# What is Boost.Test?
+Boost.Test is a C++03 and C++11/14 unit testing library, available on a wide range of platforms and compilers.
+
+The library is part of [Boost](www.boost.org). The latest release
+of the library is available from the boost web site.
+
+Full instructions for use of this library can be accessed from
+http://www.boost.org/doc/libs/release/libs/test/
+
+# Key features
+
+* Easy to get started with:     
+    1. download and deflate the latest boost archive
+    1. create a test module with this (header version):
+        ```
+        #define BOOST_TEST_MODULE your_test_module
+        #include <boost/test/included/unit_test.hpp>
+        ```
+    1. done
+* powerful and unique test assertion macro [`BOOST_TEST`](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/testing_tools/boost_test_universal_macro.html), that understands floating points, collections, strings... and uses appropriate comparison paradigm
+* self-registering test cases, organize cases in test suites, apply fixtures on test cases, suites or globally
+* provide assertion [context](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/test_output/test_tools_support_for_logging/contexts.html) for advanced diagnostic on failure
+* powerful and extensible [dataset](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/tests_organization/test_cases/test_case_generation.html) tests
+* add [decoration](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/tests_organization/decorators.html) to test cases and suites for [advanced description](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/tests_organization/semantic.html), [group/label](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/tests_organization/tests_grouping.html), and [dependencies](http://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/tests_organization/tests_dependencies.html)
+* powerful command line options and test case filters
+* extensible logging, XML and JUNIT outputs for third-party tools (eg. cont. integration)
+* various usage (shared/static library) for faster compilation/build cycles, smaller binaries
+
+# Copyright and license
+Copyright 2001-2014, Gennadiy Rozental.  
+Copyright 2013-2018, Boost.Test team.
+
+Distributed under the Boost Software License, Version 1.0.
+(Get a copy at www.boost.org/LICENSE_1_0.txt)
+
+# Contribute
+Please read [this document](CONTRIBUTE.md) to get started.
diff --git a/contrib/restricted/boost/boost/test/debug.hpp b/contrib/restricted/boost/test/include/boost/test/debug.hpp
index a8ccae0b97..a8ccae0b97 100644
--- a/contrib/restricted/boost/boost/test/debug.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/debug.hpp
diff --git a/contrib/restricted/boost/boost/test/debug_config.hpp b/contrib/restricted/boost/test/include/boost/test/debug_config.hpp
index 894d78e65a..894d78e65a 100644
--- a/contrib/restricted/boost/boost/test/debug_config.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/debug_config.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/config.hpp b/contrib/restricted/boost/test/include/boost/test/detail/config.hpp
index db9b5d2b92..db9b5d2b92 100644
--- a/contrib/restricted/boost/boost/test/detail/config.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/config.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/enable_warnings.hpp b/contrib/restricted/boost/test/include/boost/test/detail/enable_warnings.hpp
index 45afb31944..45afb31944 100644
--- a/contrib/restricted/boost/boost/test/detail/enable_warnings.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/enable_warnings.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/fwd_decl.hpp b/contrib/restricted/boost/test/include/boost/test/detail/fwd_decl.hpp
index d5c97fb706..d5c97fb706 100644
--- a/contrib/restricted/boost/boost/test/detail/fwd_decl.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/fwd_decl.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/global_typedef.hpp b/contrib/restricted/boost/test/include/boost/test/detail/global_typedef.hpp
index aeede00e9c..aeede00e9c 100644
--- a/contrib/restricted/boost/boost/test/detail/global_typedef.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/global_typedef.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/log_level.hpp b/contrib/restricted/boost/test/include/boost/test/detail/log_level.hpp
index abdecea7ec..abdecea7ec 100644
--- a/contrib/restricted/boost/boost/test/detail/log_level.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/log_level.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/pp_variadic.hpp b/contrib/restricted/boost/test/include/boost/test/detail/pp_variadic.hpp
index a443744daa..a443744daa 100644
--- a/contrib/restricted/boost/boost/test/detail/pp_variadic.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/pp_variadic.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/suppress_warnings.hpp b/contrib/restricted/boost/test/include/boost/test/detail/suppress_warnings.hpp
index 4badf20758..4badf20758 100644
--- a/contrib/restricted/boost/boost/test/detail/suppress_warnings.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/suppress_warnings.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/throw_exception.hpp b/contrib/restricted/boost/test/include/boost/test/detail/throw_exception.hpp
index 3f2f4687d3..3f2f4687d3 100644
--- a/contrib/restricted/boost/boost/test/detail/throw_exception.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/throw_exception.hpp
diff --git a/contrib/restricted/boost/boost/test/detail/workaround.hpp b/contrib/restricted/boost/test/include/boost/test/detail/workaround.hpp
index 4ba3a7e934..4ba3a7e934 100644
--- a/contrib/restricted/boost/boost/test/detail/workaround.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/detail/workaround.hpp
diff --git a/contrib/restricted/boost/boost/test/execution_monitor.hpp b/contrib/restricted/boost/test/include/boost/test/execution_monitor.hpp
index ed06ef254e..ed06ef254e 100644
--- a/contrib/restricted/boost/boost/test/execution_monitor.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/execution_monitor.hpp
diff --git a/contrib/restricted/boost/boost/test/framework.hpp b/contrib/restricted/boost/test/include/boost/test/framework.hpp
index 099c02969b..099c02969b 100644
--- a/contrib/restricted/boost/boost/test/framework.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/framework.hpp
diff --git a/contrib/restricted/boost/boost/test/impl/compiler_log_formatter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/compiler_log_formatter.ipp
index aa0a0e229f..aa0a0e229f 100644
--- a/contrib/restricted/boost/boost/test/impl/compiler_log_formatter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/compiler_log_formatter.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/cpp_main.ipp b/contrib/restricted/boost/test/include/boost/test/impl/cpp_main.ipp
index aaa5cabfc5..aaa5cabfc5 100644
--- a/contrib/restricted/boost/boost/test/impl/cpp_main.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/cpp_main.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/debug.ipp b/contrib/restricted/boost/test/include/boost/test/impl/debug.ipp
index cc5e9dbe29..cc5e9dbe29 100644
--- a/contrib/restricted/boost/boost/test/impl/debug.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/debug.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/decorator.ipp b/contrib/restricted/boost/test/include/boost/test/impl/decorator.ipp
index 74d42b22a2..74d42b22a2 100644
--- a/contrib/restricted/boost/boost/test/impl/decorator.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/decorator.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/execution_monitor.ipp b/contrib/restricted/boost/test/include/boost/test/impl/execution_monitor.ipp
index 035bb958c1..035bb958c1 100644
--- a/contrib/restricted/boost/boost/test/impl/execution_monitor.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/execution_monitor.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/framework.ipp b/contrib/restricted/boost/test/include/boost/test/impl/framework.ipp
index 496e7de859..496e7de859 100644
--- a/contrib/restricted/boost/boost/test/impl/framework.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/framework.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/junit_log_formatter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/junit_log_formatter.ipp
index 0f7a8f4c51..0f7a8f4c51 100644
--- a/contrib/restricted/boost/boost/test/impl/junit_log_formatter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/junit_log_formatter.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/plain_report_formatter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/plain_report_formatter.ipp
index cbf5a4c029..cbf5a4c029 100644
--- a/contrib/restricted/boost/boost/test/impl/plain_report_formatter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/plain_report_formatter.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/progress_monitor.ipp b/contrib/restricted/boost/test/include/boost/test/impl/progress_monitor.ipp
index 34149745cf..34149745cf 100644
--- a/contrib/restricted/boost/boost/test/impl/progress_monitor.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/progress_monitor.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/results_collector.ipp b/contrib/restricted/boost/test/include/boost/test/impl/results_collector.ipp
index fd74bdb65c..fd74bdb65c 100644
--- a/contrib/restricted/boost/boost/test/impl/results_collector.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/results_collector.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/results_reporter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/results_reporter.ipp
index 87c1172e12..87c1172e12 100644
--- a/contrib/restricted/boost/boost/test/impl/results_reporter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/results_reporter.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/test_framework_init_observer.ipp b/contrib/restricted/boost/test/include/boost/test/impl/test_framework_init_observer.ipp
index 89f854aaed..89f854aaed 100644
--- a/contrib/restricted/boost/boost/test/impl/test_framework_init_observer.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/test_framework_init_observer.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/test_main.ipp b/contrib/restricted/boost/test/include/boost/test/impl/test_main.ipp
index 6adc5bb9c2..6adc5bb9c2 100644
--- a/contrib/restricted/boost/boost/test/impl/test_main.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/test_main.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/test_tools.ipp b/contrib/restricted/boost/test/include/boost/test/impl/test_tools.ipp
index 2956879326..2956879326 100644
--- a/contrib/restricted/boost/boost/test/impl/test_tools.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/test_tools.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/test_tree.ipp b/contrib/restricted/boost/test/include/boost/test/impl/test_tree.ipp
index e0839e3dd1..e0839e3dd1 100644
--- a/contrib/restricted/boost/boost/test/impl/test_tree.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/test_tree.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/unit_test_log.ipp b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_log.ipp
index 2a6c0f4bc6..2a6c0f4bc6 100644
--- a/contrib/restricted/boost/boost/test/impl/unit_test_log.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_log.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/unit_test_main.ipp b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_main.ipp
index 1780c6b93b..1780c6b93b 100644
--- a/contrib/restricted/boost/boost/test/impl/unit_test_main.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_main.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/unit_test_monitor.ipp b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_monitor.ipp
index cfb41a239c..cfb41a239c 100644
--- a/contrib/restricted/boost/boost/test/impl/unit_test_monitor.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_monitor.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/unit_test_parameters.ipp b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_parameters.ipp
index 428c10116f..428c10116f 100644
--- a/contrib/restricted/boost/boost/test/impl/unit_test_parameters.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/unit_test_parameters.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/xml_log_formatter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/xml_log_formatter.ipp
index ef44f1eade..ef44f1eade 100644
--- a/contrib/restricted/boost/boost/test/impl/xml_log_formatter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/xml_log_formatter.ipp
diff --git a/contrib/restricted/boost/boost/test/impl/xml_report_formatter.ipp b/contrib/restricted/boost/test/include/boost/test/impl/xml_report_formatter.ipp
index 424ef4ba44..424ef4ba44 100644
--- a/contrib/restricted/boost/boost/test/impl/xml_report_formatter.ipp
+++ b/contrib/restricted/boost/test/include/boost/test/impl/xml_report_formatter.ipp
diff --git a/contrib/restricted/boost/boost/test/output/compiler_log_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/output/compiler_log_formatter.hpp
index 50359334b1..50359334b1 100644
--- a/contrib/restricted/boost/boost/test/output/compiler_log_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/output/compiler_log_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/output/junit_log_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/output/junit_log_formatter.hpp
index 713d3b016c..713d3b016c 100644
--- a/contrib/restricted/boost/boost/test/output/junit_log_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/output/junit_log_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/output/plain_report_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/output/plain_report_formatter.hpp
index 8c50964597..8c50964597 100644
--- a/contrib/restricted/boost/boost/test/output/plain_report_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/output/plain_report_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/output/xml_log_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/output/xml_log_formatter.hpp
index 1d8dec0f95..1d8dec0f95 100644
--- a/contrib/restricted/boost/boost/test/output/xml_log_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/output/xml_log_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/output/xml_report_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/output/xml_report_formatter.hpp
index ca5e47182f..ca5e47182f 100644
--- a/contrib/restricted/boost/boost/test/output/xml_report_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/output/xml_report_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/progress_monitor.hpp b/contrib/restricted/boost/test/include/boost/test/progress_monitor.hpp
index 2f661f5825..2f661f5825 100644
--- a/contrib/restricted/boost/boost/test/progress_monitor.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/progress_monitor.hpp
diff --git a/contrib/restricted/boost/boost/test/results_collector.hpp b/contrib/restricted/boost/test/include/boost/test/results_collector.hpp
index 3acd7b87bc..3acd7b87bc 100644
--- a/contrib/restricted/boost/boost/test/results_collector.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/results_collector.hpp
diff --git a/contrib/restricted/boost/boost/test/results_reporter.hpp b/contrib/restricted/boost/test/include/boost/test/results_reporter.hpp
index 6f8d8f1105..6f8d8f1105 100644
--- a/contrib/restricted/boost/boost/test/results_reporter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/results_reporter.hpp
diff --git a/contrib/restricted/boost/boost/test/test_framework_init_observer.hpp b/contrib/restricted/boost/test/include/boost/test/test_framework_init_observer.hpp
index cdf5ef5edd..cdf5ef5edd 100644
--- a/contrib/restricted/boost/boost/test/test_framework_init_observer.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/test_framework_init_observer.hpp
diff --git a/contrib/restricted/boost/boost/test/test_tools.hpp b/contrib/restricted/boost/test/include/boost/test/test_tools.hpp
index a542d5fcde..a542d5fcde 100644
--- a/contrib/restricted/boost/boost/test/test_tools.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/test_tools.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/assertion.hpp b/contrib/restricted/boost/test/include/boost/test/tools/assertion.hpp
index cca2f52beb..cca2f52beb 100644
--- a/contrib/restricted/boost/boost/test/tools/assertion.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/assertion.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/assertion_result.hpp b/contrib/restricted/boost/test/include/boost/test/tools/assertion_result.hpp
index 85eea741f7..85eea741f7 100644
--- a/contrib/restricted/boost/boost/test/tools/assertion_result.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/assertion_result.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/collection_comparison_op.hpp b/contrib/restricted/boost/test/include/boost/test/tools/collection_comparison_op.hpp
index 4984c94c07..864103fb4a 100644
--- a/contrib/restricted/boost/boost/test/tools/collection_comparison_op.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/collection_comparison_op.hpp
@@ -12,10 +12,6 @@
 #ifndef BOOST_TEST_TOOLS_COLLECTION_COMPARISON_OP_HPP_050815GER
 #define BOOST_TEST_TOOLS_COLLECTION_COMPARISON_OP_HPP_050815GER
 
-#if defined(__GNUC__)
-    #pragma GCC system_header
-#endif
-
 // Boost.Test
 #include <boost/test/tools/assertion.hpp>
 
diff --git a/contrib/restricted/boost/boost/test/tools/context.hpp b/contrib/restricted/boost/test/include/boost/test/tools/context.hpp
index 71650065ef..71650065ef 100644
--- a/contrib/restricted/boost/boost/test/tools/context.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/context.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/cstring_comparison_op.hpp b/contrib/restricted/boost/test/include/boost/test/tools/cstring_comparison_op.hpp
index 50f181d858..50f181d858 100644
--- a/contrib/restricted/boost/boost/test/tools/cstring_comparison_op.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/cstring_comparison_op.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/bitwise_manip.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/bitwise_manip.hpp
index f8c9685c10..f8c9685c10 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/bitwise_manip.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/bitwise_manip.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/expression_holder.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/expression_holder.hpp
index 694a2d5f4e..694a2d5f4e 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/expression_holder.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/expression_holder.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/fwd.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/fwd.hpp
index 339ab39eda..339ab39eda 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/fwd.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/fwd.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/indirections.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/indirections.hpp
index 836218d98d..836218d98d 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/indirections.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/indirections.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/it_pair.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/it_pair.hpp
index 4352fd464f..4352fd464f 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/it_pair.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/it_pair.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/lexicographic_manip.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/lexicographic_manip.hpp
index f6ffff7a34..f6ffff7a34 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/lexicographic_manip.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/lexicographic_manip.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/per_element_manip.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/per_element_manip.hpp
index 4a9aebbaaa..4a9aebbaaa 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/per_element_manip.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/per_element_manip.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/print_helper.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/print_helper.hpp
index 2c6a3b5e80..2c6a3b5e80 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/print_helper.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/print_helper.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/detail/tolerance_manip.hpp b/contrib/restricted/boost/test/include/boost/test/tools/detail/tolerance_manip.hpp
index e07b043591..e07b043591 100644
--- a/contrib/restricted/boost/boost/test/tools/detail/tolerance_manip.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/detail/tolerance_manip.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/floating_point_comparison.hpp b/contrib/restricted/boost/test/include/boost/test/tools/floating_point_comparison.hpp
index d704a41092..d704a41092 100644
--- a/contrib/restricted/boost/boost/test/tools/floating_point_comparison.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/floating_point_comparison.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/fpc_op.hpp b/contrib/restricted/boost/test/include/boost/test/tools/fpc_op.hpp
index b879d218f2..b879d218f2 100644
--- a/contrib/restricted/boost/boost/test/tools/fpc_op.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/fpc_op.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/fpc_tolerance.hpp b/contrib/restricted/boost/test/include/boost/test/tools/fpc_tolerance.hpp
index c862a17e75..c862a17e75 100644
--- a/contrib/restricted/boost/boost/test/tools/fpc_tolerance.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/fpc_tolerance.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/interface.hpp b/contrib/restricted/boost/test/include/boost/test/tools/interface.hpp
index 5e84f1c6d4..5e84f1c6d4 100644
--- a/contrib/restricted/boost/boost/test/tools/interface.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/interface.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/old/impl.hpp b/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp
index af075b7673..1e463f3004 100644
--- a/contrib/restricted/boost/boost/test/tools/old/impl.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/old/impl.hpp
@@ -15,10 +15,6 @@
 #ifndef BOOST_TEST_TOOLS_OLD_IMPL_HPP_012705GER
 #define BOOST_TEST_TOOLS_OLD_IMPL_HPP_012705GER
 
-#if defined(__GNUC__)
-    #pragma GCC system_header
-#endif
-
 // Boost.Test
 #include <boost/test/unit_test_log.hpp>
 #include <boost/test/tools/assertion_result.hpp>
@@ -108,7 +104,10 @@ BOOST_PP_REPEAT( BOOST_TEST_MAX_PREDICATE_ARITY, IMPL_FRWD, _ )
 template <class Left, class Right>
 inline assertion_result equal_impl( Left const& left, Right const& right )
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
     return left == right;
+#pragma GCC diagnostic pop
 }
 
 //____________________________________________________________________________//
@@ -162,6 +161,8 @@ struct ne_impl {
 
 //____________________________________________________________________________//
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
 struct lt_impl {
     template <class Left, class Right>
     assertion_result operator()( Left const& left, Right const& right )
@@ -199,6 +200,7 @@ struct ge_impl {
         return left >= right;
     }
 };
+#pragma GCC diagnostic pop
 
 //____________________________________________________________________________//
 
@@ -210,7 +212,10 @@ struct equal_coll_impl {
         std::size_t         pos = 0;
 
         for( ; left_begin != left_end && right_begin != right_end; ++left_begin, ++right_begin, ++pos ) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wsign-compare"
             if( *left_begin != *right_begin ) {
+#pragma GCC diagnostic pop
                 pr = false;
                 pr.message() << "\nMismatch at position " << pos << ": "
                   << ::boost::test_tools::tt_detail::print_helper(*left_begin)
diff --git a/contrib/restricted/boost/boost/test/tools/old/interface.hpp b/contrib/restricted/boost/test/include/boost/test/tools/old/interface.hpp
index 2d6f8b78c0..2d6f8b78c0 100644
--- a/contrib/restricted/boost/boost/test/tools/old/interface.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/old/interface.hpp
diff --git a/contrib/restricted/boost/boost/test/tools/output_test_stream.hpp b/contrib/restricted/boost/test/include/boost/test/tools/output_test_stream.hpp
index 2abbf7b521..2abbf7b521 100644
--- a/contrib/restricted/boost/boost/test/tools/output_test_stream.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tools/output_test_stream.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/auto_registration.hpp b/contrib/restricted/boost/test/include/boost/test/tree/auto_registration.hpp
index a3fe32fda7..a3fe32fda7 100644
--- a/contrib/restricted/boost/boost/test/tree/auto_registration.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/auto_registration.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/decorator.hpp b/contrib/restricted/boost/test/include/boost/test/tree/decorator.hpp
index 27c46682a0..27c46682a0 100644
--- a/contrib/restricted/boost/boost/test/tree/decorator.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/decorator.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/fixture.hpp b/contrib/restricted/boost/test/include/boost/test/tree/fixture.hpp
index 8e07b2aa1d..8e07b2aa1d 100644
--- a/contrib/restricted/boost/boost/test/tree/fixture.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/fixture.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/global_fixture.hpp b/contrib/restricted/boost/test/include/boost/test/tree/global_fixture.hpp
index 7c96d34e89..7c96d34e89 100644
--- a/contrib/restricted/boost/boost/test/tree/global_fixture.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/global_fixture.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/observer.hpp b/contrib/restricted/boost/test/include/boost/test/tree/observer.hpp
index bd6fc9bff5..bd6fc9bff5 100644
--- a/contrib/restricted/boost/boost/test/tree/observer.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/observer.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/test_case_counter.hpp b/contrib/restricted/boost/test/include/boost/test/tree/test_case_counter.hpp
index a74f37f152..a74f37f152 100644
--- a/contrib/restricted/boost/boost/test/tree/test_case_counter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/test_case_counter.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/test_case_template.hpp b/contrib/restricted/boost/test/include/boost/test/tree/test_case_template.hpp
index 83a13f00f5..83a13f00f5 100644
--- a/contrib/restricted/boost/boost/test/tree/test_case_template.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/test_case_template.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/test_unit.hpp b/contrib/restricted/boost/test/include/boost/test/tree/test_unit.hpp
index 273fa14ff3..273fa14ff3 100644
--- a/contrib/restricted/boost/boost/test/tree/test_unit.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/test_unit.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/traverse.hpp b/contrib/restricted/boost/test/include/boost/test/tree/traverse.hpp
index d27917cace..d27917cace 100644
--- a/contrib/restricted/boost/boost/test/tree/traverse.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/traverse.hpp
diff --git a/contrib/restricted/boost/boost/test/tree/visitor.hpp b/contrib/restricted/boost/test/include/boost/test/tree/visitor.hpp
index 8f1bae5c92..8f1bae5c92 100644
--- a/contrib/restricted/boost/boost/test/tree/visitor.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/tree/visitor.hpp
diff --git a/contrib/restricted/boost/boost/test/unit_test_log.hpp b/contrib/restricted/boost/test/include/boost/test/unit_test_log.hpp
index 6944ffa79a..6944ffa79a 100644
--- a/contrib/restricted/boost/boost/test/unit_test_log.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/unit_test_log.hpp
diff --git a/contrib/restricted/boost/boost/test/unit_test_log_formatter.hpp b/contrib/restricted/boost/test/include/boost/test/unit_test_log_formatter.hpp
index 79b74e0849..79b74e0849 100644
--- a/contrib/restricted/boost/boost/test/unit_test_log_formatter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/unit_test_log_formatter.hpp
diff --git a/contrib/restricted/boost/boost/test/unit_test_monitor.hpp b/contrib/restricted/boost/test/include/boost/test/unit_test_monitor.hpp
index 1f937fa674..1f937fa674 100644
--- a/contrib/restricted/boost/boost/test/unit_test_monitor.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/unit_test_monitor.hpp
diff --git a/contrib/restricted/boost/boost/test/unit_test_parameters.hpp b/contrib/restricted/boost/test/include/boost/test/unit_test_parameters.hpp
index e01bbd7aed..e01bbd7aed 100644
--- a/contrib/restricted/boost/boost/test/unit_test_parameters.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/unit_test_parameters.hpp
diff --git a/contrib/restricted/boost/boost/test/unit_test_suite.hpp b/contrib/restricted/boost/test/include/boost/test/unit_test_suite.hpp
index 13ff804b44..13ff804b44 100644
--- a/contrib/restricted/boost/boost/test/unit_test_suite.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/unit_test_suite.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/algorithm.hpp b/contrib/restricted/boost/test/include/boost/test/utils/algorithm.hpp
index 7f16816c3a..7f16816c3a 100644
--- a/contrib/restricted/boost/boost/test/utils/algorithm.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/algorithm.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/assign_op.hpp b/contrib/restricted/boost/test/include/boost/test/utils/assign_op.hpp
index 89d8bfa956..89d8bfa956 100644
--- a/contrib/restricted/boost/boost/test/utils/assign_op.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/assign_op.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/basic_cstring/basic_cstring.hpp b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/basic_cstring.hpp
index cec0214b73..cec0214b73 100644
--- a/contrib/restricted/boost/boost/test/utils/basic_cstring/basic_cstring.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/basic_cstring.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
index f0622263d1..f0622263d1 100644
--- a/contrib/restricted/boost/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/basic_cstring_fwd.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/basic_cstring/bcs_char_traits.hpp b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/bcs_char_traits.hpp
index eb77f474c7..eb77f474c7 100644
--- a/contrib/restricted/boost/boost/test/utils/basic_cstring/bcs_char_traits.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/bcs_char_traits.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/basic_cstring/compare.hpp b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/compare.hpp
index 2a256fc6be..2a256fc6be 100644
--- a/contrib/restricted/boost/boost/test/utils/basic_cstring/compare.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/compare.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/basic_cstring/io.hpp b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/io.hpp
index 02ccb126f8..02ccb126f8 100644
--- a/contrib/restricted/boost/boost/test/utils/basic_cstring/io.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/basic_cstring/io.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/class_properties.hpp b/contrib/restricted/boost/test/include/boost/test/utils/class_properties.hpp
index d4f3db3f2d..d4f3db3f2d 100644
--- a/contrib/restricted/boost/boost/test/utils/class_properties.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/class_properties.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/custom_manip.hpp b/contrib/restricted/boost/test/include/boost/test/utils/custom_manip.hpp
index d5ddaf5c07..d5ddaf5c07 100644
--- a/contrib/restricted/boost/boost/test/utils/custom_manip.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/custom_manip.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/foreach.hpp b/contrib/restricted/boost/test/include/boost/test/utils/foreach.hpp
index 68462ae719..68462ae719 100644
--- a/contrib/restricted/boost/boost/test/utils/foreach.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/foreach.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/is_cstring.hpp b/contrib/restricted/boost/test/include/boost/test/utils/is_cstring.hpp
index 12326b0418..12326b0418 100644
--- a/contrib/restricted/boost/boost/test/utils/is_cstring.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/is_cstring.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/is_forward_iterable.hpp b/contrib/restricted/boost/test/include/boost/test/utils/is_forward_iterable.hpp
index 1c9108054b..1c9108054b 100644
--- a/contrib/restricted/boost/boost/test/utils/is_forward_iterable.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/is_forward_iterable.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/iterator/input_iterator_facade.hpp b/contrib/restricted/boost/test/include/boost/test/utils/iterator/input_iterator_facade.hpp
index d695ee3a87..d695ee3a87 100644
--- a/contrib/restricted/boost/boost/test/utils/iterator/input_iterator_facade.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/iterator/input_iterator_facade.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/iterator/token_iterator.hpp b/contrib/restricted/boost/test/include/boost/test/utils/iterator/token_iterator.hpp
index e3a923a2ee..e3a923a2ee 100644
--- a/contrib/restricted/boost/boost/test/utils/iterator/token_iterator.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/iterator/token_iterator.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/lazy_ostream.hpp b/contrib/restricted/boost/test/include/boost/test/utils/lazy_ostream.hpp
index 26bd8ed385..26bd8ed385 100644
--- a/contrib/restricted/boost/boost/test/utils/lazy_ostream.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/lazy_ostream.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/named_params.hpp b/contrib/restricted/boost/test/include/boost/test/utils/named_params.hpp
index 50de5bfba0..50de5bfba0 100644
--- a/contrib/restricted/boost/boost/test/utils/named_params.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/named_params.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/rtti.hpp b/contrib/restricted/boost/test/include/boost/test/utils/rtti.hpp
index b230692d80..b230692d80 100644
--- a/contrib/restricted/boost/boost/test/utils/rtti.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/rtti.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/argument.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/argument.hpp
index 879ee96f9f..879ee96f9f 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/argument.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/argument.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/argument_factory.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/argument_factory.hpp
index f3448f8cc4..f3448f8cc4 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/argument_factory.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/argument_factory.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/cla/argv_traverser.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/cla/argv_traverser.hpp
index 10fb67bde4..10fb67bde4 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/cla/argv_traverser.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/cla/argv_traverser.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/cla/parser.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/cla/parser.hpp
index a57091b474..a57091b474 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/cla/parser.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/cla/parser.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/env/fetch.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/env/fetch.hpp
index 97d54d4905..97d54d4905 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/env/fetch.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/env/fetch.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/errors.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/errors.hpp
index 5b263d21c5..5b263d21c5 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/errors.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/errors.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/finalize.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/finalize.hpp
index 181428550c..181428550c 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/finalize.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/finalize.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/fwd.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/fwd.hpp
index 17ae881222..17ae881222 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/fwd.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/fwd.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/modifier.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/modifier.hpp
index f4f5a42baa..f4f5a42baa 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/modifier.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/modifier.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/runtime/parameter.hpp b/contrib/restricted/boost/test/include/boost/test/utils/runtime/parameter.hpp
index 420b60264d..420b60264d 100644
--- a/contrib/restricted/boost/boost/test/utils/runtime/parameter.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/runtime/parameter.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/setcolor.hpp b/contrib/restricted/boost/test/include/boost/test/utils/setcolor.hpp
index 91b068ae6f..91b068ae6f 100644
--- a/contrib/restricted/boost/boost/test/utils/setcolor.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/setcolor.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/string_cast.hpp b/contrib/restricted/boost/test/include/boost/test/utils/string_cast.hpp
index 3c069a8403..3c069a8403 100644
--- a/contrib/restricted/boost/boost/test/utils/string_cast.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/string_cast.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/trivial_singleton.hpp b/contrib/restricted/boost/test/include/boost/test/utils/trivial_singleton.hpp
index ac612b6393..ac612b6393 100644
--- a/contrib/restricted/boost/boost/test/utils/trivial_singleton.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/trivial_singleton.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/wrap_stringstream.hpp b/contrib/restricted/boost/test/include/boost/test/utils/wrap_stringstream.hpp
index 425d7ed75b..425d7ed75b 100644
--- a/contrib/restricted/boost/boost/test/utils/wrap_stringstream.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/wrap_stringstream.hpp
diff --git a/contrib/restricted/boost/boost/test/utils/xml_printer.hpp b/contrib/restricted/boost/test/include/boost/test/utils/xml_printer.hpp
index ffaf8fcc05..ffaf8fcc05 100644
--- a/contrib/restricted/boost/boost/test/utils/xml_printer.hpp
+++ b/contrib/restricted/boost/test/include/boost/test/utils/xml_printer.hpp
diff --git a/contrib/restricted/boost/libs/test/src/compiler_log_formatter.cpp b/contrib/restricted/boost/test/src/compiler_log_formatter.cpp
index e1508c2f1e..e1508c2f1e 100644
--- a/contrib/restricted/boost/libs/test/src/compiler_log_formatter.cpp
+++ b/contrib/restricted/boost/test/src/compiler_log_formatter.cpp
diff --git a/contrib/restricted/boost/libs/test/src/cpp_main.cpp b/contrib/restricted/boost/test/src/cpp_main.cpp
index ab92ba5e79..ab92ba5e79 100644
--- a/contrib/restricted/boost/libs/test/src/cpp_main.cpp
+++ b/contrib/restricted/boost/test/src/cpp_main.cpp
diff --git a/contrib/restricted/boost/libs/test/src/debug.cpp b/contrib/restricted/boost/test/src/debug.cpp
index 04c6e0a10d..04c6e0a10d 100644
--- a/contrib/restricted/boost/libs/test/src/debug.cpp
+++ b/contrib/restricted/boost/test/src/debug.cpp
diff --git a/contrib/restricted/boost/libs/test/src/decorator.cpp b/contrib/restricted/boost/test/src/decorator.cpp
index 3972407d66..3972407d66 100644
--- a/contrib/restricted/boost/libs/test/src/decorator.cpp
+++ b/contrib/restricted/boost/test/src/decorator.cpp
diff --git a/contrib/restricted/boost/libs/test/src/execution_monitor.cpp b/contrib/restricted/boost/test/src/execution_monitor.cpp
index e7fdfb9139..e7fdfb9139 100644
--- a/contrib/restricted/boost/libs/test/src/execution_monitor.cpp
+++ b/contrib/restricted/boost/test/src/execution_monitor.cpp
diff --git a/contrib/restricted/boost/libs/test/src/framework.cpp b/contrib/restricted/boost/test/src/framework.cpp
index 52e7614835..52e7614835 100644
--- a/contrib/restricted/boost/libs/test/src/framework.cpp
+++ b/contrib/restricted/boost/test/src/framework.cpp
diff --git a/contrib/restricted/boost/libs/test/src/junit_log_formatter.cpp b/contrib/restricted/boost/test/src/junit_log_formatter.cpp
index 0cac80465b..0cac80465b 100644
--- a/contrib/restricted/boost/libs/test/src/junit_log_formatter.cpp
+++ b/contrib/restricted/boost/test/src/junit_log_formatter.cpp
diff --git a/contrib/restricted/boost/libs/test/src/plain_report_formatter.cpp b/contrib/restricted/boost/test/src/plain_report_formatter.cpp
index 95cf64fd63..95cf64fd63 100644
--- a/contrib/restricted/boost/libs/test/src/plain_report_formatter.cpp
+++ b/contrib/restricted/boost/test/src/plain_report_formatter.cpp
diff --git a/contrib/restricted/boost/libs/test/src/progress_monitor.cpp b/contrib/restricted/boost/test/src/progress_monitor.cpp
index 1d4afc7a5a..1d4afc7a5a 100644
--- a/contrib/restricted/boost/libs/test/src/progress_monitor.cpp
+++ b/contrib/restricted/boost/test/src/progress_monitor.cpp
diff --git a/contrib/restricted/boost/libs/test/src/results_collector.cpp b/contrib/restricted/boost/test/src/results_collector.cpp
index 5d8e0b7dd2..5d8e0b7dd2 100644
--- a/contrib/restricted/boost/libs/test/src/results_collector.cpp
+++ b/contrib/restricted/boost/test/src/results_collector.cpp
diff --git a/contrib/restricted/boost/libs/test/src/results_reporter.cpp b/contrib/restricted/boost/test/src/results_reporter.cpp
index 205cba5f83..205cba5f83 100644
--- a/contrib/restricted/boost/libs/test/src/results_reporter.cpp
+++ b/contrib/restricted/boost/test/src/results_reporter.cpp
diff --git a/contrib/restricted/boost/libs/test/src/test_framework_init_observer.cpp b/contrib/restricted/boost/test/src/test_framework_init_observer.cpp
index 140329ddff..140329ddff 100644
--- a/contrib/restricted/boost/libs/test/src/test_framework_init_observer.cpp
+++ b/contrib/restricted/boost/test/src/test_framework_init_observer.cpp
diff --git a/contrib/restricted/boost/libs/test/src/test_main.cpp b/contrib/restricted/boost/test/src/test_main.cpp
index f7ae352d25..f7ae352d25 100644
--- a/contrib/restricted/boost/libs/test/src/test_main.cpp
+++ b/contrib/restricted/boost/test/src/test_main.cpp
diff --git a/contrib/restricted/boost/libs/test/src/test_tools.cpp b/contrib/restricted/boost/test/src/test_tools.cpp
index d9d2960373..d9d2960373 100644
--- a/contrib/restricted/boost/libs/test/src/test_tools.cpp
+++ b/contrib/restricted/boost/test/src/test_tools.cpp
diff --git a/contrib/restricted/boost/libs/test/src/test_tree.cpp b/contrib/restricted/boost/test/src/test_tree.cpp
index bc273ed965..bc273ed965 100644
--- a/contrib/restricted/boost/libs/test/src/test_tree.cpp
+++ b/contrib/restricted/boost/test/src/test_tree.cpp
diff --git a/contrib/restricted/boost/libs/test/src/unit_test_log.cpp b/contrib/restricted/boost/test/src/unit_test_log.cpp
index c09437cbd9..c09437cbd9 100644
--- a/contrib/restricted/boost/libs/test/src/unit_test_log.cpp
+++ b/contrib/restricted/boost/test/src/unit_test_log.cpp
diff --git a/contrib/restricted/boost/libs/test/src/unit_test_main.cpp b/contrib/restricted/boost/test/src/unit_test_main.cpp
index 74b0b84c63..74b0b84c63 100644
--- a/contrib/restricted/boost/libs/test/src/unit_test_main.cpp
+++ b/contrib/restricted/boost/test/src/unit_test_main.cpp
diff --git a/contrib/restricted/boost/libs/test/src/unit_test_monitor.cpp b/contrib/restricted/boost/test/src/unit_test_monitor.cpp
index ffc646195d..ffc646195d 100644
--- a/contrib/restricted/boost/libs/test/src/unit_test_monitor.cpp
+++ b/contrib/restricted/boost/test/src/unit_test_monitor.cpp
diff --git a/contrib/restricted/boost/libs/test/src/unit_test_parameters.cpp b/contrib/restricted/boost/test/src/unit_test_parameters.cpp
index e82694e34b..e82694e34b 100644
--- a/contrib/restricted/boost/libs/test/src/unit_test_parameters.cpp
+++ b/contrib/restricted/boost/test/src/unit_test_parameters.cpp
diff --git a/contrib/restricted/boost/libs/test/src/xml_log_formatter.cpp b/contrib/restricted/boost/test/src/xml_log_formatter.cpp
index ca497a9f39..ca497a9f39 100644
--- a/contrib/restricted/boost/libs/test/src/xml_log_formatter.cpp
+++ b/contrib/restricted/boost/test/src/xml_log_formatter.cpp
diff --git a/contrib/restricted/boost/libs/test/src/xml_report_formatter.cpp b/contrib/restricted/boost/test/src/xml_report_formatter.cpp
index 18ff1d8657..18ff1d8657 100644
--- a/contrib/restricted/boost/libs/test/src/xml_report_formatter.cpp
+++ b/contrib/restricted/boost/test/src/xml_report_formatter.cpp
diff --git a/ydb/library/yql/providers/common/codec/yql_json_codec.cpp b/ydb/library/yql/providers/common/codec/yql_json_codec.cpp
index db7cdbbfb3..d6318fbd7e 100644
--- a/ydb/library/yql/providers/common/codec/yql_json_codec.cpp
+++ b/ydb/library/yql/providers/common/codec/yql_json_codec.cpp
@@ -246,7 +246,7 @@ void WriteValueToJson(TJsonWriter& writer, const NKikimr::NUdf::TUnboxedValuePod
     case TType::EKind::Optional:
     {
         writer.OpenArray();
-        if (value.GetOptionalValue()) {
+        if (value) {
             auto optionalType = AS_TYPE(TOptionalType, type);
             WriteValueToJson(writer, value.GetOptionalValue(), optionalType->GetItemType(), convertPolicy);
         }
diff --git a/ydb/library/yql/providers/common/codec/yql_json_codec_ut.cpp b/ydb/library/yql/providers/common/codec/yql_json_codec_ut.cpp
index de5255ccf5..fbe86e3359 100644
--- a/ydb/library/yql/providers/common/codec/yql_json_codec_ut.cpp
+++ b/ydb/library/yql/providers/common/codec/yql_json_codec_ut.cpp
@@ -404,7 +404,7 @@ Y_UNIT_TEST_SUITE(DeserializeDict) {
 
 
 Y_UNIT_TEST_SUITE(SerializeOptional) {
-    Y_UNIT_TEST(JustOptional) {
+    Y_UNIT_TEST(OptionalOfList) {
         TTestContext ctx;
         NUdf::TUnboxedValue* items;
         auto value = ctx.HolderFactory.CreateDirectArrayHolder(3, items).MakeOptional();
@@ -428,14 +428,13 @@ Y_UNIT_TEST_SUITE(SerializeOptional) {
 
     Y_UNIT_TEST(NothingOptional) {
         TTestContext ctx;
-        auto value = NUdf::TUnboxedValuePod().MakeOptional();
-        auto elementType = TListType::Create(TDataType::Create(NUdf::TDataType<ui8>::Id, ctx.TypeEnv), ctx.TypeEnv);
+        auto value = NUdf::TUnboxedValuePod();
+        auto elementType = TDataType::Create(NUdf::TDataType<ui8>::Id, ctx.TypeEnv);
         auto type = TOptionalType::Create(elementType, ctx.TypeEnv);
         auto json = WriteValueToFuncJsonStr(value, type);
         UNIT_ASSERT_VALUES_EQUAL(json, "[]");
     }
 
-
     Y_UNIT_TEST(SeveralOptionals) {
         TTestContext ctx;
         auto elementType = TDataType::Create(NUdf::TDataType<ui8>::Id, ctx.TypeEnv);
@@ -443,7 +442,7 @@ Y_UNIT_TEST_SUITE(SerializeOptional) {
         type = TOptionalType::Create(type, ctx.TypeEnv);
         type = TOptionalType::Create(type, ctx.TypeEnv);
 
-        auto value1 = NUdf::TUnboxedValuePod().MakeOptional().MakeOptional().MakeOptional();
+        auto value1 = NUdf::TUnboxedValuePod().MakeOptional().MakeOptional();
         auto json1 = WriteValueToFuncJsonStr(value1, type);
         UNIT_ASSERT_VALUES_EQUAL(json1, "[[[]]]");