Skip to content

Commit 066be83

Browse files
Fix gcc 9 deprecated copy warnings.
1 parent 956d8df commit 066be83

11 files changed

Lines changed: 24 additions & 24 deletions

File tree

include/boost/xpressive/detail/core/adaptor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct xpression_adaptor
6363
}
6464

6565
private:
66-
xpression_adaptor &operator =(xpression_adaptor const &);
66+
BOOST_DELETED_FUNCTION(xpression_adaptor &operator =(xpression_adaptor const &))
6767
};
6868

6969
///////////////////////////////////////////////////////////////////////////////

include/boost/xpressive/detail/core/finder.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ struct boyer_moore_finder
4949
}
5050

5151
private:
52-
boyer_moore_finder(boyer_moore_finder const &);
53-
boyer_moore_finder &operator =(boyer_moore_finder const &);
52+
BOOST_DELETED_FUNCTION(boyer_moore_finder(boyer_moore_finder const &))
53+
BOOST_DELETED_FUNCTION(boyer_moore_finder &operator =(boyer_moore_finder const &))
5454

5555
boyer_moore<BidiIter, Traits> bm_;
5656
};
@@ -79,8 +79,8 @@ struct hash_peek_finder
7979
}
8080

8181
private:
82-
hash_peek_finder(hash_peek_finder const &);
83-
hash_peek_finder &operator =(hash_peek_finder const &);
82+
BOOST_DELETED_FUNCTION(hash_peek_finder(hash_peek_finder const &))
83+
BOOST_DELETED_FUNCTION(hash_peek_finder &operator =(hash_peek_finder const &))
8484

8585
template<typename ICase>
8686
BidiIter find_(BidiIter begin, BidiIter end, Traits const &tr, ICase) const
@@ -134,8 +134,8 @@ struct line_start_finder
134134
}
135135

136136
private:
137-
line_start_finder(line_start_finder const &);
138-
line_start_finder &operator =(line_start_finder const &);
137+
BOOST_DELETED_FUNCTION(line_start_finder(line_start_finder const &))
138+
BOOST_DELETED_FUNCTION(line_start_finder &operator =(line_start_finder const &))
139139

140140
char_class_type newline_;
141141
};
@@ -184,8 +184,8 @@ struct line_start_finder<BidiIter, Traits, 1u>
184184
}
185185

186186
private:
187-
line_start_finder(line_start_finder const &);
188-
line_start_finder &operator =(line_start_finder const &);
187+
BOOST_DELETED_FUNCTION(line_start_finder(line_start_finder const &))
188+
BOOST_DELETED_FUNCTION(line_start_finder &operator =(line_start_finder const &))
189189

190190
bool bits_[256];
191191
};
@@ -208,8 +208,8 @@ struct leading_simple_repeat_finder
208208
}
209209

210210
private:
211-
leading_simple_repeat_finder(leading_simple_repeat_finder const &);
212-
leading_simple_repeat_finder &operator =(leading_simple_repeat_finder const &);
211+
BOOST_DELETED_FUNCTION(leading_simple_repeat_finder(leading_simple_repeat_finder const &))
212+
BOOST_DELETED_FUNCTION(leading_simple_repeat_finder &operator =(leading_simple_repeat_finder const &))
213213
};
214214

215215
}}}

include/boost/xpressive/detail/core/matcher/alternate_matcher.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ namespace boost { namespace xpressive { namespace detail
119119
}
120120

121121
private:
122-
alternate_matcher &operator =(alternate_matcher const &);
122+
BOOST_DELETED_FUNCTION(alternate_matcher &operator =(alternate_matcher const &))
123123

124124
bool can_match_(char_type ch, Traits const &tr) const
125125
{

include/boost/xpressive/detail/core/matcher/attr_matcher.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ namespace boost { namespace xpressive { namespace detail
4242
return this->traits_.translate(ch1);
4343
}
4444
private:
45-
char_translate &operator =(char_translate const &);
45+
BOOST_DELETED_FUNCTION(char_translate &operator =(char_translate const &))
4646
};
4747

4848
///////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@ namespace boost { namespace xpressive { namespace detail
6363
return this->traits_.translate_nocase(ch1);
6464
}
6565
private:
66-
char_translate &operator =(char_translate const &);
66+
BOOST_DELETED_FUNCTION(char_translate &operator =(char_translate const &))
6767
};
6868

6969
///////////////////////////////////////////////////////////////////////////////

include/boost/xpressive/detail/core/matcher/optional_matcher.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace boost { namespace xpressive { namespace detail
5555
|| this->xpr_.BOOST_NESTED_TEMPLATE push_match<Next>(state);
5656
}
5757

58-
optional_matcher &operator =(optional_matcher const &);
58+
BOOST_DELETED_FUNCTION(optional_matcher &operator =(optional_matcher const &))
5959
};
6060

6161
///////////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ namespace boost { namespace xpressive { namespace detail
113113
|| this->xpr_.BOOST_NESTED_TEMPLATE push_match<Next>(state);
114114
}
115115

116-
optional_mark_matcher &operator =(optional_mark_matcher const &);
116+
BOOST_DELETED_FUNCTION(optional_mark_matcher &operator =(optional_mark_matcher const &))
117117
};
118118

119119
}}}

include/boost/xpressive/detail/core/matcher/simple_repeat_matcher.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ namespace boost { namespace xpressive { namespace detail
216216
}
217217

218218
private:
219-
simple_repeat_matcher &operator =(simple_repeat_matcher const &);
219+
BOOST_DELETED_FUNCTION(simple_repeat_matcher &operator =(simple_repeat_matcher const &))
220220
};
221221

222222
// BUGBUG can all non-greedy quantification be done with the fixed width quantifier?

include/boost/xpressive/detail/core/peeker.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ struct char_sink
6262
hash_peek_bitset<char_type> &bset_;
6363
Traits const &traits_;
6464
private:
65-
char_sink &operator =(char_sink const &);
65+
BOOST_DELETED_FUNCTION(char_sink &operator =(char_sink const &))
6666
};
6767

6868
///////////////////////////////////////////////////////////////////////////////
@@ -259,8 +259,8 @@ struct xpression_peeker
259259
}
260260

261261
private:
262-
xpression_peeker(xpression_peeker const &);
263-
xpression_peeker &operator =(xpression_peeker const &);
262+
BOOST_DELETED_FUNCTION(xpression_peeker(xpression_peeker const &))
263+
BOOST_DELETED_FUNCTION(xpression_peeker &operator =(xpression_peeker const &))
264264

265265
template<typename Traits>
266266
Traits const &get_traits_() const

include/boost/xpressive/detail/core/regex_impl.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ struct regex_impl
193193
#endif
194194

195195
private:
196-
regex_impl &operator =(regex_impl const &);
196+
BOOST_DELETED_FUNCTION(regex_impl &operator =(regex_impl const &))
197197
};
198198

199199
template<typename BidiIter>

include/boost/xpressive/detail/static/static.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ struct static_xpression
176176

177177
private:
178178

179-
static_xpression &operator =(static_xpression const &);
179+
BOOST_DELETED_FUNCTION(static_xpression &operator =(static_xpression const &))
180180

181181
template<typename Char>
182182
void peek_next_(mpl::true_, xpression_peeker<Char> &peeker) const

include/boost/xpressive/detail/static/transforms/as_set.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ namespace boost { namespace xpressive { namespace grammar_detail
120120
}
121121

122122
private:
123-
merge_charset &operator =(merge_charset const &);
123+
BOOST_DELETED_FUNCTION(merge_charset &operator =(merge_charset const &))
124124

125125
template<typename Expr, typename Tag>
126126
void call_(Expr const &expr, Tag) const

0 commit comments

Comments
 (0)