From 066be838f08d099b510b769861edfe9cf20173eb Mon Sep 17 00:00:00 2001 From: Romain Geissler Date: Fri, 22 Mar 2019 23:16:21 +0000 Subject: [PATCH] Fix gcc 9 deprecated copy warnings. --- .../boost/xpressive/detail/core/adaptor.hpp | 2 +- .../boost/xpressive/detail/core/finder.hpp | 20 +++++++++---------- .../detail/core/matcher/alternate_matcher.hpp | 2 +- .../detail/core/matcher/attr_matcher.hpp | 4 ++-- .../detail/core/matcher/optional_matcher.hpp | 4 ++-- .../core/matcher/simple_repeat_matcher.hpp | 2 +- .../boost/xpressive/detail/core/peeker.hpp | 6 +++--- .../xpressive/detail/core/regex_impl.hpp | 2 +- .../boost/xpressive/detail/static/static.hpp | 2 +- .../detail/static/transforms/as_set.hpp | 2 +- .../detail/utility/sequence_stack.hpp | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/boost/xpressive/detail/core/adaptor.hpp b/include/boost/xpressive/detail/core/adaptor.hpp index 2ba0786b2..db546523a 100644 --- a/include/boost/xpressive/detail/core/adaptor.hpp +++ b/include/boost/xpressive/detail/core/adaptor.hpp @@ -63,7 +63,7 @@ struct xpression_adaptor } private: - xpression_adaptor &operator =(xpression_adaptor const &); + BOOST_DELETED_FUNCTION(xpression_adaptor &operator =(xpression_adaptor const &)) }; /////////////////////////////////////////////////////////////////////////////// diff --git a/include/boost/xpressive/detail/core/finder.hpp b/include/boost/xpressive/detail/core/finder.hpp index de50bda5f..d2fc3f3f5 100644 --- a/include/boost/xpressive/detail/core/finder.hpp +++ b/include/boost/xpressive/detail/core/finder.hpp @@ -49,8 +49,8 @@ struct boyer_moore_finder } private: - boyer_moore_finder(boyer_moore_finder const &); - boyer_moore_finder &operator =(boyer_moore_finder const &); + BOOST_DELETED_FUNCTION(boyer_moore_finder(boyer_moore_finder const &)) + BOOST_DELETED_FUNCTION(boyer_moore_finder &operator =(boyer_moore_finder const &)) boyer_moore bm_; }; @@ -79,8 +79,8 @@ struct hash_peek_finder } private: - hash_peek_finder(hash_peek_finder const &); - hash_peek_finder &operator =(hash_peek_finder const &); + BOOST_DELETED_FUNCTION(hash_peek_finder(hash_peek_finder const &)) + BOOST_DELETED_FUNCTION(hash_peek_finder &operator =(hash_peek_finder const &)) template BidiIter find_(BidiIter begin, BidiIter end, Traits const &tr, ICase) const @@ -134,8 +134,8 @@ struct line_start_finder } private: - line_start_finder(line_start_finder const &); - line_start_finder &operator =(line_start_finder const &); + BOOST_DELETED_FUNCTION(line_start_finder(line_start_finder const &)) + BOOST_DELETED_FUNCTION(line_start_finder &operator =(line_start_finder const &)) char_class_type newline_; }; @@ -184,8 +184,8 @@ struct line_start_finder } private: - line_start_finder(line_start_finder const &); - line_start_finder &operator =(line_start_finder const &); + BOOST_DELETED_FUNCTION(line_start_finder(line_start_finder const &)) + BOOST_DELETED_FUNCTION(line_start_finder &operator =(line_start_finder const &)) bool bits_[256]; }; @@ -208,8 +208,8 @@ struct leading_simple_repeat_finder } private: - leading_simple_repeat_finder(leading_simple_repeat_finder const &); - leading_simple_repeat_finder &operator =(leading_simple_repeat_finder const &); + BOOST_DELETED_FUNCTION(leading_simple_repeat_finder(leading_simple_repeat_finder const &)) + BOOST_DELETED_FUNCTION(leading_simple_repeat_finder &operator =(leading_simple_repeat_finder const &)) }; }}} diff --git a/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp b/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp index 878b53558..f2b1dd93c 100644 --- a/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp +++ b/include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp @@ -119,7 +119,7 @@ namespace boost { namespace xpressive { namespace detail } private: - alternate_matcher &operator =(alternate_matcher const &); + BOOST_DELETED_FUNCTION(alternate_matcher &operator =(alternate_matcher const &)) bool can_match_(char_type ch, Traits const &tr) const { diff --git a/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp b/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp index 8a80f25ac..fb5d99e4c 100644 --- a/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp +++ b/include/boost/xpressive/detail/core/matcher/attr_matcher.hpp @@ -42,7 +42,7 @@ namespace boost { namespace xpressive { namespace detail return this->traits_.translate(ch1); } private: - char_translate &operator =(char_translate const &); + BOOST_DELETED_FUNCTION(char_translate &operator =(char_translate const &)) }; /////////////////////////////////////////////////////////////////////////////// @@ -63,7 +63,7 @@ namespace boost { namespace xpressive { namespace detail return this->traits_.translate_nocase(ch1); } private: - char_translate &operator =(char_translate const &); + BOOST_DELETED_FUNCTION(char_translate &operator =(char_translate const &)) }; /////////////////////////////////////////////////////////////////////////////// diff --git a/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp b/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp index c5b991e10..525f8e6a3 100644 --- a/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp +++ b/include/boost/xpressive/detail/core/matcher/optional_matcher.hpp @@ -55,7 +55,7 @@ namespace boost { namespace xpressive { namespace detail || this->xpr_.BOOST_NESTED_TEMPLATE push_match(state); } - optional_matcher &operator =(optional_matcher const &); + BOOST_DELETED_FUNCTION(optional_matcher &operator =(optional_matcher const &)) }; /////////////////////////////////////////////////////////////////////////////// @@ -113,7 +113,7 @@ namespace boost { namespace xpressive { namespace detail || this->xpr_.BOOST_NESTED_TEMPLATE push_match(state); } - optional_mark_matcher &operator =(optional_mark_matcher const &); + BOOST_DELETED_FUNCTION(optional_mark_matcher &operator =(optional_mark_matcher const &)) }; }}} diff --git a/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp b/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp index 4a1085b26..1e2cd17a7 100644 --- a/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp +++ b/include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp @@ -216,7 +216,7 @@ namespace boost { namespace xpressive { namespace detail } private: - simple_repeat_matcher &operator =(simple_repeat_matcher const &); + BOOST_DELETED_FUNCTION(simple_repeat_matcher &operator =(simple_repeat_matcher const &)) }; // BUGBUG can all non-greedy quantification be done with the fixed width quantifier? diff --git a/include/boost/xpressive/detail/core/peeker.hpp b/include/boost/xpressive/detail/core/peeker.hpp index d7239cc20..3ec794612 100644 --- a/include/boost/xpressive/detail/core/peeker.hpp +++ b/include/boost/xpressive/detail/core/peeker.hpp @@ -62,7 +62,7 @@ struct char_sink hash_peek_bitset &bset_; Traits const &traits_; private: - char_sink &operator =(char_sink const &); + BOOST_DELETED_FUNCTION(char_sink &operator =(char_sink const &)) }; /////////////////////////////////////////////////////////////////////////////// @@ -259,8 +259,8 @@ struct xpression_peeker } private: - xpression_peeker(xpression_peeker const &); - xpression_peeker &operator =(xpression_peeker const &); + BOOST_DELETED_FUNCTION(xpression_peeker(xpression_peeker const &)) + BOOST_DELETED_FUNCTION(xpression_peeker &operator =(xpression_peeker const &)) template Traits const &get_traits_() const diff --git a/include/boost/xpressive/detail/core/regex_impl.hpp b/include/boost/xpressive/detail/core/regex_impl.hpp index ba9a96af6..c2b3489de 100644 --- a/include/boost/xpressive/detail/core/regex_impl.hpp +++ b/include/boost/xpressive/detail/core/regex_impl.hpp @@ -193,7 +193,7 @@ struct regex_impl #endif private: - regex_impl &operator =(regex_impl const &); + BOOST_DELETED_FUNCTION(regex_impl &operator =(regex_impl const &)) }; template diff --git a/include/boost/xpressive/detail/static/static.hpp b/include/boost/xpressive/detail/static/static.hpp index d967deb74..1ac589df2 100644 --- a/include/boost/xpressive/detail/static/static.hpp +++ b/include/boost/xpressive/detail/static/static.hpp @@ -176,7 +176,7 @@ struct static_xpression private: - static_xpression &operator =(static_xpression const &); + BOOST_DELETED_FUNCTION(static_xpression &operator =(static_xpression const &)) template void peek_next_(mpl::true_, xpression_peeker &peeker) const diff --git a/include/boost/xpressive/detail/static/transforms/as_set.hpp b/include/boost/xpressive/detail/static/transforms/as_set.hpp index ddc2bc232..42651dd05 100644 --- a/include/boost/xpressive/detail/static/transforms/as_set.hpp +++ b/include/boost/xpressive/detail/static/transforms/as_set.hpp @@ -120,7 +120,7 @@ namespace boost { namespace xpressive { namespace grammar_detail } private: - merge_charset &operator =(merge_charset const &); + BOOST_DELETED_FUNCTION(merge_charset &operator =(merge_charset const &)) template void call_(Expr const &expr, Tag) const diff --git a/include/boost/xpressive/detail/utility/sequence_stack.hpp b/include/boost/xpressive/detail/utility/sequence_stack.hpp index dbc832728..98425231c 100644 --- a/include/boost/xpressive/detail/utility/sequence_stack.hpp +++ b/include/boost/xpressive/detail/utility/sequence_stack.hpp @@ -93,7 +93,7 @@ struct sequence_stack chunk *back_, *next_; private: - chunk &operator =(chunk const &); + BOOST_DELETED_FUNCTION(chunk &operator =(chunk const &)) }; chunk *current_chunk_;