diff options
author | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-15 17:39:49 +0300 |
---|---|---|
committer | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-15 17:39:49 +0300 |
commit | 421a629182f5e46810858394379c83c7c261c43a (patch) | |
tree | 2c94827a08074e6502a8e88a9d0c5b203e193af9 | |
parent | 93ef6e102d8b7960adc489ad6c357b60084cebed (diff) | |
download | ydb-421a629182f5e46810858394379c83c7c261c43a.tar.gz |
Update contrib/restricted/boost/algorithm to 1.80.0
16 files changed, 120 insertions, 39 deletions
diff --git a/contrib/restricted/boost/algorithm/LICENSE b/contrib/restricted/boost/algorithm/LICENSE new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/contrib/restricted/boost/algorithm/LICENSE @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/contrib/restricted/boost/algorithm/README.md b/contrib/restricted/boost/algorithm/README.md new file mode 100644 index 0000000000..d0d5752fa8 --- /dev/null +++ b/contrib/restricted/boost/algorithm/README.md @@ -0,0 +1,35 @@ +Algorithm, part of collection of the [Boost C++ Libraries](http://github.com/boostorg), is a collection of general purpose algorithms. + +### License + +Distributed under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). + +### Properties + +* C++03 +* Header-only + +### Build Status + +Branch | Travis | Appveyor | Coverity Scan | codecov.io | Deps | Docs | Tests | +:-------------: | ------ | -------- | ------------- | ---------- | ---- | ---- | ----- | +[`master`](https://github.com/boostorg/algorithm/tree/master) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=master)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/master?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/master) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/master/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/master)| [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](http://www.boost.org/doc/libs/master/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/algorithm.html) +[`develop`](https://github.com/boostorg/algorithm/tree/develop) | [![Build Status](https://travis-ci.org/boostorg/algorithm.svg?branch=develop)](https://travis-ci.org/boostorg/algorithm) | [![Build status](https://ci.appveyor.com/api/projects/status/FIXME/branch/develop?svg=true)](https://ci.appveyor.com/project/USER/PROJECT/branch/develop) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/99999/badge.svg)](https://scan.coverity.com/projects/boostorg-algorithm) | [![codecov](https://codecov.io/gh/boostorg/algorithm/branch/develop/graph/badge.svg)](https://codecov.io/gh/boostorg/algorithm/branch/develop) | [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/algorithm.html) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](http://www.boost.org/doc/libs/develop/doc/html/algorithm.html) | [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/algorithm.html) + +### Directories + +| Name | Purpose | +| ----------- | ------------------------------ | +| `doc` | documentation | +| `example` | examples | +| `include` | headers | +| `test` | unit tests | + +### More information + +* [Ask questions](http://stackoverflow.com/questions/ask?tags=c%2B%2B,boost,boost-algorithm) +* [Report bugs](https://github.com/boostorg/algorithm/issues): Be sure to mention Boost version, platform and compiler you're using. A small compilable code sample to reproduce the problem is always good as well. +* Submit your patches as pull requests against **develop** branch. Note that by submitting patches you agree to license your modifications under the [Boost Software License, Version 1.0](http://www.boost.org/LICENSE_1_0.txt). +* Discussions about the library are held on the [Boost developers mailing list](http://www.boost.org/community/groups.html#main). Be sure to read the [discussion policy](http://www.boost.org/community/policy.html) before posting and add the `[algorithm]` tag at the beginning of the subject line. + + diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/cxx11/all_of.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/cxx11/all_of.hpp index 8280b18d62..f7ee311b28 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/cxx11/all_of.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/cxx11/all_of.hpp @@ -12,6 +12,7 @@ #ifndef BOOST_ALGORITHM_ALL_OF_HPP #define BOOST_ALGORITHM_ALL_OF_HPP +#include <boost/config.hpp> #include <boost/range/begin.hpp> #include <boost/range/end.hpp> @@ -27,7 +28,7 @@ namespace boost { namespace algorithm { /// /// \note This function is part of the C++2011 standard library. template<typename InputIterator, typename Predicate> -bool all_of ( InputIterator first, InputIterator last, Predicate p ) +BOOST_CXX14_CONSTEXPR bool all_of ( InputIterator first, InputIterator last, Predicate p ) { for ( ; first != last; ++first ) if ( !p(*first)) @@ -43,7 +44,7 @@ bool all_of ( InputIterator first, InputIterator last, Predicate p ) /// \param p A predicate for testing the elements of the range /// template<typename Range, typename Predicate> -bool all_of ( const Range &r, Predicate p ) +BOOST_CXX14_CONSTEXPR bool all_of ( const Range &r, Predicate p ) { return boost::algorithm::all_of ( boost::begin (r), boost::end (r), p ); } @@ -57,7 +58,7 @@ bool all_of ( const Range &r, Predicate p ) /// \param val A value to compare against /// template<typename InputIterator, typename T> -bool all_of_equal ( InputIterator first, InputIterator last, const T &val ) +BOOST_CXX14_CONSTEXPR bool all_of_equal ( InputIterator first, InputIterator last, const T &val ) { for ( ; first != last; ++first ) if ( val != *first ) @@ -73,7 +74,7 @@ bool all_of_equal ( InputIterator first, InputIterator last, const T &val ) /// \param val A value to compare against /// template<typename Range, typename T> -bool all_of_equal ( const Range &r, const T &val ) +BOOST_CXX14_CONSTEXPR bool all_of_equal ( const Range &r, const T &val ) { return boost::algorithm::all_of_equal ( boost::begin (r), boost::end (r), val ); } diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/compare.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/compare.hpp index 734303a9a9..dc34007cf0 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/compare.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/compare.hpp @@ -65,7 +65,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)==std::toupper(Arg2); #else return std::toupper<T1>(Arg1,m_Loc)==std::toupper<T2>(Arg2,m_Loc); @@ -118,7 +118,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)<std::toupper(Arg2); #else return std::toupper<T1>(Arg1,m_Loc)<std::toupper<T2>(Arg2,m_Loc); @@ -171,7 +171,7 @@ namespace boost { template< typename T1, typename T2 > bool operator()( const T1& Arg1, const T2& Arg2 ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper(Arg1)<=std::toupper(Arg2); #else return std::toupper<T1>(Arg1,m_Loc)<=std::toupper<T2>(Arg2,m_Loc); diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/case_conv.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/case_conv.hpp index 233912ca0f..188602a1d0 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/case_conv.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/case_conv.hpp @@ -15,6 +15,9 @@ #include <locale> #include <functional> +#include <boost/iterator/transform_iterator.hpp> +#include <boost/range/begin.hpp> +#include <boost/range/end.hpp> #include <boost/type_traits/make_unsigned.hpp> namespace boost { @@ -40,7 +43,7 @@ namespace boost { // Operation CharT operator ()( CharT Ch ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::tolower( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch )); #else return std::tolower<CharT>( Ch, *m_Loc ); @@ -62,7 +65,7 @@ namespace boost { // Operation CharT operator ()( CharT Ch ) const { - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x564) && !defined(_USE_OLD_RW_STL) return std::toupper( static_cast<typename boost::make_unsigned <CharT>::type> ( Ch )); #else return std::toupper<CharT>( Ch, *m_Loc ); diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/classification.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/classification.hpp index 704d9d20ff..30a37c698e 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/classification.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/classification.hpp @@ -13,10 +13,12 @@ #include <boost/algorithm/string/config.hpp> #include <algorithm> +#include <cstring> #include <functional> #include <locale> #include <boost/range/begin.hpp> +#include <boost/range/distance.hpp> #include <boost/range/end.hpp> #include <boost/algorithm/string/predicate_facade.hpp> @@ -45,7 +47,7 @@ namespace boost { return std::use_facet< std::ctype<CharT> >(m_Locale).is( m_Type, Ch ); } - #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x582) && !defined(_USE_OLD_RW_STL) + #if defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x560) && (BOOST_BORLANDC <= 0x582) && !defined(_USE_OLD_RW_STL) template<> bool operator()( char const Ch ) const { diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/find_format_all.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/find_format_all.hpp index 52930c83ad..311fa26fff 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/find_format_all.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/find_format_all.hpp @@ -18,6 +18,8 @@ #include <boost/algorithm/string/detail/find_format_store.hpp> #include <boost/algorithm/string/detail/replace_storage.hpp> +#include <deque> + namespace boost { namespace algorithm { namespace detail { diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/finder.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/finder.hpp index a2a958212d..8e70240dec 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/finder.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/finder.hpp @@ -13,7 +13,7 @@ #include <boost/algorithm/string/config.hpp> #include <boost/algorithm/string/constants.hpp> -#include <boost/detail/iterator.hpp> +#include <iterator> #include <boost/range/iterator_range_core.hpp> #include <boost/range/begin.hpp> @@ -127,8 +127,8 @@ namespace boost { if( boost::empty(m_Search) ) return result_type( End, End ); - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits<ForwardIteratorT>::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits<ForwardIteratorT>::iterator_category category; return findit( Begin, End, category() ); } @@ -344,9 +344,8 @@ namespace boost { typedef iterator_range<ForwardIteratorT> result_type; input_iterator_type It=Begin; - for( - unsigned int Index=0; - Index<N && It!=End; ++Index,++It ) {}; + for( unsigned int Index=0; Index<N && It!=End; ++Index,++It ) + ; return result_type( Begin, It ); } @@ -375,8 +374,8 @@ namespace boost { ForwardIteratorT End, unsigned int N ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits<ForwardIteratorT>::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits<ForwardIteratorT>::iterator_category category; return ::boost::algorithm::detail::find_head_impl( Begin, End, N, category() ); } @@ -397,10 +396,12 @@ namespace boost { input_iterator_type It2=Begin; // Advance It2 by N increments - for( Index=0; Index<N && It2!=End; ++Index,++It2 ) {}; + for( Index=0; Index<N && It2!=End; ++Index,++It2 ) + ; // Advance It, It2 to the end - for(; It2!=End; ++It,++It2 ) {}; + for(; It2!=End; ++It,++It2 ) + ; return result_type( It, It2 ); } @@ -417,9 +418,8 @@ namespace boost { typedef iterator_range<ForwardIteratorT> result_type; input_iterator_type It=End; - for( - unsigned int Index=0; - Index<N && It!=Begin; ++Index,--It ) {}; + for( unsigned int Index=0; Index<N && It!=Begin; ++Index,--It ) + ; return result_type( It, End ); } @@ -448,8 +448,8 @@ namespace boost { ForwardIteratorT End, unsigned int N ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits<ForwardIteratorT>::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits<ForwardIteratorT>::iterator_category category; return ::boost::algorithm::detail::find_tail_impl( Begin, End, N, category() ); } diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/formatter.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/formatter.hpp index c071822f2a..f4c6728b34 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/formatter.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/formatter.hpp @@ -42,7 +42,7 @@ namespace boost { m_Format(::boost::begin(Format), ::boost::end(Format)) {} // Operation -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) template<typename Range2T> result_type& operator()(const Range2T&) { diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/trim.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/trim.hpp index 1233e49d30..3bb4ef2034 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/trim.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/detail/trim.hpp @@ -12,7 +12,7 @@ #define BOOST_STRING_TRIM_DETAIL_HPP #include <boost/algorithm/string/config.hpp> -#include <boost/detail/iterator.hpp> +#include <iterator> namespace boost { namespace algorithm { @@ -80,8 +80,8 @@ namespace boost { ForwardIteratorT InEnd, PredicateT IsSpace ) { - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits<ForwardIteratorT>::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits<ForwardIteratorT>::iterator_category category; return ::boost::algorithm::detail::trim_end_iter_select( InBegin, InEnd, IsSpace, category() ); } diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/find_format.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/find_format.hpp index 0e84a4ee68..4d9315cb17 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/find_format.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/find_format.hpp @@ -12,7 +12,6 @@ #define BOOST_STRING_FIND_FORMAT_HPP #include <deque> -#include <boost/detail/iterator.hpp> #include <boost/range/iterator_range_core.hpp> #include <boost/range/begin.hpp> #include <boost/range/end.hpp> @@ -40,7 +39,7 @@ namespace boost { this substring and replace it in the input. The result is a modified copy of the input. It is returned as a sequence or copied to the output iterator. - + \param Output An output iterator to which the result will be copied \param Input An input sequence \param Finder A Finder object used to search for a match to be replaced diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/finder.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/finder.hpp index 93f7ec304a..61f6e4155b 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/finder.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/finder.hpp @@ -43,7 +43,6 @@ namespace boost { The result is given as an \c iterator_range delimiting the match. \param Search A substring to be searched for. - \param Comp An element comparison predicate \return An instance of the \c first_finder object */ template<typename RangeT> @@ -84,7 +83,6 @@ namespace boost { The result is given as an \c iterator_range delimiting the match. \param Search A substring to be searched for. - \param Comp An element comparison predicate \return An instance of the \c last_finder object */ template<typename RangeT> @@ -124,7 +122,6 @@ namespace boost { \param Search A substring to be searched for. \param Nth An index of the match to be find - \param Comp An element comparison predicate \return An instance of the \c nth_finder object */ template<typename RangeT> @@ -230,7 +227,6 @@ namespace boost { \param Begin Beginning of the range \param End End of the range - \param Range The range. \return An instance of the \c range_finger object */ template< typename ForwardIteratorT > diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/formatter.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/formatter.hpp index de8681bc3f..0e08ae7b39 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/formatter.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/formatter.hpp @@ -11,7 +11,6 @@ #ifndef BOOST_STRING_FORMATTER_HPP #define BOOST_STRING_FORMATTER_HPP -#include <boost/detail/iterator.hpp> #include <boost/range/value_type.hpp> #include <boost/range/iterator_range_core.hpp> #include <boost/range/as_literal.hpp> diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/iter_find.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/iter_find.hpp index 10424abc74..d76a819896 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/iter_find.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/iter_find.hpp @@ -71,7 +71,11 @@ namespace boost { inline SequenceSequenceT& iter_find( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif FinderT Finder ) { BOOST_CONCEPT_ASSERT(( @@ -142,7 +146,11 @@ namespace boost { inline SequenceSequenceT& iter_split( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif FinderT Finder ) { BOOST_CONCEPT_ASSERT(( diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/predicate.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/predicate.hpp index 0879829b5a..d7c86e8a5a 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/predicate.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/predicate.hpp @@ -11,6 +11,7 @@ #ifndef BOOST_STRING_PREDICATE_HPP #define BOOST_STRING_PREDICATE_HPP +#include <iterator> #include <boost/algorithm/string/config.hpp> #include <boost/range/begin.hpp> #include <boost/range/end.hpp> @@ -144,10 +145,10 @@ namespace boost { iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type> lit_input(::boost::as_literal(Input)); iterator_range<BOOST_STRING_TYPENAME range_const_iterator<Range2T>::type> lit_test(::boost::as_literal(Test)); - typedef BOOST_STRING_TYPENAME + typedef BOOST_STRING_TYPENAME range_const_iterator<Range1T>::type Iterator1T; - typedef BOOST_STRING_TYPENAME boost::detail:: - iterator_traits<Iterator1T>::iterator_category category; + typedef BOOST_STRING_TYPENAME + std::iterator_traits<Iterator1T>::iterator_category category; return detail:: ends_with_iter_select( diff --git a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/split.hpp b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/split.hpp index cae712c07f..e0b30fb353 100644 --- a/contrib/restricted/boost/algorithm/include/boost/algorithm/string/split.hpp +++ b/contrib/restricted/boost/algorithm/include/boost/algorithm/string/split.hpp @@ -61,7 +61,11 @@ namespace boost { template< typename SequenceSequenceT, typename Range1T, typename Range2T > inline SequenceSequenceT& find_all( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + Range1T&& Input, +#else Range1T& Input, +#endif const Range2T& Search) { return ::boost::algorithm::iter_find( @@ -96,7 +100,11 @@ namespace boost { template< typename SequenceSequenceT, typename Range1T, typename Range2T > inline SequenceSequenceT& ifind_all( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + Range1T&& Input, +#else Range1T& Input, +#endif const Range2T& Search, const std::locale& Loc=std::locale() ) { @@ -139,7 +147,11 @@ namespace boost { template< typename SequenceSequenceT, typename RangeT, typename PredicateT > inline SequenceSequenceT& split( SequenceSequenceT& Result, +#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) + RangeT&& Input, +#else RangeT& Input, +#endif PredicateT Pred, token_compress_mode_type eCompress=token_compress_off ) { |