diff --git a/src/Type.h b/src/Type.h index b534f59892..cb0b5ba255 100644 --- a/src/Type.h +++ b/src/Type.h @@ -21,49 +21,6 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Expr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(ListExpr, zeek::detail); ZEEK_FORWARD_DECLARE_NAMESPACED(Attributes, zeek::detail); -enum [[deprecated("Remove in v4.1. Use zeek::TypeTag instead.")]] TypeTag { - TYPE_VOID, // 0 - TYPE_BOOL, // 1 - TYPE_INT, // 2 - TYPE_COUNT, // 3 - TYPE_COUNTER, // 4 - TYPE_DOUBLE, // 5 - TYPE_TIME, // 6 - TYPE_INTERVAL, // 7 - TYPE_STRING, // 8 - TYPE_PATTERN, // 9 - TYPE_ENUM, // 10 - TYPE_TIMER, // 11 - TYPE_PORT, // 12 - TYPE_ADDR, // 13 - TYPE_SUBNET, // 14 - TYPE_ANY, // 15 - TYPE_TABLE, // 16 - TYPE_UNION, // 17 - TYPE_RECORD, // 18 - TYPE_LIST, // 19 - TYPE_FUNC, // 20 - TYPE_FILE, // 21 - TYPE_VECTOR, // 22 - TYPE_OPAQUE, // 23 - TYPE_TYPE, // 24 - TYPE_ERROR // 25 -#define NUM_TYPES (int(TYPE_ERROR) + 1) -}; - -enum [[deprecated("Remove in v4.1. Use zeek::FunctionFlavor instead.")]] function_flavor { - FUNC_FLAVOR_FUNCTION, - FUNC_FLAVOR_EVENT, - FUNC_FLAVOR_HOOK -}; - -enum [[deprecated("Remove in v4.1. Use zeek::InternalTypeTag instead.")]] InternalTypeTag : uint16_t { - TYPE_INTERNAL_VOID, - TYPE_INTERNAL_INT, TYPE_INTERNAL_UNSIGNED, TYPE_INTERNAL_DOUBLE, - TYPE_INTERNAL_STRING, TYPE_INTERNAL_ADDR, TYPE_INTERNAL_SUBNET, - TYPE_INTERNAL_OTHER, TYPE_INTERNAL_ERROR -}; - namespace zeek { // BRO types. @@ -191,14 +148,6 @@ public: explicit Type(zeek::TypeTag tag, bool base_type = false); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead.")]] - explicit Type(::TypeTag tag, bool base_type = false) - : Type(static_cast(tag), base_type) - {} -#pragma GCC diagnostic pop - // Performs a shallow clone operation of the Bro type. // This especially means that especially for tables the types // are not recursively cloned; altering one type will in this case @@ -532,14 +481,6 @@ public: FuncType(IntrusivePtr args, IntrusivePtr yield, FunctionFlavor f); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::FunctionFlavor instead.")]] - FuncType(IntrusivePtr args, IntrusivePtr yield, ::function_flavor f) - : FuncType(args, yield, static_cast(f)) - {} -#pragma GCC diagnostic pop - IntrusivePtr ShallowClone() override; ~FuncType() override; @@ -561,13 +502,6 @@ public: void ClearYieldType(FunctionFlavor arg_flav) { yield = nullptr; flavor = arg_flav; } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::FunctionFlavor instead.")]] - void ClearYieldType(::function_flavor arg_flav) - { yield = nullptr; flavor = static_cast(arg_flav); } -#pragma GCC diagnostic pop - int MatchesIndex(zeek::detail::ListExpr* index) const override; bool CheckArgs(const type_list* args, bool is_init = false) const; bool CheckArgs(const std::vector>& args, @@ -984,12 +918,8 @@ inline const IntrusivePtr& error_type() { return base_type(TYP // Returns the basic (non-parameterized) type with the given type. // The reference count of the type is not increased. -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -[[deprecated("Remove in v4.1. Use zeek::base_type() instead")]] -inline zeek::Type* base_type_no_ref(::TypeTag tag) - { return zeek::base_type(static_cast(tag)).get(); } -#pragma GCC diagnostic pop +inline zeek::Type* base_type_no_ref(zeek::TypeTag tag) + { return zeek::base_type(tag).get(); } extern IntrusivePtr md5_type; extern IntrusivePtr sha1_type; @@ -1038,3 +968,88 @@ constexpr auto base_type [[deprecated("Remove in v4.1. Use zeek::base_type inste constexpr auto error_type [[deprecated("Remove in v4.1. Use zeek::error_type instead.")]] = zeek::error_type; constexpr auto type_name [[deprecated("Remove in v4.1. Use zeek::type_name instead.")]] = zeek::type_name; constexpr auto is_network_order [[deprecated("Remove in v4.1. Use zeek::is_network_order instead.")]] = zeek::is_network_order; + +using TypeTag [[deprecated("Remove in v4.1. Use zeek::TypeTag instead.")]] = zeek::TypeTag; + +[[deprecated("Remove in v4.1. Use zeek::TYPE_VOID instead.")]] +constexpr auto TYPE_VOID = zeek::TYPE_VOID; +[[deprecated("Remove in v4.1. Use zeek::TYPE_BOOL instead.")]] +constexpr auto TYPE_BOOL = zeek::TYPE_BOOL; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INT instead.")]] +constexpr auto TYPE_INT = zeek::TYPE_INT; +[[deprecated("Remove in v4.1. Use zeek::TYPE_COUNT instead.")]] +constexpr auto TYPE_COUNT = zeek::TYPE_COUNT; +[[deprecated("Remove in v4.1. Use zeek::TYPE_COUNTER instead.")]] +constexpr auto TYPE_COUNTER = zeek::TYPE_COUNTER; +[[deprecated("Remove in v4.1. Use zeek::TYPE_DOUBLE instead.")]] +constexpr auto TYPE_DOUBLE = zeek::TYPE_DOUBLE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_TIME instead.")]] +constexpr auto TYPE_TIME = zeek::TYPE_TIME; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERVAL instead.")]] +constexpr auto TYPE_INTERVAL = zeek::TYPE_INTERVAL; +[[deprecated("Remove in v4.1. Use zeek::TYPE_STRING instead.")]] +constexpr auto TYPE_STRING = zeek::TYPE_STRING; +[[deprecated("Remove in v4.1. Use zeek::TYPE_PATTERN instead.")]] +constexpr auto TYPE_PATTERN = zeek::TYPE_PATTERN; +[[deprecated("Remove in v4.1. Use zeek::TYPE_ENUM instead.")]] +constexpr auto TYPE_ENUM = zeek::TYPE_ENUM; +[[deprecated("Remove in v4.1. Use zeek::TYPE_TIMER instead.")]] +constexpr auto TYPE_TIMER = zeek::TYPE_TIMER; +[[deprecated("Remove in v4.1. Use zeek::TYPE_PORT instead.")]] +constexpr auto TYPE_PORT = zeek::TYPE_PORT; +[[deprecated("Remove in v4.1. Use zeek::TYPE_ADDR instead.")]] +constexpr auto TYPE_ADDR = zeek::TYPE_ADDR; +[[deprecated("Remove in v4.1. Use zeek::TYPE_SUBNET instead.")]] +constexpr auto TYPE_SUBNET = zeek::TYPE_SUBNET; +[[deprecated("Remove in v4.1. Use zeek::TYPE_ANY instead.")]] +constexpr auto TYPE_ANY = zeek::TYPE_ANY; +[[deprecated("Remove in v4.1. Use zeek::TYPE_TABLE instead.")]] +constexpr auto TYPE_TABLE = zeek::TYPE_TABLE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_UNION instead.")]] +constexpr auto TYPE_UNION = zeek::TYPE_UNION; +[[deprecated("Remove in v4.1. Use zeek::TYPE_RECORD instead.")]] +constexpr auto TYPE_RECORD = zeek::TYPE_RECORD; +[[deprecated("Remove in v4.1. Use zeek::TYPE_LIST instead.")]] +constexpr auto TYPE_LIST = zeek::TYPE_LIST; +[[deprecated("Remove in v4.1. Use zeek::TYPE_FUNC instead.")]] +constexpr auto TYPE_FUNC = zeek::TYPE_FUNC; +[[deprecated("Remove in v4.1. Use zeek::TYPE_FILE instead.")]] +constexpr auto TYPE_FILE = zeek::TYPE_FILE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_VECTOR instead.")]] +constexpr auto TYPE_VECTOR = zeek::TYPE_VECTOR; +[[deprecated("Remove in v4.1. Use zeek::TYPE_OPAQUE instead.")]] +constexpr auto TYPE_OPAQUE = zeek::TYPE_OPAQUE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]] +constexpr auto TYPE_TYPE = zeek::TYPE_TYPE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_TYPE instead.")]] +constexpr auto TYPE_ERROR = zeek::TYPE_ERROR; + +using function_flavor [[deprecated("Remove in v4.1. Use zeek::FunctionFlavor instead.")]] = zeek::FunctionFlavor; + +[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_FUNCTION instead.")]] +constexpr auto FUNC_FLAVOR_FUNCTION = zeek::FUNC_FLAVOR_FUNCTION; +[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_EVENT instead.")]] +constexpr auto FUNC_FLAVOR_EVENT = zeek::FUNC_FLAVOR_EVENT; +[[deprecated("Remove in v4.1. Use zeek::FUNC_FLAVOR_HOOK instead.")]] +constexpr auto FUNC_FLAVOR_HOOK = zeek::FUNC_FLAVOR_HOOK; + +using InternalTypeTag [[deprecated("Remove in v4.1. Use zeek::InteralTypeTag instead.")]] = zeek::InternalTypeTag; + +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_VOID instead.")]] +constexpr auto TYPE_INTERNAL_VOID = zeek::TYPE_INTERNAL_VOID; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_INT instead.")]] +constexpr auto TYPE_INTERNAL_INT = zeek::TYPE_INTERNAL_INT; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_UNSIGNED instead.")]] +constexpr auto TYPE_INTERNAL_UNSIGNED = zeek::TYPE_INTERNAL_UNSIGNED; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_DOUBLE instead.")]] +constexpr auto TYPE_INTERNAL_DOUBLE = zeek::TYPE_INTERNAL_DOUBLE; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_STRING instead.")]] +constexpr auto TYPE_INTERNAL_STRING = zeek::TYPE_INTERNAL_STRING; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ADDR instead.")]] +constexpr auto TYPE_INTERNAL_ADDR = zeek::TYPE_INTERNAL_ADDR; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_SUBNET instead.")]] +constexpr auto TYPE_INTERNAL_SUBNET = zeek::TYPE_INTERNAL_SUBNET; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_OTHER instead.")]] +constexpr auto TYPE_INTERNAL_OTHER = zeek::TYPE_INTERNAL_OTHER; +[[deprecated("Remove in v4.1. Use zeek::TYPE_INTERNAL_ERROR instead.")]] +constexpr auto TYPE_INTERNAL_ERROR = zeek::TYPE_INTERNAL_ERROR; diff --git a/src/Val.h b/src/Val.h index d9504fcb44..d57746103f 100644 --- a/src/Val.h +++ b/src/Val.h @@ -125,13 +125,6 @@ public: : val(d), type(zeek::base_type(t)) {} -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use IntervalVal(), TimeVal(), or DoubleVal() constructors.")]] - Val(double d, ::TypeTag t) : Val(d, static_cast(t)) - {} -#pragma GCC diagnostic pop - [[deprecated("Remove in v4.1. Construct from IntrusivePtr instead.")]] explicit Val(Func* f); explicit Val(IntrusivePtr f); @@ -656,12 +649,6 @@ class ListVal final : public Val { public: explicit ListVal(zeek::TypeTag t); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag")]] - explicit ListVal(::TypeTag t) : ListVal(static_cast(t)) {} -#pragma GCC diagnostic pop - ~ListVal() override; zeek::TypeTag BaseTag() const { return tag; } diff --git a/src/broker/Data.h b/src/broker/Data.h index 8045c86b28..33c6a6e327 100644 --- a/src/broker/Data.h +++ b/src/broker/Data.h @@ -236,14 +236,6 @@ public: it(dat.begin()) {} -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead.")]] - SetIterator(RecordVal* v, ::TypeTag tag, Frame* f) - : SetIterator(v, static_cast(tag), f) - {} -#pragma GCC diagnostic pop - broker::set dat; broker::set::iterator it; @@ -264,14 +256,6 @@ public: it(dat.begin()) {} -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead.")]] - TableIterator(RecordVal* v, ::TypeTag tag, Frame* f) - : TableIterator(v, static_cast(tag), f) - {} -#pragma GCC diagnostic pop - broker::table dat; broker::table::iterator it; @@ -292,14 +276,6 @@ public: it(dat.begin()) {} -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead.")]] - VectorIterator(RecordVal* v, ::TypeTag tag, Frame* f) - : VectorIterator(v, static_cast(tag), f) - {} -#pragma GCC diagnostic pop - broker::vector dat; broker::vector::iterator it; @@ -320,14 +296,6 @@ public: it(dat.begin()) {} -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek::TypeTag instead.")]] - RecordIterator(RecordVal* v, ::TypeTag tag, Frame* f) - : RecordIterator(v, static_cast(tag), f) - {} -#pragma GCC diagnostic pop - broker::vector dat; broker::vector::iterator it; diff --git a/src/input/readers/ascii/Ascii.h b/src/input/readers/ascii/Ascii.h index 3f7b04808b..b38bfa3284 100644 --- a/src/input/readers/ascii/Ascii.h +++ b/src/input/readers/ascii/Ascii.h @@ -25,19 +25,6 @@ struct FieldMapping { FieldMapping(const std::string& arg_name, const zeek::TypeTag& arg_type, int arg_position); FieldMapping(const std::string& arg_name, const zeek::TypeTag& arg_type, const zeek::TypeTag& arg_subtype, int arg_position); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - [[deprecated("Remove in v4.1. Use the version that takes zeek:TypeTag.")]] - FieldMapping(const std::string& arg_name, const ::TypeTag& arg_type, int arg_position) - : FieldMapping(arg_name, static_cast(arg_type), arg_position) - {} - - [[deprecated("Remove in v4.1. Use the version that takes zeek:TypeTag.")]] - FieldMapping(const std::string& arg_name, const ::TypeTag& arg_type, const ::TypeTag& arg_subtype, int arg_position) - : FieldMapping(arg_name, static_cast(arg_type), static_cast(arg_subtype), arg_position) - {} -#pragma GCC diagnostic pop - FieldMapping(const FieldMapping& arg); FieldMapping() { position = -1; secondary_position = -1; } diff --git a/src/threading/SerialTypes.h b/src/threading/SerialTypes.h index a78af7ce4a..954ed1e26f 100644 --- a/src/threading/SerialTypes.h +++ b/src/threading/SerialTypes.h @@ -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(type), static_cast(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(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(arg_type), static_cast(arg_subtype), arg_present) - {} -#pragma GCC diagnostic pop - /** * Destructor. */