diff options
author | thegeorg <thegeorg@yandex-team.ru> | 2022-02-10 16:45:08 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:08 +0300 |
commit | 4e839db24a3bbc9f1c610c43d6faaaa99824dcca (patch) | |
tree | 506dac10f5df94fab310584ee51b24fc5a081c22 /contrib/restricted/boost | |
parent | 2d37894b1b037cf24231090eda8589bbb44fb6fc (diff) | |
download | ydb-4e839db24a3bbc9f1c610c43d6faaaa99824dcca.tar.gz |
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'contrib/restricted/boost')
102 files changed, 912 insertions, 912 deletions
diff --git a/contrib/restricted/boost/boost/asio/detail/string_view.hpp b/contrib/restricted/boost/boost/asio/detail/string_view.hpp index 7f601199b1..6647b9204b 100644 --- a/contrib/restricted/boost/boost/asio/detail/string_view.hpp +++ b/contrib/restricted/boost/boost/asio/detail/string_view.hpp @@ -22,7 +22,7 @@ #if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) # include <string_view> #elif defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) -# error include <experimental/string_view> +# error include <experimental/string_view> #else // defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) # error BOOST_ASIO_HAS_STRING_VIEW is set but no string_view is available #endif // defined(BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW) diff --git a/contrib/restricted/boost/boost/bimap/detail/bimap_core.hpp b/contrib/restricted/boost/boost/bimap/detail/bimap_core.hpp index 6d4593d20e..ffe49c9f82 100644 --- a/contrib/restricted/boost/boost/bimap/detail/bimap_core.hpp +++ b/contrib/restricted/boost/boost/bimap/detail/bimap_core.hpp @@ -404,7 +404,7 @@ class bimap_core < relation, core_indices, - BOOST_DEDUCED_TYPENAME std::allocator_traits<typename parameters::allocator>::template rebind_alloc<relation> + BOOST_DEDUCED_TYPENAME std::allocator_traits<typename parameters::allocator>::template rebind_alloc<relation> > core_type; diff --git a/contrib/restricted/boost/boost/config/detail/suffix.hpp b/contrib/restricted/boost/boost/config/detail/suffix.hpp index e5d9785697..409e19e914 100644 --- a/contrib/restricted/boost/boost/config/detail/suffix.hpp +++ b/contrib/restricted/boost/boost/config/detail/suffix.hpp @@ -994,7 +994,7 @@ namespace std{ using ::type_info; } // on unsupported compilers. // #ifndef BOOST_FALLTHROUGH -# define BOOST_FALLTHROUGH [[fallthrough]] +# define BOOST_FALLTHROUGH [[fallthrough]] #endif // diff --git a/contrib/restricted/boost/boost/container/new_allocator.hpp b/contrib/restricted/boost/boost/container/new_allocator.hpp index 9af015d1d6..48f761c31b 100644 --- a/contrib/restricted/boost/boost/container/new_allocator.hpp +++ b/contrib/restricted/boost/boost/container/new_allocator.hpp @@ -72,13 +72,13 @@ class new_allocator<void> new_allocator(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW {} - //!Copy assignment operator from other new_allocator. - //!Never throws - new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW - { - return *this; - } - + //!Copy assignment operator from other new_allocator. + //!Never throws + new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW + { + return *this; + } + //!Constructor from related new_allocator. //!Never throws template<class T2> @@ -137,13 +137,13 @@ class new_allocator new_allocator(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW {} - //!Copy assignment operator from other new_allocator. - //!Never throws - new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW - { - return *this; - } - + //!Copy assignment operator from other new_allocator. + //!Never throws + new_allocator& operator=(const new_allocator &) BOOST_NOEXCEPT_OR_NOTHROW + { + return *this; + } + //!Constructor from related new_allocator. //!Never throws template<class T2> diff --git a/contrib/restricted/boost/boost/core/demangle.hpp b/contrib/restricted/boost/boost/core/demangle.hpp index 5c996931ce..1ff76fcb04 100644 --- a/contrib/restricted/boost/boost/core/demangle.hpp +++ b/contrib/restricted/boost/boost/core/demangle.hpp @@ -20,7 +20,7 @@ // __has_include is currently supported by GCC and Clang. However GCC 4.9 may have issues and // returns 1 for 'defined( __has_include )', while '__has_include' is actually not supported: // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63662 -#if !defined(_MSC_VER) && defined( __has_include ) && (!defined( BOOST_GCC ) || (__GNUC__ + 0) >= 5) +#if !defined(_MSC_VER) && defined( __has_include ) && (!defined( BOOST_GCC ) || (__GNUC__ + 0) >= 5) # if __has_include(<cxxabi.h>) # define BOOST_CORE_HAS_CXXABI_H # endif diff --git a/contrib/restricted/boost/boost/date_time/posix_time/ptime.hpp b/contrib/restricted/boost/boost/date_time/posix_time/ptime.hpp index 99e5663830..691b558218 100644 --- a/contrib/restricted/boost/boost/date_time/posix_time/ptime.hpp +++ b/contrib/restricted/boost/boost/date_time/posix_time/ptime.hpp @@ -54,8 +54,8 @@ namespace posix_time { ptime() : date_time::base_time<time_type,time_system_type>(gregorian::date(not_a_date_time), time_duration_type(not_a_date_time)) {} #endif // DATE_TIME_NO_DEFAULT_CONSTRUCTOR - using base = date_time::base_time<ptime, posix_time_system>; - using base::operator==; + using base = date_time::base_time<ptime, posix_time_system>; + using base::operator==; }; diff --git a/contrib/restricted/boost/boost/format/alt_sstream_impl.hpp b/contrib/restricted/boost/boost/format/alt_sstream_impl.hpp index 41e6c5ca8e..8a940d6bb9 100644 --- a/contrib/restricted/boost/boost/format/alt_sstream_impl.hpp +++ b/contrib/restricted/boost/boost/format/alt_sstream_impl.hpp @@ -258,7 +258,7 @@ namespace boost { void *vdptr = alloc_.allocate(new_size, is_allocated_? oldptr : 0); newptr = static_cast<Ch *>(vdptr); #else - newptr = alloc_.allocate(new_size); + newptr = alloc_.allocate(new_size); #endif } diff --git a/contrib/restricted/boost/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp b/contrib/restricted/boost/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp index e68cd7cedd..26e8519579 100644 --- a/contrib/restricted/boost/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp @@ -147,7 +147,7 @@ namespace boost { namespace fusion {}; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(boost_tuple_iterator& operator= (boost_tuple_iterator const&)) + BOOST_DELETED_FUNCTION(boost_tuple_iterator& operator= (boost_tuple_iterator const&)) }; template <typename Null> diff --git a/contrib/restricted/boost/boost/fusion/container/deque/deque_iterator.hpp b/contrib/restricted/boost/boost/fusion/container/deque/deque_iterator.hpp index b0335e5f2b..2875af15c8 100644 --- a/contrib/restricted/boost/boost/fusion/container/deque/deque_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/container/deque/deque_iterator.hpp @@ -112,7 +112,7 @@ namespace boost { namespace fusion { Seq& seq_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(deque_iterator& operator= (deque_iterator const&)) + BOOST_DELETED_FUNCTION(deque_iterator& operator= (deque_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/container/list/cons_iterator.hpp b/contrib/restricted/boost/boost/fusion/container/list/cons_iterator.hpp index 5c0491dbc8..1f9742f55f 100644 --- a/contrib/restricted/boost/boost/fusion/container/list/cons_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/container/list/cons_iterator.hpp @@ -43,7 +43,7 @@ namespace boost { namespace fusion cons_type& cons; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(cons_iterator& operator= (cons_iterator const&)) + BOOST_DELETED_FUNCTION(cons_iterator& operator= (cons_iterator const&)) }; struct nil_iterator : iterator_base<nil_iterator> diff --git a/contrib/restricted/boost/boost/fusion/container/map/map_iterator.hpp b/contrib/restricted/boost/boost/fusion/container/map/map_iterator.hpp index 3db7344b22..d55e1e610f 100644 --- a/contrib/restricted/boost/boost/fusion/container/map/map_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/container/map/map_iterator.hpp @@ -157,7 +157,7 @@ namespace boost { namespace fusion Seq& seq_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(map_iterator& operator= (map_iterator const&)) + BOOST_DELETED_FUNCTION(map_iterator& operator= (map_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/container/vector/vector_iterator.hpp b/contrib/restricted/boost/boost/fusion/container/vector/vector_iterator.hpp index 33a68dae58..21f87582ff 100644 --- a/contrib/restricted/boost/boost/fusion/container/vector/vector_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/container/vector/vector_iterator.hpp @@ -46,7 +46,7 @@ namespace boost { namespace fusion Vector& vec; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(vector_iterator& operator= (vector_iterator const&)) + BOOST_DELETED_FUNCTION(vector_iterator& operator= (vector_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/sequence/io/detail/manip.hpp b/contrib/restricted/boost/boost/fusion/sequence/io/detail/manip.hpp index fc0d7d8204..31077b032d 100644 --- a/contrib/restricted/boost/boost/fusion/sequence/io/detail/manip.hpp +++ b/contrib/restricted/boost/boost/fusion/sequence/io/detail/manip.hpp @@ -145,7 +145,7 @@ namespace boost { namespace fusion Stream& stream; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(string_ios_manip& operator= (string_ios_manip const&)) + BOOST_DELETED_FUNCTION(string_ios_manip& operator= (string_ios_manip const&)) }; } // detail diff --git a/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view.hpp b/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view.hpp index c56fb3cbf1..51c8b67bbb 100644 --- a/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view.hpp +++ b/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view.hpp @@ -58,7 +58,7 @@ namespace boost { namespace fusion typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(filter_view& operator= (filter_view const&)) + BOOST_DELETED_FUNCTION(filter_view& operator= (filter_view const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view_iterator.hpp index 9403356c42..fcb3ca5282 100644 --- a/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/filter_view/filter_view_iterator.hpp @@ -62,7 +62,7 @@ namespace boost { namespace fusion first_type first; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(filter_iterator& operator= (filter_iterator const&)) + BOOST_DELETED_FUNCTION(filter_iterator& operator= (filter_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view.hpp b/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view.hpp index 03e38d694c..cbebc7f2a8 100644 --- a/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view.hpp +++ b/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view.hpp @@ -70,9 +70,9 @@ namespace boost { namespace fusion concat_last_type concat_last() const { return fusion::end(seq2); } // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(joint_view& operator= (joint_view const&)) + BOOST_DELETED_FUNCTION(joint_view& operator= (joint_view const&)) - private: + private: typename mpl::if_<traits::is_view<Sequence1>, Sequence1, Sequence1&>::type seq1; typename mpl::if_<traits::is_view<Sequence2>, Sequence2, Sequence2&>::type seq2; }; diff --git a/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view_iterator.hpp index f6db30915e..131d77b000 100644 --- a/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/joint_view/joint_view_iterator.hpp @@ -51,7 +51,7 @@ namespace boost { namespace fusion concat_type concat; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(joint_view_iterator& operator= (joint_view_iterator const&)) + BOOST_DELETED_FUNCTION(joint_view_iterator& operator= (joint_view_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/nview/nview_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/nview/nview_iterator.hpp index 79c82dd963..cf535ba5f5 100644 --- a/contrib/restricted/boost/boost/fusion/view/nview/nview_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/nview/nview_iterator.hpp @@ -48,7 +48,7 @@ namespace boost { namespace fusion Sequence& seq; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(nview_iterator& operator= (nview_iterator const&)) + BOOST_DELETED_FUNCTION(nview_iterator& operator= (nview_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view.hpp b/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view.hpp index 71dc51bc8f..ca4703d0cb 100644 --- a/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view.hpp +++ b/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view.hpp @@ -45,7 +45,7 @@ namespace boost { namespace fusion stored_seq_type seq; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(repetitive_view& operator= (repetitive_view const&)) + BOOST_DELETED_FUNCTION(repetitive_view& operator= (repetitive_view const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp index 775249ff36..4d3505e8d2 100644 --- a/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp @@ -48,7 +48,7 @@ namespace boost { namespace fusion pos_type pos; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(repetitive_view_iterator& operator= (repetitive_view_iterator const&)) + BOOST_DELETED_FUNCTION(repetitive_view_iterator& operator= (repetitive_view_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view.hpp b/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view.hpp index 0aa3d10664..382c6ccda4 100644 --- a/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view.hpp +++ b/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view.hpp @@ -62,7 +62,7 @@ namespace boost { namespace fusion typename mpl::if_<traits::is_view<Sequence>, Sequence, Sequence&>::type seq; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(reverse_view& operator= (reverse_view const&)) + BOOST_DELETED_FUNCTION(reverse_view& operator= (reverse_view const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view_iterator.hpp index 0a582f4032..bad3369b25 100644 --- a/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/reverse_view/reverse_view_iterator.hpp @@ -49,7 +49,7 @@ namespace boost { namespace fusion first_type first; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(reverse_view_iterator& operator= (reverse_view_iterator const&)) + BOOST_DELETED_FUNCTION(reverse_view_iterator& operator= (reverse_view_iterator const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view.hpp b/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view.hpp index f0633018ee..b79d817bdf 100644 --- a/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view.hpp +++ b/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view.hpp @@ -77,7 +77,7 @@ namespace boost { namespace fusion typename mpl::if_<traits::is_view<Sequence2>, Sequence2, Sequence2&>::type seq2; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&)) + BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&)) }; // Unary Version @@ -113,7 +113,7 @@ namespace boost { namespace fusion transform_type f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&)) + BOOST_DELETED_FUNCTION(transform_view& operator= (transform_view const&)) }; }} diff --git a/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view_iterator.hpp b/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view_iterator.hpp index 2689ae8aab..3d39bf200d 100644 --- a/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view_iterator.hpp +++ b/contrib/restricted/boost/boost/fusion/view/transform_view/transform_view_iterator.hpp @@ -43,7 +43,7 @@ namespace boost { namespace fusion transform_type f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(transform_view_iterator& operator= (transform_view_iterator const&)) + BOOST_DELETED_FUNCTION(transform_view_iterator& operator= (transform_view_iterator const&)) }; // Binary Version @@ -70,7 +70,7 @@ namespace boost { namespace fusion transform_type f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(transform_view_iterator2& operator= (transform_view_iterator2 const&)) + BOOST_DELETED_FUNCTION(transform_view_iterator2& operator= (transform_view_iterator2 const&)) }; }} diff --git a/contrib/restricted/boost/boost/graph/dijkstra_shortest_paths.hpp b/contrib/restricted/boost/boost/graph/dijkstra_shortest_paths.hpp index 25c982d14b..f73ddd21fe 100644 --- a/contrib/restricted/boost/boost/graph/dijkstra_shortest_paths.hpp +++ b/contrib/restricted/boost/boost/graph/dijkstra_shortest_paths.hpp @@ -101,7 +101,7 @@ namespace boost { } private: template <class Edge, class Graph> - void tree_edge(Edge /* u */, Graph& /* g */) { } + void tree_edge(Edge /* u */, Graph& /* g */) { } }; template <class Visitors> dijkstra_visitor<Visitors> @@ -228,7 +228,7 @@ namespace boost { template <class Graph, class IndexMap, class Value> struct vertex_property_map_generator_helper<Graph, IndexMap, Value, false> { typedef boost::vector_property_map<Value, IndexMap> type; - static type build(const Graph& /* g */, const IndexMap& index, boost::scoped_array<Value>& /* array_holder */) { + static type build(const Graph& /* g */, const IndexMap& index, boost::scoped_array<Value>& /* array_holder */) { return boost::make_vector_property_map<Value>(index); } }; @@ -263,7 +263,7 @@ namespace boost { template <class Graph, class IndexMap> struct default_color_map_generator_helper<Graph, IndexMap, false> { typedef boost::vector_property_map<boost::two_bit_color_type, IndexMap> type; - static type build(const Graph& /* g */, const IndexMap& index) { + static type build(const Graph& /* g */, const IndexMap& index) { return boost::make_vector_property_map<boost::two_bit_color_type>(index); } }; diff --git a/contrib/restricted/boost/boost/heap/d_ary_heap.hpp b/contrib/restricted/boost/boost/heap/d_ary_heap.hpp index dac22e22c7..a221be77a2 100644 --- a/contrib/restricted/boost/boost/heap/d_ary_heap.hpp +++ b/contrib/restricted/boost/boost/heap/d_ary_heap.hpp @@ -15,7 +15,7 @@ #include <boost/assert.hpp> -#include <boost/core/allocator_access.hpp> +#include <boost/core/allocator_access.hpp> #include <boost/mem_fn.hpp> #include <boost/heap/detail/heap_comparison.hpp> #include <boost/heap/detail/ordered_adaptor_iterator.hpp> @@ -67,7 +67,7 @@ class d_ary_heap: typedef typename heap_base_maker::type super_t; typedef typename super_t::internal_type internal_type; - typedef typename boost::allocator_rebind<typename heap_base_maker::allocator_argument, internal_type>::type internal_type_allocator; + typedef typename boost::allocator_rebind<typename heap_base_maker::allocator_argument, internal_type>::type internal_type_allocator; typedef std::vector<internal_type, internal_type_allocator> container_type; typedef typename container_type::const_iterator container_iterator; diff --git a/contrib/restricted/boost/boost/heap/detail/mutable_heap.hpp b/contrib/restricted/boost/boost/heap/detail/mutable_heap.hpp index d0b98e5f84..5dce906586 100644 --- a/contrib/restricted/boost/boost/heap/detail/mutable_heap.hpp +++ b/contrib/restricted/boost/boost/heap/detail/mutable_heap.hpp @@ -16,7 +16,7 @@ #include <list> #include <utility> -#include <boost/core/allocator_access.hpp> +#include <boost/core/allocator_access.hpp> #include <boost/iterator/iterator_adaptor.hpp> #include <boost/heap/detail/ordered_adaptor_iterator.hpp> @@ -48,7 +48,7 @@ public: private: typedef std::pair<value_type, size_type> node_type; - typedef std::list<node_type, typename boost::allocator_rebind<allocator_type, node_type>::type> object_list; + typedef std::list<node_type, typename boost::allocator_rebind<allocator_type, node_type>::type> object_list; typedef typename object_list::iterator list_iterator; typedef typename object_list::const_iterator const_list_iterator; diff --git a/contrib/restricted/boost/boost/heap/detail/ordered_adaptor_iterator.hpp b/contrib/restricted/boost/boost/heap/detail/ordered_adaptor_iterator.hpp index 1ec2871806..934b23f1cb 100644 --- a/contrib/restricted/boost/boost/heap/detail/ordered_adaptor_iterator.hpp +++ b/contrib/restricted/boost/boost/heap/detail/ordered_adaptor_iterator.hpp @@ -80,7 +80,7 @@ public: unvisited_nodes(compare_by_heap_value(NULL, ValueCompare())) {} - ordered_adaptor_iterator(const ContainerType * container, ValueCompare const & /* cmp */): + ordered_adaptor_iterator(const ContainerType * container, ValueCompare const & /* cmp */): container(container), current_index(container->size()), unvisited_nodes(compare_by_heap_value(container, ValueCompare())) {} diff --git a/contrib/restricted/boost/boost/heap/detail/stable_heap.hpp b/contrib/restricted/boost/boost/heap/detail/stable_heap.hpp index 9bdbfcd0b9..e0afb9ee94 100644 --- a/contrib/restricted/boost/boost/heap/detail/stable_heap.hpp +++ b/contrib/restricted/boost/boost/heap/detail/stable_heap.hpp @@ -96,18 +96,18 @@ struct size_holder<false, SizeType> {} #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES - size_holder(size_holder && /* rhs */) BOOST_NOEXCEPT + size_holder(size_holder && /* rhs */) BOOST_NOEXCEPT {} - size_holder(size_holder const & /* rhs */) BOOST_NOEXCEPT + size_holder(size_holder const & /* rhs */) BOOST_NOEXCEPT {} - size_holder & operator=(size_holder && /* rhs */) BOOST_NOEXCEPT + size_holder & operator=(size_holder && /* rhs */) BOOST_NOEXCEPT { return *this; } - size_holder & operator=(size_holder const & /* rhs */) BOOST_NOEXCEPT + size_holder & operator=(size_holder const & /* rhs */) BOOST_NOEXCEPT { return *this; } @@ -566,12 +566,12 @@ struct make_heap_base template <typename Alloc> struct extract_allocator_types { - typedef size_t size_type; - typedef ptrdiff_t difference_type; - typedef typename std::allocator_traits<Alloc>::value_type& reference; - typedef const typename std::allocator_traits<Alloc>::value_type& const_reference; - typedef typename std::allocator_traits<Alloc>::pointer pointer; - typedef typename std::allocator_traits<Alloc>::const_pointer const_pointer; + typedef size_t size_type; + typedef ptrdiff_t difference_type; + typedef typename std::allocator_traits<Alloc>::value_type& reference; + typedef const typename std::allocator_traits<Alloc>::value_type& const_reference; + typedef typename std::allocator_traits<Alloc>::pointer pointer; + typedef typename std::allocator_traits<Alloc>::const_pointer const_pointer; }; diff --git a/contrib/restricted/boost/boost/heap/detail/tree_iterator.hpp b/contrib/restricted/boost/boost/heap/detail/tree_iterator.hpp index ced7b9ba48..d4fc1bbe9b 100644 --- a/contrib/restricted/boost/boost/heap/detail/tree_iterator.hpp +++ b/contrib/restricted/boost/boost/heap/detail/tree_iterator.hpp @@ -57,7 +57,7 @@ template <typename HandleType, > struct unordered_tree_iterator_storage { - unordered_tree_iterator_storage(ValueCompare const & /* cmp */) + unordered_tree_iterator_storage(ValueCompare const & /* cmp */) {} void push(HandleType h) diff --git a/contrib/restricted/boost/boost/heap/heap_merge.hpp b/contrib/restricted/boost/boost/heap/heap_merge.hpp index 133194d2a9..30b403adfd 100644 --- a/contrib/restricted/boost/boost/heap/heap_merge.hpp +++ b/contrib/restricted/boost/boost/heap/heap_merge.hpp @@ -27,7 +27,7 @@ struct heap_merge_emulate { struct dummy_reserver { - static void reserve (Heap1 & /* lhs */, std::size_t /* required_size */) + static void reserve (Heap1 & /* lhs */, std::size_t /* required_size */) {} }; diff --git a/contrib/restricted/boost/boost/log/attributes/named_scope.hpp b/contrib/restricted/boost/boost/log/attributes/named_scope.hpp index dea5c651e8..1e65d10aab 100644 --- a/contrib/restricted/boost/boost/log/attributes/named_scope.hpp +++ b/contrib/restricted/boost/boost/log/attributes/named_scope.hpp @@ -124,13 +124,13 @@ public: typedef std::allocator< named_scope_entry > allocator_type; // Standard types - typedef named_scope_entry value_type; - typedef size_t size_type; - typedef ptrdiff_t difference_type; - typedef value_type* pointer; - typedef const value_type* const_pointer; - typedef value_type& reference; - typedef value_type const& const_reference; + typedef named_scope_entry value_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; + typedef value_type* pointer; + typedef const value_type* const_pointer; + typedef value_type& reference; + typedef value_type const& const_reference; #ifndef BOOST_LOG_DOXYGEN_PASS diff --git a/contrib/restricted/boost/boost/move/algo/predicate.hpp b/contrib/restricted/boost/boost/move/algo/predicate.hpp index 01f9586e89..1dbc4b1dc7 100644 --- a/contrib/restricted/boost/boost/move/algo/predicate.hpp +++ b/contrib/restricted/boost/boost/move/algo/predicate.hpp @@ -28,10 +28,10 @@ struct antistable : m_comp(comp) {} - antistable(const antistable & other) - : m_comp(other.m_comp) - {} - + antistable(const antistable & other) + : m_comp(other.m_comp) + {} + template<class U, class V> bool operator()(const U &u, const V & v) { return !m_comp(v, u); } diff --git a/contrib/restricted/boost/boost/multi_array.hpp b/contrib/restricted/boost/boost/multi_array.hpp index 44dfab3928..0fb36dc0e3 100644 --- a/contrib/restricted/boost/boost/multi_array.hpp +++ b/contrib/restricted/boost/boost/multi_array.hpp @@ -475,7 +475,7 @@ public: private: void allocate_space() { - base_ = allocator_.allocate(this->num_elements()); + base_ = allocator_.allocate(this->num_elements()); this->set_base_ptr(base_); allocated_elements_ = this->num_elements(); std::uninitialized_fill_n(base_,allocated_elements_,T()); @@ -484,7 +484,7 @@ private: void deallocate_space() { if(base_) { for(T* i = base_; i != base_+allocated_elements_; ++i) - std::destroy_at(i); + std::destroy_at(i); allocator_.deallocate(base_,allocated_elements_); } } diff --git a/contrib/restricted/boost/boost/numeric/ublas/banded.hpp b/contrib/restricted/boost/boost/numeric/ublas/banded.hpp index 6e866d975b..bf61c22dcb 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/banded.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/banded.hpp @@ -493,11 +493,11 @@ public: const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -673,11 +673,11 @@ public: iterator1 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -823,11 +823,11 @@ public: const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -1004,11 +1004,11 @@ public: iterator2 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -1598,11 +1598,11 @@ public: const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -1791,11 +1791,11 @@ public: iterator1 (self_type &m, const subiterator1_type &it1): container_reference<self_type> (m), it1_ (it1) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -1954,11 +1954,11 @@ public: const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -2147,11 +2147,11 @@ public: iterator2 (self_type &m, const subiterator2_type &it2): container_reference<self_type> (m), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/detail/iterator.hpp b/contrib/restricted/boost/boost/numeric/ublas/detail/iterator.hpp index 033f2d8d9a..9bbd893a84 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/detail/iterator.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/detail/iterator.hpp @@ -663,11 +663,11 @@ namespace boost { namespace numeric { namespace ublas { indexed_iterator (container_type &c, size_type it): container_reference<container_type> (c), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - indexed_iterator (const indexed_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + indexed_iterator (const indexed_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE indexed_iterator &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/matrix.hpp b/contrib/restricted/boost/boost/numeric/ublas/matrix.hpp index 2ab35a8738..24c66ddb22 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/matrix.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/matrix.hpp @@ -481,11 +481,11 @@ namespace boost { namespace numeric { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -664,11 +664,11 @@ namespace boost { namespace numeric { iterator1 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -814,11 +814,11 @@ namespace boost { namespace numeric { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -997,11 +997,11 @@ namespace boost { namespace numeric { iterator2 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -1583,11 +1583,11 @@ namespace boost { namespace numeric { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -1766,11 +1766,11 @@ namespace boost { namespace numeric { iterator1 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -1916,11 +1916,11 @@ namespace boost { namespace numeric { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -2099,11 +2099,11 @@ namespace boost { namespace numeric { iterator2 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -2686,11 +2686,11 @@ namespace boost { namespace numeric { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), i_ (it.i_), j_ (it.j_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -2886,11 +2886,11 @@ namespace boost { namespace numeric { iterator1 (self_type &m, size_type i, size_type j, const subiterator_type &it): container_reference<self_type> (m), i_ (i), j_ (j), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -3053,11 +3053,11 @@ namespace boost { namespace numeric { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), i_ (it.i_), j_ (it.j_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -3253,11 +3253,11 @@ namespace boost { namespace numeric { iterator2 (self_type &m, size_type i, size_type j, const subiterator_type &it): container_reference<self_type> (m), i_ (i), j_ (j), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -3615,11 +3615,11 @@ namespace boost { namespace numeric { const_iterator1 (const self_type &m): container_const_reference<self_type> (m) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -3766,11 +3766,11 @@ namespace boost { namespace numeric { const_iterator2 (const self_type &m): container_const_reference<self_type> (m) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -4268,11 +4268,11 @@ namespace boost { namespace numeric { const_iterator2 (const self_type &m, const const_subiterator_type &it): container_const_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -4615,11 +4615,11 @@ namespace boost { namespace numeric { const_iterator1 (const scalar_matrix &m, const const_subiterator_type &it1, const const_subiterator_type &it2): container_const_reference<scalar_matrix> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -4801,11 +4801,11 @@ namespace boost { namespace numeric { const_iterator2 (const scalar_matrix &m, const const_subiterator_type &it1, const const_subiterator_type &it2): container_const_reference<scalar_matrix> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -5364,11 +5364,11 @@ namespace boost { namespace numeric { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -5548,11 +5548,11 @@ namespace boost { namespace numeric { iterator1 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -5698,11 +5698,11 @@ namespace boost { namespace numeric { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -5881,11 +5881,11 @@ namespace boost { namespace numeric { iterator2 (self_type &m, const subiterator_type &it): container_reference<self_type> (m), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/matrix_expression.hpp b/contrib/restricted/boost/boost/numeric/ublas/matrix_expression.hpp index 0a2837310a..ccec94abea 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/matrix_expression.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/matrix_expression.hpp @@ -49,11 +49,11 @@ namespace boost { namespace numeric { namespace ublas { explicit matrix_reference (referred_type &e): e_ (e) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_reference (const matrix_reference&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_reference (const matrix_reference&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type size1 () const { @@ -1581,11 +1581,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const self_type &mu, const const_subiterator1_type &it): container_const_reference<self_type> (mu), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -1757,11 +1757,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const self_type &mu, const const_subiterator2_type &it): container_const_reference<self_type> (mu), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -2142,11 +2142,11 @@ namespace boost { namespace numeric { namespace ublas { const const_iterator21_type &it2, const const_iterator21_type &it2_end): container_const_reference<self_type> (mb), i_ (i), j_ (j), it1_ (it1), it1_end_ (it1_end), it2_ (it2), it2_end_ (it2_end) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + private: // Dense specializations BOOST_UBLAS_INLINE @@ -2498,11 +2498,11 @@ namespace boost { namespace numeric { namespace ublas { const const_iterator22_type &it2, const const_iterator22_type &it2_end): container_const_reference<self_type> (mb), i_ (i), j_ (j), it1_ (it1), it1_end_ (it1_end), it2_ (it2), it2_end_ (it2_end) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + private: // Dense access specializations BOOST_UBLAS_INLINE @@ -3047,11 +3047,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const self_type &mbs, const const_subiterator1_type &it1, const const_iterator21_type &it2): container_const_reference<self_type> (mbs), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -3231,11 +3231,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const self_type &mbs, const const_subiterator1_type &it1, const const_iterator22_type &it2): container_const_reference<self_type> (mbs), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -3580,11 +3580,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const self_type &mbs, const const_iterator11_type &it1, const const_subiterator2_type &it2): container_const_reference<self_type> (mbs), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -3764,11 +3764,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const self_type &mbs, const const_iterator12_type &it1, const const_subiterator2_type &it2): container_const_reference<self_type> (mbs), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -4123,11 +4123,11 @@ namespace boost { namespace numeric { namespace ublas { container_const_reference<self_type> (mvb), it1_ (it1) {} #endif -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + private: // Dense random access specialization BOOST_UBLAS_INLINE @@ -4534,11 +4534,11 @@ namespace boost { namespace numeric { namespace ublas { container_const_reference<self_type> (mvb), it2_ (it2) {} #endif -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + private: // Dense random access specialization BOOST_UBLAS_INLINE @@ -4984,11 +4984,11 @@ namespace boost { namespace numeric { namespace ublas { container_const_reference<self_type> (mmb), it1_ (it1), it2_ (it2) {} #endif -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + private: // Random access specialization BOOST_UBLAS_INLINE @@ -5251,11 +5251,11 @@ namespace boost { namespace numeric { namespace ublas { container_const_reference<self_type> (mmb), it1_ (it1), it2_ (it2) {} #endif -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + private: // Random access specialization BOOST_UBLAS_INLINE diff --git a/contrib/restricted/boost/boost/numeric/ublas/matrix_proxy.hpp b/contrib/restricted/boost/boost/numeric/ublas/matrix_proxy.hpp index ba61c5d6a6..3c661ca328 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/matrix_proxy.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/matrix_proxy.hpp @@ -57,11 +57,11 @@ namespace boost { namespace numeric { namespace ublas { // BOOST_UBLAS_CHECK (i_ < data_.size1 (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_row (const matrix_row&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_row (const matrix_row&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type size () const { @@ -262,11 +262,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -372,11 +372,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &mr, const subiterator_type &it): container_reference<self_type> (mr), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -545,11 +545,11 @@ namespace boost { namespace numeric { namespace ublas { // BOOST_UBLAS_CHECK (j_ < data_.size2 (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_column (const matrix_column&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_column (const matrix_column&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type size () const { @@ -750,11 +750,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1032,11 +1032,11 @@ namespace boost { namespace numeric { namespace ublas { // BOOST_UBLAS_CHECK (r1_.size () == r2_.size (), bad_size ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_vector_range (const matrix_vector_range&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_vector_range (const matrix_vector_range&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start1 () const { @@ -1228,11 +1228,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1346,11 +1346,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &mvr, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (mvr), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -1518,11 +1518,11 @@ namespace boost { namespace numeric { namespace ublas { // s2_.start () + s2_.stride () * (s2_.size () - (s2_.size () > 0)) <= data_.size2 (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_vector_slice (const matrix_vector_slice&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_vector_slice (const matrix_vector_slice&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start1 () const { @@ -1724,11 +1724,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE vector:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1842,11 +1842,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &mvs, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (mvs), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -2215,11 +2215,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2333,11 +2333,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &mvi, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (mvi), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -2514,11 +2514,11 @@ namespace boost { namespace numeric { namespace ublas { // r2_.start () + r2_.size () <= data_.size2 (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_range (const matrix_range&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_range (const matrix_range&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start1 () const { @@ -2752,11 +2752,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -2928,11 +2928,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &mr, const subiterator1_type &it): container_reference<self_type> (mr), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -3073,11 +3073,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -3249,11 +3249,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &mr, const subiterator2_type &it): container_reference<self_type> (mr), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -3531,11 +3531,11 @@ namespace boost { namespace numeric { namespace ublas { // s2_.start () + s2_.stride () * (s2_.size () - (s2_.size () > 0)) <= data_.size2 (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - matrix_slice (const matrix_slice&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + matrix_slice (const matrix_slice&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start1 () const { @@ -3775,11 +3775,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -3955,11 +3955,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &ms, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (ms), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -4104,11 +4104,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -4284,11 +4284,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &ms, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (ms), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -4835,11 +4835,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -5015,11 +5015,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &mi, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (mi), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -5164,11 +5164,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -5344,11 +5344,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &mi, const subiterator1_type &it1, const subiterator2_type &it2): container_reference<self_type> (mi), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/matrix_sparse.hpp b/contrib/restricted/boost/boost/numeric/ublas/matrix_sparse.hpp index 13f715dd24..ed43b76c18 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/matrix_sparse.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/matrix_sparse.hpp @@ -699,11 +699,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -886,11 +886,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, int rank, size_type i, size_type j, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -1042,11 +1042,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -1229,11 +1229,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, int rank, size_type i, size_type j, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -1976,11 +1976,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -2192,11 +2192,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -2377,11 +2377,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -2593,11 +2593,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -3523,11 +3523,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -3716,11 +3716,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -3878,11 +3878,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -4071,11 +4071,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2(const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2(const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -5047,11 +5047,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -5240,11 +5240,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -5402,11 +5402,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), rank_ (it.rank_), i_ (it.i_), j_ (it.j_), itv_ (it.itv_), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -5595,11 +5595,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, int rank, size_type i, size_type j, const vector_subiterator_type &itv, const subiterator_type &it): container_reference<self_type> (m), rank_ (rank), i_ (i), j_ (j), itv_ (itv), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/storage.hpp b/contrib/restricted/boost/boost/numeric/ublas/storage.hpp index 819979994d..bfe90a7e3c 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/storage.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/storage.hpp @@ -1056,11 +1056,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const basic_range &r, const const_subiterator_type &it): container_const_reference<basic_range> (r), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1298,11 +1298,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const basic_slice &s, const const_subiterator_type &it): container_const_reference<basic_slice> (s), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1584,11 +1584,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const indirect_array &ia, const const_subiterator_type &it): container_const_reference<indirect_array> (ia), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/symmetric.hpp b/contrib/restricted/boost/boost/numeric/ublas/symmetric.hpp index 27beb1e323..1f51b0869d 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/symmetric.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/symmetric.hpp @@ -326,11 +326,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -505,11 +505,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -654,11 +654,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -834,11 +834,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -1339,11 +1339,11 @@ namespace boost { namespace numeric { namespace ublas { (current_ == 1 && it2_ != it2_end_), internal_logic ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -1659,11 +1659,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, const subiterator1_type &it1): container_reference<self_type> (m), it1_ (it1) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -1832,11 +1832,11 @@ namespace boost { namespace numeric { namespace ublas { (current_ == 1 && it2_ != it2_end_), internal_logic ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -2152,11 +2152,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, const subiterator2_type &it2): container_reference<self_type> (m), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/triangular.hpp b/contrib/restricted/boost/boost/numeric/ublas/triangular.hpp index 3e9a834253..2f4969d7c0 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/triangular.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/triangular.hpp @@ -368,11 +368,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -548,11 +548,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -697,11 +697,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -878,11 +878,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, size_type it1, size_type it2): container_reference<self_type> (m), it1_ (it1), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { @@ -1336,11 +1336,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator1 (const iterator1 &it): container_const_reference<self_type> (it ()), it1_ (it.it1_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator1 (const const_iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator1 (const const_iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator1 &operator ++ () { @@ -1520,11 +1520,11 @@ namespace boost { namespace numeric { namespace ublas { iterator1 (self_type &m, const subiterator1_type &it1): container_reference<self_type> (m), it1_ (it1) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator1 (const iterator1&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator1 (const iterator1&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator1 &operator ++ () { @@ -1672,11 +1672,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator2 (const iterator2 &it): container_const_reference<self_type> (it ()), it2_ (it.it2_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator2 (const const_iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator2 (const const_iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator2 &operator ++ () { @@ -1855,11 +1855,11 @@ namespace boost { namespace numeric { namespace ublas { iterator2 (self_type &m, const subiterator2_type &it2): container_reference<self_type> (m), it2_ (it2) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator2 (const iterator2&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator2 (const iterator2&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator2 &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/vector.hpp b/contrib/restricted/boost/boost/numeric/ublas/vector.hpp index e867ff625c..291da6f9f5 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/vector.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/vector.hpp @@ -537,12 +537,12 @@ namespace boost { namespace numeric { namespace ublas { BOOST_UBLAS_INLINE const_iterator (const typename self_type::iterator &it): // ISSUE vector:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} - -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - + +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // ---------- // Arithmetic // ---------- @@ -690,11 +690,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &v, const subiterator_type &it): container_reference<self_type> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -1326,11 +1326,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE vector:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // ---------- // Arithmetic // ---------- @@ -1478,11 +1478,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &v, const subiterator_type &it): container_reference<self_type> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -1822,11 +1822,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const self_type &v): container_const_reference<self_type> (v) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2082,11 +2082,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const unit_vector &v, const const_subiterator_type &it): container_const_reference<unit_vector> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2328,11 +2328,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const scalar_vector &v, const const_subiterator_type &it): container_const_reference<scalar_vector> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2743,11 +2743,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2857,11 +2857,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &v, const subiterator_type &it): container_reference<self_type> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/vector_expression.hpp b/contrib/restricted/boost/boost/numeric/ublas/vector_expression.hpp index fc481549e2..31ce3258e6 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/vector_expression.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/vector_expression.hpp @@ -49,11 +49,11 @@ namespace boost { namespace numeric { namespace ublas { explicit vector_reference (referred_type &e): e_ (e) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - vector_reference (const vector_reference&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + vector_reference (const vector_reference&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type size () const { diff --git a/contrib/restricted/boost/boost/numeric/ublas/vector_proxy.hpp b/contrib/restricted/boost/boost/numeric/ublas/vector_proxy.hpp index b85e29d635..1fbc74bb1e 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/vector_proxy.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/vector_proxy.hpp @@ -73,11 +73,11 @@ namespace boost { namespace numeric { namespace ublas { // r_.start () + r_.size () <= data_.size (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - vector_range (const vector_range&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + vector_range (const vector_range&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start () const { @@ -286,11 +286,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -655,11 +655,11 @@ namespace boost { namespace numeric { namespace ublas { // s_.start () + s_.stride () * (s_.size () - (s_.size () > 0)) <= data_.size (), bad_index ()); } -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - vector_slice (const vector_slice&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + vector_slice (const vector_slice&) = default; +#endif + // Accessors BOOST_UBLAS_INLINE size_type start () const { @@ -873,11 +873,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -984,11 +984,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &vs, const subiterator_type &it): container_reference<self_type> (vs), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -1444,11 +1444,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1555,11 +1555,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &vi, const subiterator_type &it): container_reference<self_type> (vi), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { diff --git a/contrib/restricted/boost/boost/numeric/ublas/vector_sparse.hpp b/contrib/restricted/boost/boost/numeric/ublas/vector_sparse.hpp index e9d3bd6f99..d2b3f0d92d 100644 --- a/contrib/restricted/boost/boost/numeric/ublas/vector_sparse.hpp +++ b/contrib/restricted/boost/boost/numeric/ublas/vector_sparse.hpp @@ -598,11 +598,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1231,11 +1231,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -1317,11 +1317,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &v, const subiterator_type &it): container_reference<self_type> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { @@ -2003,11 +2003,11 @@ namespace boost { namespace numeric { namespace ublas { const_iterator (const typename self_type::iterator &it): // ISSUE self_type:: stops VC8 using std::iterator here container_const_reference<self_type> (it ()), it_ (it.it_) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - const_iterator (const const_iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + const_iterator (const const_iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE const_iterator &operator ++ () { @@ -2089,11 +2089,11 @@ namespace boost { namespace numeric { namespace ublas { iterator (self_type &v, const subiterator_type &it): container_reference<self_type> (v), it_ (it) {} -#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS - BOOST_UBLAS_INLINE - iterator (const iterator&) = default; -#endif - +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + BOOST_UBLAS_INLINE + iterator (const iterator&) = default; +#endif + // Arithmetic BOOST_UBLAS_INLINE iterator &operator ++ () { diff --git a/contrib/restricted/boost/boost/phoenix/core/actor.hpp b/contrib/restricted/boost/boost/phoenix/core/actor.hpp index 8b42a988fc..4646d98d18 100644 --- a/contrib/restricted/boost/boost/phoenix/core/actor.hpp +++ b/contrib/restricted/boost/boost/phoenix/core/actor.hpp @@ -145,7 +145,7 @@ namespace boost { namespace phoenix BOOST_PROTO_BASIC_EXTENDS(expr_type, actor<Expr>, phoenix_domain) BOOST_PROTO_EXTENDS_SUBSCRIPT() - BOOST_PROTO_EXTENDS_ASSIGN_() + BOOST_PROTO_EXTENDS_ASSIGN_() template <typename Sig> struct result; @@ -224,8 +224,8 @@ namespace boost { namespace phoenix return phoenix::eval(*this, phoenix::context(env, default_actions())); } #endif - - BOOST_DELETED_FUNCTION(actor& operator=(actor const&)) + + BOOST_DELETED_FUNCTION(actor& operator=(actor const&)) }; }} diff --git a/contrib/restricted/boost/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp b/contrib/restricted/boost/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp index 0c4920924a..8dfbb5f629 100644 --- a/contrib/restricted/boost/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp +++ b/contrib/restricted/boost/boost/phoenix/stl/algorithm/detail/is_unordered_set_or_map.hpp @@ -24,8 +24,8 @@ #include <boost/mpl/bool.hpp> #ifdef BOOST_PHOENIX_HAS_UNORDERED_SET_AND_MAP -#include <unordered_set> -#include <unordered_map> +#include <unordered_set> +#include <unordered_map> #endif namespace boost diff --git a/contrib/restricted/boost/boost/range/algorithm/random_shuffle.hpp b/contrib/restricted/boost/boost/range/algorithm/random_shuffle.hpp index 33e98e04be..1e656d7390 100644 --- a/contrib/restricted/boost/boost/range/algorithm/random_shuffle.hpp +++ b/contrib/restricted/boost/boost/range/algorithm/random_shuffle.hpp @@ -14,85 +14,85 @@ #include <boost/range/end.hpp> #include <boost/range/concepts.hpp> #include <algorithm> -#ifdef BOOST_NO_CXX98_RANDOM_SHUFFLE -#include <cstdlib> -#endif +#ifdef BOOST_NO_CXX98_RANDOM_SHUFFLE +#include <cstdlib> +#endif namespace boost { namespace range { - namespace detail - { -#ifdef BOOST_NO_CXX98_RANDOM_SHUFFLE - -// wrap std::rand as UniformRandomBitGenerator -struct wrap_rand -{ - typedef unsigned int result_type; - - static BOOST_CONSTEXPR result_type (min)() - { - return 0; - } - - static BOOST_CONSTEXPR result_type (max)() - { - return RAND_MAX; - } - - result_type operator()() - { - return std::rand(); - } -}; - -template< class RandomIt > -inline void random_shuffle(RandomIt first, RandomIt last) -{ - std::shuffle(first, last, wrap_rand()); -} - -// wrap Generator as UniformRandomBitGenerator -template< class Generator > -struct wrap_generator -{ - typedef unsigned int result_type; - static const int max_arg = ((0u - 1u) >> 2) + 1; - Generator& g; - - wrap_generator(Generator& gen) : g(gen) {} - - static BOOST_CONSTEXPR result_type (min)() - { - return 0; - } - - static BOOST_CONSTEXPR result_type (max)() - { - return max_arg - 1; - } - - result_type operator()() - { - return static_cast<result_type>(g(max_arg)); - } -}; - -template< class RandomIt, class Generator > -inline void random_shuffle(RandomIt first, RandomIt last, Generator& gen) -{ - std::shuffle(first, last, wrap_generator< Generator >(gen)); -} - -#else - -using std::random_shuffle; - -#endif - } // namespace detail - + namespace detail + { +#ifdef BOOST_NO_CXX98_RANDOM_SHUFFLE + +// wrap std::rand as UniformRandomBitGenerator +struct wrap_rand +{ + typedef unsigned int result_type; + + static BOOST_CONSTEXPR result_type (min)() + { + return 0; + } + + static BOOST_CONSTEXPR result_type (max)() + { + return RAND_MAX; + } + + result_type operator()() + { + return std::rand(); + } +}; + +template< class RandomIt > +inline void random_shuffle(RandomIt first, RandomIt last) +{ + std::shuffle(first, last, wrap_rand()); +} + +// wrap Generator as UniformRandomBitGenerator +template< class Generator > +struct wrap_generator +{ + typedef unsigned int result_type; + static const int max_arg = ((0u - 1u) >> 2) + 1; + Generator& g; + + wrap_generator(Generator& gen) : g(gen) {} + + static BOOST_CONSTEXPR result_type (min)() + { + return 0; + } + + static BOOST_CONSTEXPR result_type (max)() + { + return max_arg - 1; + } + + result_type operator()() + { + return static_cast<result_type>(g(max_arg)); + } +}; + +template< class RandomIt, class Generator > +inline void random_shuffle(RandomIt first, RandomIt last, Generator& gen) +{ + std::shuffle(first, last, wrap_generator< Generator >(gen)); +} + +#else + +using std::random_shuffle; + +#endif + } // namespace detail + /// \brief template function random_shuffle /// /// range-based version of the random_shuffle std algorithm @@ -103,7 +103,7 @@ template<class RandomAccessRange> inline RandomAccessRange& random_shuffle(RandomAccessRange& rng) { BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept<RandomAccessRange> )); - detail::random_shuffle(boost::begin(rng), boost::end(rng)); + detail::random_shuffle(boost::begin(rng), boost::end(rng)); return rng; } @@ -112,7 +112,7 @@ template<class RandomAccessRange> inline const RandomAccessRange& random_shuffle(const RandomAccessRange& rng) { BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept<const RandomAccessRange> )); - detail::random_shuffle(boost::begin(rng), boost::end(rng)); + detail::random_shuffle(boost::begin(rng), boost::end(rng)); return rng; } @@ -121,7 +121,7 @@ template<class RandomAccessRange, class Generator> inline RandomAccessRange& random_shuffle(RandomAccessRange& rng, Generator& gen) { BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept<RandomAccessRange> )); - detail::random_shuffle(boost::begin(rng), boost::end(rng), gen); + detail::random_shuffle(boost::begin(rng), boost::end(rng), gen); return rng; } @@ -130,7 +130,7 @@ template<class RandomAccessRange, class Generator> inline const RandomAccessRange& random_shuffle(const RandomAccessRange& rng, Generator& gen) { BOOST_RANGE_CONCEPT_ASSERT(( RandomAccessRangeConcept<const RandomAccessRange> )); - detail::random_shuffle(boost::begin(rng), boost::end(rng), gen); + detail::random_shuffle(boost::begin(rng), boost::end(rng), gen); return rng; } diff --git a/contrib/restricted/boost/boost/regex/v4/match_results.hpp b/contrib/restricted/boost/boost/regex/v4/match_results.hpp index fc4105d462..4b18bb9c3c 100644 --- a/contrib/restricted/boost/boost/regex/v4/match_results.hpp +++ b/contrib/restricted/boost/boost/regex/v4/match_results.hpp @@ -62,7 +62,7 @@ public: typedef const_iterator iterator; typedef typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits< BidiIterator>::difference_type difference_type; - typedef size_t size_type; + typedef size_t size_type; typedef Allocator allocator_type; typedef typename BOOST_REGEX_DETAIL_NS::regex_iterator_traits< BidiIterator>::value_type char_type; diff --git a/contrib/restricted/boost/boost/spirit/home/karma/auto/auto.hpp b/contrib/restricted/boost/boost/spirit/home/karma/auto/auto.hpp index e660298887..77328ec574 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/auto/auto.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/auto/auto.hpp @@ -147,7 +147,7 @@ namespace boost { namespace spirit { namespace karma generator_impl_type generator_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(lit_auto_generator& operator= (lit_auto_generator const&)); + BOOST_DELETED_FUNCTION(lit_auto_generator& operator= (lit_auto_generator const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/karma/auxiliary/lazy.hpp b/contrib/restricted/boost/boost/spirit/home/karma/auxiliary/lazy.hpp index ada7bc5187..704c4bb356 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/auxiliary/lazy.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/auxiliary/lazy.hpp @@ -140,7 +140,7 @@ namespace boost { namespace spirit { namespace karma Modifiers modifiers; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(lazy_generator& operator= (lazy_generator const&)); + BOOST_DELETED_FUNCTION(lazy_generator& operator= (lazy_generator const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/karma/detail/alternative_function.hpp b/contrib/restricted/boost/boost/spirit/home/karma/detail/alternative_function.hpp index adb601a977..40250392bd 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/detail/alternative_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/detail/alternative_function.hpp @@ -192,7 +192,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Attribute const& attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(alternative_generate_function& operator= (alternative_generate_function const&)); + BOOST_DELETED_FUNCTION(alternative_generate_function& operator= (alternative_generate_function const&)); }; // specialization for strict alternatives @@ -241,7 +241,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail bool failed; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(alternative_generate_function& operator= (alternative_generate_function const&)); + BOOST_DELETED_FUNCTION(alternative_generate_function& operator= (alternative_generate_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/karma/detail/fail_function.hpp b/contrib/restricted/boost/boost/spirit/home/karma/detail/fail_function.hpp index c4c84df1c6..94c4910329 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/detail/fail_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/detail/fail_function.hpp @@ -51,7 +51,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Delimiter const& delim; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(fail_function& operator= (fail_function const&)); + BOOST_DELETED_FUNCTION(fail_function& operator= (fail_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/karma/detail/pass_container.hpp b/contrib/restricted/boost/boost/spirit/home/karma/detail/pass_container.hpp index 21adf54ee7..0234f6db50 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/detail/pass_container.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/detail/pass_container.hpp @@ -384,7 +384,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail F f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(pass_container& operator= (pass_container const&)); + BOOST_DELETED_FUNCTION(pass_container& operator= (pass_container const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/karma/detail/unused_delimiter.hpp b/contrib/restricted/boost/boost/spirit/home/karma/detail/unused_delimiter.hpp index acb4fe2df5..5681db1d19 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/detail/unused_delimiter.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/detail/unused_delimiter.hpp @@ -22,7 +22,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Delimiter const& delimiter; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(unused_delimiter& operator= (unused_delimiter const&)); + BOOST_DELETED_FUNCTION(unused_delimiter& operator= (unused_delimiter const&)); }; // If a surrounding verbatim[] directive was specified, the current diff --git a/contrib/restricted/boost/boost/spirit/home/karma/directive/columns.hpp b/contrib/restricted/boost/boost/spirit/home/karma/directive/columns.hpp index 274ab9a9f5..7b1958325e 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/directive/columns.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/directive/columns.hpp @@ -110,7 +110,7 @@ namespace boost { namespace spirit { namespace karma mutable unsigned int count; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(columns_delimiter& operator= (columns_delimiter const&)); + BOOST_DELETED_FUNCTION(columns_delimiter& operator= (columns_delimiter const&)); }; } diff --git a/contrib/restricted/boost/boost/spirit/home/karma/directive/repeat.hpp b/contrib/restricted/boost/boost/spirit/home/karma/directive/repeat.hpp index fd3f528049..d202077108 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/directive/repeat.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/directive/repeat.hpp @@ -92,7 +92,7 @@ namespace boost { namespace spirit { namespace karma T const exact; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(exact_iterator& operator= (exact_iterator const&)); + BOOST_DELETED_FUNCTION(exact_iterator& operator= (exact_iterator const&)); }; // handles repeat(min, max)[p] @@ -112,7 +112,7 @@ namespace boost { namespace spirit { namespace karma T const max; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(finite_iterator& operator= (finite_iterator const&)); + BOOST_DELETED_FUNCTION(finite_iterator& operator= (finite_iterator const&)); }; // handles repeat(min, inf)[p] @@ -130,7 +130,7 @@ namespace boost { namespace spirit { namespace karma T const min; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(infinite_iterator& operator= (infinite_iterator const&)); + BOOST_DELETED_FUNCTION(infinite_iterator& operator= (infinite_iterator const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/format_manip.hpp b/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/format_manip.hpp index 982aed8e09..e876ee9b18 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/format_manip.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/format_manip.hpp @@ -44,7 +44,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Attribute const& attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); + BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); }; template <typename Expr, typename Delimiter, typename Attribute> @@ -63,7 +63,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Attribute attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); + BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); }; template <typename Expr, typename Delimiter, typename Attribute> @@ -82,7 +82,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail Attribute const& attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); + BOOST_DELETED_FUNCTION(format_manip& operator= (format_manip const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/iterator_sink.hpp b/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/iterator_sink.hpp index 290fbd712b..cd347634c4 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/iterator_sink.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/stream/detail/iterator_sink.hpp @@ -46,7 +46,7 @@ namespace boost { namespace spirit { namespace karma { namespace detail OutputIterator& sink; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(iterator_sink& operator= (iterator_sink const&)); + BOOST_DELETED_FUNCTION(iterator_sink& operator= (iterator_sink const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/karma/stream/stream.hpp b/contrib/restricted/boost/boost/spirit/home/karma/stream/stream.hpp index 32313b3cc3..0ecca43483 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/stream/stream.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/stream/stream.hpp @@ -286,7 +286,7 @@ namespace boost { namespace spirit { namespace karma T t_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(lit_stream_generator& operator= (lit_stream_generator const&)); + BOOST_DELETED_FUNCTION(lit_stream_generator& operator= (lit_stream_generator const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/karma/string/symbols.hpp b/contrib/restricted/boost/boost/spirit/home/karma/string/symbols.hpp index 92626ff99f..1a8ec4ad97 100644 --- a/contrib/restricted/boost/boost/spirit/home/karma/string/symbols.hpp +++ b/contrib/restricted/boost/boost/spirit/home/karma/string/symbols.hpp @@ -412,7 +412,7 @@ namespace boost { namespace spirit { namespace karma symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); + BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); }; struct remover @@ -444,7 +444,7 @@ namespace boost { namespace spirit { namespace karma symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); + BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); }; adder add; @@ -669,7 +669,7 @@ namespace boost { namespace spirit { namespace karma symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); + BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); }; struct remover @@ -701,7 +701,7 @@ namespace boost { namespace spirit { namespace karma symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); + BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); }; adder add; diff --git a/contrib/restricted/boost/boost/spirit/home/lex/detail/sequence_function.hpp b/contrib/restricted/boost/boost/spirit/home/lex/detail/sequence_function.hpp index 8f560f1ed6..1bf021f654 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/detail/sequence_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/detail/sequence_function.hpp @@ -34,7 +34,7 @@ namespace boost { namespace spirit { namespace lex { namespace detail String const& targetstate; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(sequence_collect_function& operator= (sequence_collect_function const&)); + BOOST_DELETED_FUNCTION(sequence_collect_function& operator= (sequence_collect_function const&)); }; template <typename LexerDef> @@ -53,7 +53,7 @@ namespace boost { namespace spirit { namespace lex { namespace detail LexerDef& def; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(sequence_add_actions_function& operator= (sequence_add_actions_function const&)); + BOOST_DELETED_FUNCTION(sequence_add_actions_function& operator= (sequence_add_actions_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/action.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/action.hpp index b2fa14668a..84f814c029 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/action.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/action.hpp @@ -52,7 +52,7 @@ namespace boost { namespace spirit { namespace lex Action f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(action& operator= (action const&)); + BOOST_DELETED_FUNCTION(action& operator= (action const&)); }; }}} diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexer.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexer.hpp index 9a8f0d3919..eef9248f39 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexer.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexer.hpp @@ -182,7 +182,7 @@ namespace boost { namespace spirit { namespace lex lexer_def_& def; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); + BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); }; friend struct adder; @@ -203,7 +203,7 @@ namespace boost { namespace spirit { namespace lex lexer_def_& def; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(pattern_adder& operator= (pattern_adder const&)); + BOOST_DELETED_FUNCTION(pattern_adder& operator= (pattern_adder const&)); }; friend struct pattern_adder; @@ -279,7 +279,7 @@ namespace boost { namespace spirit { namespace lex string_type targetstate; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(lexer_def_& operator= (lexer_def_ const&)); + BOOST_DELETED_FUNCTION(lexer_def_& operator= (lexer_def_ const&)); }; #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor.hpp index 061ebd7064..c8f0378f5c 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor.hpp @@ -93,7 +93,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl T const& src_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(assign_on_exit& operator= (assign_on_exit const&)); + BOOST_DELETED_FUNCTION(assign_on_exit& operator= (assign_on_exit const&)); }; public: diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp index 55ffb902f3..51db0f4218 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/functor_data.hpp @@ -193,7 +193,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool bol_; // helper storing whether last character was \n // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(data& operator= (data const&)); + BOOST_DELETED_FUNCTION(data& operator= (data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -265,7 +265,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl std::size_t state_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(data& operator= (data const&)); + BOOST_DELETED_FUNCTION(data& operator= (data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -400,7 +400,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool has_hold_; // 'true' if hold_ is valid // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(data& operator= (data const&)); + BOOST_DELETED_FUNCTION(data& operator= (data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -539,7 +539,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool has_hold_; // 'true' if hold_ is valid // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(data& operator= (data const&)); + BOOST_DELETED_FUNCTION(data& operator= (data const&)); }; } }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/lexer.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/lexer.hpp index 874046a3a4..2f2f7e058e 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/lexer.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/lexer.hpp @@ -188,7 +188,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl semantic_actions_type const& actions_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(iterator_data_type& operator= (iterator_data_type const&)); + BOOST_DELETED_FUNCTION(iterator_data_type& operator= (iterator_data_type const&)); }; public: diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp index da784abbc3..b880f28975 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_functor_data.hpp @@ -209,7 +209,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool bol_; // helper storing whether last character was \n // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); + BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -283,7 +283,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl std::size_t num_states_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); + BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -421,7 +421,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool has_hold_; // 'true' if hold_ is valid // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); + BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); }; /////////////////////////////////////////////////////////////////////// @@ -560,7 +560,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool has_hold_; // 'true' if hold_ is valid // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); + BOOST_DELETED_FUNCTION(static_data& operator= (static_data const&)); }; } }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp index 1747002ebf..fd41bb971c 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/lexer/lexertl/static_lexer.hpp @@ -152,7 +152,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl bool bol_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(iterator_data_type& operator= (iterator_data_type const&)); + BOOST_DELETED_FUNCTION(iterator_data_type& operator= (iterator_data_type const&)); }; typedef LexerTables tables_type; diff --git a/contrib/restricted/boost/boost/spirit/home/lex/qi/state_switcher.hpp b/contrib/restricted/boost/boost/spirit/home/lex/qi/state_switcher.hpp index fd39c2f656..f98e89144c 100644 --- a/contrib/restricted/boost/boost/spirit/home/lex/qi/state_switcher.hpp +++ b/contrib/restricted/boost/boost/spirit/home/lex/qi/state_switcher.hpp @@ -155,7 +155,7 @@ namespace boost { namespace spirit { namespace qi std::size_t state; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(reset_state_on_exit& operator= (reset_state_on_exit const&)); + BOOST_DELETED_FUNCTION(reset_state_on_exit& operator= (reset_state_on_exit const&)); }; } @@ -214,7 +214,7 @@ namespace boost { namespace spirit { namespace qi State state; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(state_switcher_context& operator= (state_switcher_context const&)); + BOOST_DELETED_FUNCTION(state_switcher_context& operator= (state_switcher_context const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/action/action.hpp b/contrib/restricted/boost/boost/spirit/home/qi/action/action.hpp index dbaa3f7727..db63fffc57 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/action/action.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/action/action.hpp @@ -145,7 +145,7 @@ namespace boost { namespace spirit { namespace qi Action f; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(action& operator= (action const&)); + BOOST_DELETED_FUNCTION(action& operator= (action const&)); }; }}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr.hpp b/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr.hpp index 8b24083533..d4dd97436a 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr.hpp @@ -74,7 +74,7 @@ namespace boost { namespace spirit { namespace qi Value value_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(attr_parser& operator= (attr_parser const&)); + BOOST_DELETED_FUNCTION(attr_parser& operator= (attr_parser const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr_cast.hpp b/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr_cast.hpp index eef496ca5c..7286cd09e1 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr_cast.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/auxiliary/attr_cast.hpp @@ -115,7 +115,7 @@ namespace boost { namespace spirit { namespace qi Subject subject; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(attr_cast_parser& operator= (attr_cast_parser const&)); + BOOST_DELETED_FUNCTION(attr_cast_parser& operator= (attr_cast_parser const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/alternative_function.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/alternative_function.hpp index dcb5af3d0a..b07fe17cbd 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/alternative_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/alternative_function.hpp @@ -177,7 +177,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Attribute& attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&)); + BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&)); }; template <typename Iterator, typename Context, typename Skipper> @@ -204,7 +204,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Skipper const& skipper; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&)); + BOOST_DELETED_FUNCTION(alternative_function& operator= (alternative_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/expect_function.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/expect_function.hpp index e7c1ee3550..6e72dec89b 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/expect_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/expect_function.hpp @@ -97,7 +97,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail mutable bool is_first; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(expect_function& operator= (expect_function const&)); + BOOST_DELETED_FUNCTION(expect_function& operator= (expect_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/fail_function.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/fail_function.hpp index 45972a4b5d..551f38b9d5 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/fail_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/fail_function.hpp @@ -51,7 +51,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Skipper const& skipper; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(fail_function& operator= (fail_function const&)); + BOOST_DELETED_FUNCTION(fail_function& operator= (fail_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_container.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_container.hpp index 97e2906e2c..d1de04977f 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_container.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_container.hpp @@ -355,7 +355,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Attr& attr; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(pass_container& operator= (pass_container const&)); + BOOST_DELETED_FUNCTION(pass_container& operator= (pass_container const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_function.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_function.hpp index 8bfd6dcb83..af88b96fb4 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/pass_function.hpp @@ -62,7 +62,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Skipper const& skipper; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(pass_function& operator= (pass_function const&)); + BOOST_DELETED_FUNCTION(pass_function& operator= (pass_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/permute_function.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/permute_function.hpp index bec82d9c15..f1dab702b9 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/permute_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/permute_function.hpp @@ -64,7 +64,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail bool* taken; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(permute_function& operator= (permute_function const&)); + BOOST_DELETED_FUNCTION(permute_function& operator= (permute_function const&)); }; }}}} diff --git a/contrib/restricted/boost/boost/spirit/home/qi/detail/unused_skipper.hpp b/contrib/restricted/boost/boost/spirit/home/qi/detail/unused_skipper.hpp index 494881820e..0ea7cb4b6f 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/detail/unused_skipper.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/detail/unused_skipper.hpp @@ -23,7 +23,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail Skipper const& skipper; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(unused_skipper& operator= (unused_skipper const&)); + BOOST_DELETED_FUNCTION(unused_skipper& operator= (unused_skipper const&)); }; template <typename Skipper> diff --git a/contrib/restricted/boost/boost/spirit/home/qi/directive/matches.hpp b/contrib/restricted/boost/boost/spirit/home/qi/directive/matches.hpp index 31daaaefab..bf41e351ac 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/directive/matches.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/directive/matches.hpp @@ -72,7 +72,7 @@ namespace boost { namespace spirit { namespace qi Subject subject; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(matches_directive& operator= (matches_directive const&)); + BOOST_DELETED_FUNCTION(matches_directive& operator= (matches_directive const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/directive/omit.hpp b/contrib/restricted/boost/boost/spirit/home/qi/directive/omit.hpp index 6946f56347..4df5425197 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/directive/omit.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/directive/omit.hpp @@ -71,7 +71,7 @@ namespace boost { namespace spirit { namespace qi Subject subject; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(omit_directive& operator= (omit_directive const&)); + BOOST_DELETED_FUNCTION(omit_directive& operator= (omit_directive const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/directive/repeat.hpp b/contrib/restricted/boost/boost/spirit/home/qi/directive/repeat.hpp index d9e334e812..79d55e0411 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/directive/repeat.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/directive/repeat.hpp @@ -92,7 +92,7 @@ namespace boost { namespace spirit { namespace qi T const exact; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(exact_iterator& operator= (exact_iterator const&)); + BOOST_DELETED_FUNCTION(exact_iterator& operator= (exact_iterator const&)); }; template <typename T> @@ -111,7 +111,7 @@ namespace boost { namespace spirit { namespace qi T const max; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(finite_iterator& operator= (finite_iterator const&)); + BOOST_DELETED_FUNCTION(finite_iterator& operator= (finite_iterator const&)); }; template <typename T> @@ -128,7 +128,7 @@ namespace boost { namespace spirit { namespace qi T const min; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(infinite_iterator& operator= (infinite_iterator const&)); + BOOST_DELETED_FUNCTION(infinite_iterator& operator= (infinite_iterator const&)); }; template <typename Subject, typename LoopIter> @@ -207,7 +207,7 @@ namespace boost { namespace spirit { namespace qi LoopIter iter; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(repeat_parser& operator= (repeat_parser const&)); + BOOST_DELETED_FUNCTION(repeat_parser& operator= (repeat_parser const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/stream/detail/match_manip.hpp b/contrib/restricted/boost/boost/spirit/home/qi/stream/detail/match_manip.hpp index 37b6a6435a..96f319cd26 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/stream/detail/match_manip.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/stream/detail/match_manip.hpp @@ -47,7 +47,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail BOOST_SCOPED_ENUM(skip_flag) const post_skip; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); + BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); }; template <typename Expr, typename Skipper, typename Attribute> @@ -66,7 +66,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail BOOST_SCOPED_ENUM(skip_flag) const post_skip; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); + BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); }; template <typename Expr, typename Skipper, typename Attribute> @@ -85,7 +85,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail BOOST_SCOPED_ENUM(skip_flag) const post_skip; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); + BOOST_DELETED_FUNCTION(match_manip& operator= (match_manip const&)); }; /////////////////////////////////////////////////////////////////////////// diff --git a/contrib/restricted/boost/boost/spirit/home/qi/string/lit.hpp b/contrib/restricted/boost/boost/spirit/home/qi/string/lit.hpp index 2e423c28c8..c7f1e354f8 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/string/lit.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/string/lit.hpp @@ -119,7 +119,7 @@ namespace boost { namespace spirit { namespace qi String str; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(literal_string& operator= (literal_string const&)); + BOOST_DELETED_FUNCTION(literal_string& operator= (literal_string const&)); }; template <typename String, bool no_attribute> diff --git a/contrib/restricted/boost/boost/spirit/home/qi/string/symbols.hpp b/contrib/restricted/boost/boost/spirit/home/qi/string/symbols.hpp index 91f6e7f3b4..4477d866a9 100644 --- a/contrib/restricted/boost/boost/spirit/home/qi/string/symbols.hpp +++ b/contrib/restricted/boost/boost/spirit/home/qi/string/symbols.hpp @@ -324,7 +324,7 @@ public: symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); + BOOST_DELETED_FUNCTION(adder& operator= (adder const&)); }; struct remover @@ -366,7 +366,7 @@ public: symbols& sym; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); + BOOST_DELETED_FUNCTION(remover& operator= (remover const&)); }; adder add; diff --git a/contrib/restricted/boost/boost/spirit/home/support/detail/what_function.hpp b/contrib/restricted/boost/boost/spirit/home/support/detail/what_function.hpp index c256cd86e8..7b9d128586 100644 --- a/contrib/restricted/boost/boost/spirit/home/support/detail/what_function.hpp +++ b/contrib/restricted/boost/boost/spirit/home/support/detail/what_function.hpp @@ -40,7 +40,7 @@ namespace boost { namespace spirit { namespace detail Context& context; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(what_function& operator= (what_function const&)); + BOOST_DELETED_FUNCTION(what_function& operator= (what_function const&)); }; }}} diff --git a/contrib/restricted/boost/boost/spirit/home/support/info.hpp b/contrib/restricted/boost/boost/spirit/home/support/info.hpp index 099772bfc6..b4c987dae7 100644 --- a/contrib/restricted/boost/boost/spirit/home/support/info.hpp +++ b/contrib/restricted/boost/boost/spirit/home/support/info.hpp @@ -118,7 +118,7 @@ namespace boost { namespace spirit int depth; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(basic_info_walker& operator= (basic_info_walker const&)); + BOOST_DELETED_FUNCTION(basic_info_walker& operator= (basic_info_walker const&)); }; // bare-bones print support @@ -141,7 +141,7 @@ namespace boost { namespace spirit Out& out; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(simple_printer& operator= (simple_printer const&)); + BOOST_DELETED_FUNCTION(simple_printer& operator= (simple_printer const&)); }; template <typename Out> diff --git a/contrib/restricted/boost/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp b/contrib/restricted/boost/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp index 34908148ef..0555d2aeeb 100644 --- a/contrib/restricted/boost/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp +++ b/contrib/restricted/boost/boost/spirit/home/support/iterators/detail/split_functor_input_policy.hpp @@ -191,7 +191,7 @@ namespace boost { namespace spirit { namespace iterator_policies result_type curtok; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(shared& operator= (shared const&)); + BOOST_DELETED_FUNCTION(shared& operator= (shared const&)); }; }; diff --git a/contrib/restricted/boost/boost/spirit/home/support/nonterminal/expand_arg.hpp b/contrib/restricted/boost/boost/spirit/home/support/nonterminal/expand_arg.hpp index 6c9b2113d4..1c2aa8341f 100644 --- a/contrib/restricted/boost/boost/spirit/home/support/nonterminal/expand_arg.hpp +++ b/contrib/restricted/boost/boost/spirit/home/support/nonterminal/expand_arg.hpp @@ -79,7 +79,7 @@ namespace boost { namespace spirit { namespace detail Context& context; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(expand_arg& operator= (expand_arg const&)); + BOOST_DELETED_FUNCTION(expand_arg& operator= (expand_arg const&)); }; }}} diff --git a/contrib/restricted/boost/boost/spirit/home/support/terminal.hpp b/contrib/restricted/boost/boost/spirit/home/support/terminal.hpp index 9515a69b01..f2b378ccf4 100644 --- a/contrib/restricted/boost/boost/spirit/home/support/terminal.hpp +++ b/contrib/restricted/boost/boost/spirit/home/support/terminal.hpp @@ -486,7 +486,7 @@ namespace boost { namespace spirit } // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(terminal& operator= (terminal const&)); + BOOST_DELETED_FUNCTION(terminal& operator= (terminal const&)); }; /////////////////////////////////////////////////////////////////////////// @@ -543,7 +543,7 @@ namespace boost { namespace spirit data_type data_; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(stateful_tag& operator= (stateful_tag const&)); + BOOST_DELETED_FUNCTION(stateful_tag& operator= (stateful_tag const&)); }; } @@ -561,7 +561,7 @@ namespace boost { namespace spirit {} // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(stateful_tag_type& operator= (stateful_tag_type const&)); + BOOST_DELETED_FUNCTION(stateful_tag_type& operator= (stateful_tag_type const&)); }; namespace detail diff --git a/contrib/restricted/boost/boost/spirit/home/x3/auxiliary/attr.hpp b/contrib/restricted/boost/boost/spirit/home/x3/auxiliary/attr.hpp index 0459e55255..ac7bf3ec23 100644 --- a/contrib/restricted/boost/boost/spirit/home/x3/auxiliary/attr.hpp +++ b/contrib/restricted/boost/boost/spirit/home/x3/auxiliary/attr.hpp @@ -51,7 +51,7 @@ namespace boost { namespace spirit { namespace x3 Value value_; // silence MSVC warning C4512: assignment operator could not be generated - attr_parser& operator= (attr_parser const&) = delete; + attr_parser& operator= (attr_parser const&) = delete; }; template <typename Value, std::size_t N> @@ -86,7 +86,7 @@ namespace boost { namespace spirit { namespace x3 Value value_[N]; // silence MSVC warning C4512: assignment operator could not be generated - attr_parser& operator= (attr_parser const&) = delete; + attr_parser& operator= (attr_parser const&) = delete; }; template <typename Value> diff --git a/contrib/restricted/boost/boost/spirit/repository/home/qi/directive/kwd.hpp b/contrib/restricted/boost/boost/spirit/repository/home/qi/directive/kwd.hpp index 32af179e62..06c57894fa 100644 --- a/contrib/restricted/boost/boost/spirit/repository/home/qi/directive/kwd.hpp +++ b/contrib/restricted/boost/boost/spirit/repository/home/qi/directive/kwd.hpp @@ -173,7 +173,7 @@ template <typename T> // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(kwd_pass_iterator& operator= (kwd_pass_iterator const&)); + BOOST_DELETED_FUNCTION(kwd_pass_iterator& operator= (kwd_pass_iterator const&)); }; template <typename T> @@ -203,7 +203,7 @@ template <typename T> T const exact; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(kwd_exact_iterator& operator= (kwd_exact_iterator const&)); + BOOST_DELETED_FUNCTION(kwd_exact_iterator& operator= (kwd_exact_iterator const&)); }; template <typename T> @@ -234,7 +234,7 @@ template <typename T> T const max; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(kwd_finite_iterator& operator= (kwd_finite_iterator const&)); + BOOST_DELETED_FUNCTION(kwd_finite_iterator& operator= (kwd_finite_iterator const&)); }; template <typename T> @@ -253,7 +253,7 @@ template <typename T> T const min; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(kwd_infinite_iterator& operator= (kwd_infinite_iterator const&)); + BOOST_DELETED_FUNCTION(kwd_infinite_iterator& operator= (kwd_infinite_iterator const&)); }; // This class enables the transportation of parameters needed to call @@ -437,7 +437,7 @@ template <typename T> spirit::qi::literal_string<KeywordType, true> >::type keyword_string_type; keyword_string_type keyword; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(kwd_parser& operator= (kwd_parser const&)); + BOOST_DELETED_FUNCTION(kwd_parser& operator= (kwd_parser const&)); template <typename Iterator, typename Context, typename Skipper> static spirit::qi::detail::fail_function<Iterator, Context, Skipper> @@ -581,7 +581,7 @@ template <typename Subject, typename KeywordType, typename LoopIter, typename Di KeywordType keyword; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(complex_kwd_parser& operator= (complex_kwd_parser const&)); + BOOST_DELETED_FUNCTION(complex_kwd_parser& operator= (complex_kwd_parser const&)); template <typename Iterator, typename Context, typename Skipper> static spirit::qi::detail::fail_function<Iterator, Context, Skipper> diff --git a/contrib/restricted/boost/boost/spirit/repository/home/qi/operator/detail/keywords.hpp b/contrib/restricted/boost/boost/spirit/repository/home/qi/operator/detail/keywords.hpp index 5b0b527a2a..a898a9b158 100644 --- a/contrib/restricted/boost/boost/spirit/repository/home/qi/operator/detail/keywords.hpp +++ b/contrib/restricted/boost/boost/spirit/repository/home/qi/operator/detail/keywords.hpp @@ -690,7 +690,7 @@ namespace boost { namespace spirit { namespace repository { namespace qi { names ParseDispatcher const& dispatcher; // silence MSVC warning C4512: assignment operator could not be generated - BOOST_DELETED_FUNCTION(complex_kwd_function& operator= (complex_kwd_function const&)); + BOOST_DELETED_FUNCTION(complex_kwd_function& operator= (complex_kwd_function const&)); }; diff --git a/contrib/restricted/boost/libs/context/ya.make b/contrib/restricted/boost/libs/context/ya.make index 0ed9d696fe..ae262177d9 100644 --- a/contrib/restricted/boost/libs/context/ya.make +++ b/contrib/restricted/boost/libs/context/ya.make @@ -16,18 +16,18 @@ CFLAGS( -DBOOST_CONTEXT_SOURCE ) -# https://www.boost.org/doc/libs/1_74_0/libs/context/doc/html/context/stack/sanitizers.html -IF (SANITIZER_TYPE == "address") - CFLAGS( - GLOBAL -DBOOST_USE_UCONTEXT - GLOBAL -DBOOST_USE_ASAN - ) - SRCS( - src/continuation.cpp - src/fiber.cpp - ) -ENDIF() - +# https://www.boost.org/doc/libs/1_74_0/libs/context/doc/html/context/stack/sanitizers.html +IF (SANITIZER_TYPE == "address") + CFLAGS( + GLOBAL -DBOOST_USE_UCONTEXT + GLOBAL -DBOOST_USE_ASAN + ) + SRCS( + src/continuation.cpp + src/fiber.cpp + ) +ENDIF() + IF (OS_WINDOWS) IF (ARCH_X86_64 OR ARCH_I386) MASMFLAGS('-DBOOST_CONTEXT_EXPORT= /safeseh') diff --git a/contrib/restricted/boost/libs/log/src/attribute_set_impl.hpp b/contrib/restricted/boost/libs/log/src/attribute_set_impl.hpp index f6c829b648..5cc161812d 100644 --- a/contrib/restricted/boost/libs/log/src/attribute_set_impl.hpp +++ b/contrib/restricted/boost/libs/log/src/attribute_set_impl.hpp @@ -62,13 +62,13 @@ public: #if BOOST_LOG_ATTRIBUTE_SET_MAX_POOL_SIZE > 0 - typedef T value_type; - typedef size_t size_type; - typedef ptrdiff_t difference_type; - typedef T* pointer; - typedef const T* const_pointer; - typedef T& reference; - typedef const T& const_reference; + typedef T value_type; + typedef size_t size_type; + typedef ptrdiff_t difference_type; + typedef T* pointer; + typedef const T* const_pointer; + typedef T& reference; + typedef const T& const_reference; private: array< pointer, BOOST_LOG_ATTRIBUTE_SET_MAX_POOL_SIZE > m_Pool; @@ -114,7 +114,7 @@ public: return *this; } - pointer allocate(size_type n) + pointer allocate(size_type n) { if (m_PooledCount > 0) { @@ -122,7 +122,7 @@ public: return m_Pool[m_PooledCount]; } else - return base_type::allocate(n); + return base_type::allocate(n); } void deallocate(pointer p, size_type n) @@ -233,7 +233,7 @@ public: node_list::const_iterator it = that.m_Nodes.begin(), end = that.m_Nodes.end(); for (; it != end; ++it) { - node* const n = m_Allocator.allocate(1); + node* const n = m_Allocator.allocate(1); new (n) node(it->m_Value.first, it->m_Value.second); m_Nodes.push_back(*n); @@ -274,7 +274,7 @@ public: return std::make_pair(iterator(p), false); } - node* const n = m_Allocator.allocate(1); + node* const n = m_Allocator.allocate(1); new (n) node(key, data); node_list::iterator it; diff --git a/contrib/restricted/boost/libs/log/src/named_scope.cpp b/contrib/restricted/boost/libs/log/src/named_scope.cpp index c59a9aebef..91d7782825 100644 --- a/contrib/restricted/boost/libs/log/src/named_scope.cpp +++ b/contrib/restricted/boost/libs/log/src/named_scope.cpp @@ -214,7 +214,7 @@ BOOST_LOG_API named_scope_list::named_scope_list(named_scope_list const& that) : aux::named_scope_list_node* prev = &m_RootNode; for (const_iterator src = that.begin(), end = that.end(); src != end; ++src, ++p) { - new((void*)p) value_type(*src); // won't throw + new((void*)p) value_type(*src); // won't throw p->_m_pPrev = prev; prev->_m_pNext = p; prev = p; @@ -232,7 +232,7 @@ BOOST_LOG_API named_scope_list::~named_scope_list() iterator it(m_RootNode._m_pNext); iterator end(&m_RootNode); while (it != end) - it->~value_type(); + it->~value_type(); allocator_type::deallocate(static_cast< pointer >(m_RootNode._m_pNext), m_Size); } } diff --git a/contrib/restricted/boost/libs/log/ya.make b/contrib/restricted/boost/libs/log/ya.make index 09429ee0cd..eb403fed72 100644 --- a/contrib/restricted/boost/libs/log/ya.make +++ b/contrib/restricted/boost/libs/log/ya.make @@ -28,7 +28,7 @@ IF (OS_WINDOWS) -D_SCL_SECURE_NO_WARNINGS ) ELSE() - IF (OS_LINUX AND OS_SDK != "ubuntu-10") + IF (OS_LINUX AND OS_SDK != "ubuntu-10") CFLAGS( -DBOOST_LOG_HAS_PTHREAD_MUTEX_ROBUST ) diff --git a/contrib/restricted/boost/libs/ya.make b/contrib/restricted/boost/libs/ya.make index c42a994cdc..0e92ebc239 100644 --- a/contrib/restricted/boost/libs/ya.make +++ b/contrib/restricted/boost/libs/ya.make @@ -63,9 +63,9 @@ RECURSE( thread timer ) - -IF (NOT OS_ANDROID) - RECURSE( - python - ) -ENDIF() + +IF (NOT OS_ANDROID) + RECURSE( + python + ) +ENDIF() diff --git a/contrib/restricted/boost/patches/README.md b/contrib/restricted/boost/patches/README.md index 14e02c6708..466cffad35 100644 --- a/contrib/restricted/boost/patches/README.md +++ b/contrib/restricted/boost/patches/README.md @@ -1,8 +1,8 @@ -The following PRs have been upstreamed from certain commits applied locally: - -* [r8940310](https://a.yandex-team.ru/arc/commit/r8940310): https://github.com/boostorg/circular_buffer/pull/41 -* https://github.com/boostorg/context/pull/188 -* https://github.com/boostorg/interprocess/pull/155 -* https://github.com/boostorg/process/pull/223 -* https://github.com/boostorg/algorithm/pull/88 (ещё не вмержен) -* https://github.com/boostorg/ublas/pull/153 +The following PRs have been upstreamed from certain commits applied locally: + +* [r8940310](https://a.yandex-team.ru/arc/commit/r8940310): https://github.com/boostorg/circular_buffer/pull/41 +* https://github.com/boostorg/context/pull/188 +* https://github.com/boostorg/interprocess/pull/155 +* https://github.com/boostorg/process/pull/223 +* https://github.com/boostorg/algorithm/pull/88 (ещё не вмержен) +* https://github.com/boostorg/ublas/pull/153 |