Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove other general deprecations

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-06-16 12:29:42 -07:00
parent 6130d32440
commit fb16ce3711
16 changed files with 5 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Val.cc
View file

@ -3629,26 +3629,14 @@ void VectorVal::ValDescribe(ODesc* d) const
d->Add("]");
}
ValPtr check_and_promote(ValPtr v, const TypePtr& t, bool is_init,
ValPtr check_and_promote(ValPtr v, const TypePtr& new_type, bool is_init,
const detail::Location* expr_location)
{
// Once 5.0 comes out, this function can merge with the deprecated one below it, and this
// pragma block can go away.
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return check_and_promote(v, t.get(), is_init, expr_location);
#pragma GCC diagnostic pop
}
[[deprecated("Remove in v5.1. Use version that takes TypePtr instead.")]] ValPtr
check_and_promote(ValPtr v, const Type* t, bool is_init, const detail::Location* expr_location)
{
if ( ! v )
return nullptr;
Type* vt = flatten_type(v->GetType().get());
t = flatten_type(t);
Type* t = flatten_type(new_type.get());
TypeTag t_tag = t->Tag();
TypeTag v_tag = vt->Tag();