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

Re-add TYPE_COUNTER without function and deprecation marker.

Browse source
This commit is contained in:
Johanna Amann 2020-07-31 14:53:27 -07:00
parent 417a6eb1e9
commit cd3400f957
8 changed files with 81 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/Type.h
View file

@ -39,27 +39,28 @@ enum TypeTag {
TYPE_BOOL, // 1
TYPE_INT, // 2
TYPE_COUNT, // 3
TYPE_DOUBLE, // 4
TYPE_TIME, // 5
TYPE_INTERVAL, // 6
TYPE_STRING, // 7
TYPE_PATTERN, // 8
TYPE_ENUM, // 9
TYPE_TIMER, // 10
TYPE_PORT, // 11
TYPE_ADDR, // 12
TYPE_SUBNET, // 13
TYPE_ANY, // 14
TYPE_TABLE, // 15
TYPE_UNION, // 16
TYPE_RECORD, // 17
TYPE_LIST, // 18
TYPE_FUNC, // 19
TYPE_FILE, // 20
TYPE_VECTOR, // 21
TYPE_OPAQUE, // 22
TYPE_TYPE, // 23
TYPE_ERROR // 24
TYPE_COUNTER [[deprecated("Remove in v4.1. TYPE_COUNTER was removed; use TYPE_COUNT instead.")]], // 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)
};
@ -935,6 +936,8 @@ constexpr auto TYPE_BOOL = zeek::TYPE_BOOL;
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. TYPE_COUNTER was removed. Use zeek::TYPE_COUNT 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.")]]