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

Deprecate TypeTag and friends in a different way

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-30 12:48:07 -07:00
parent a280bfa0b1
commit 361ad8f2f7
5 changed files with 87 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/threading/SerialTypes.h
View file

@ -33,14 +33,6 @@ struct Field {
secondary_name(secondary_name ? copy_string(secondary_name) : nullptr),
type(type), subtype(subtype), optional(optional) { }
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
[[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead")]]
Field(const char* name, const char* secondary_name, ::TypeTag type, ::TypeTag subtype, bool optional) :
Field(name, secondary_name, static_cast<zeek::TypeTag>(type), static_cast<zeek::TypeTag>(subtype), optional)
{}
#pragma GCC diagnostic pop
/**
* Copy constructor.
*/
@ -153,14 +145,6 @@ struct Value {
: type(arg_type), subtype(zeek::TYPE_VOID), present(arg_present)
{}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
[[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag.")]]
Value(::TypeTag arg_type, bool arg_present = true)
: Value(static_cast<zeek::TypeTag>(arg_type), arg_present)
{}
#pragma GCC diagnostic pop
/**
* Constructor.
*
@ -175,14 +159,6 @@ struct Value {
: type(arg_type), subtype(arg_subtype), present(arg_present)
{}
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
[[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag.")]]
Value(::TypeTag arg_type, ::TypeTag arg_subtype, bool arg_present = true)
: Value(static_cast<zeek::TypeTag>(arg_type), static_cast<zeek::TypeTag>(arg_subtype), arg_present)
{}
#pragma GCC diagnostic pop
/**
* Destructor.
*/