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

Remove definition-less ThreadVal<->BrokerData conversion functions

Browse source 
Their presence/deprecation may cause "undefined reference" build
failures for some compilers (GCC 9.3.0 in my case).
This commit is contained in:
Jon Siwek 2020-08-21 13:28:23 -07:00
parent 099797ae0f
commit 20dbc001a1
3 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
3.3.0-dev.180 | 2020-08-21 13:28:23 -0700
* Remove definition-less ThreadVal<->BrokerData conversion functions (Jon Siwek, Corelight)
Their presence/deprecation may cause "undefined reference" build
failures for some compilers (GCC 9.3.0 in my case).
3.3.0-dev.177 | 2020-08-21 08:36:48 -0700 3.3.0-dev.177 | 2020-08-21 08:36:48 -0700
* Add missing namespace to usage of get_exe_path in fuzzer (Tim Wojtulewicz, Corelight) * Add missing namespace to usage of get_exe_path in fuzzer (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.177 3.3.0-dev.180

17
src/broker/Data.h
View file

@ -67,13 +67,6 @@ broker::expected<broker::data> val_to_data(const zeek::Val* v);
*/ */
zeek::ValPtr data_to_val(broker::data d, zeek::Type* type); zeek::ValPtr data_to_val(broker::data d, zeek::Type* type);
/**
* Convert a zeek::threading::Value to a Broker data value.
* @param v a zeek::threading::Value.
* @return a Broker data value if the zeek::threading::Value could be converted to one.
*/
broker::expected<broker::data> threading_val_to_data(const zeek::threading::Value* v);
/** /**
* Convert a zeek::threading::Field to a Broker data value. * Convert a zeek::threading::Field to a Broker data value.
* @param f a zeek::threading::Field. * @param f a zeek::threading::Field.
@ -81,14 +74,6 @@ broker::expected<broker::data> threading_val_to_data(const zeek::threading::Valu
*/ */
broker::data threading_field_to_data(const zeek::threading::Field* f); broker::data threading_field_to_data(const zeek::threading::Field* f);
/**
* Convert a Broker data value to a zeek::threading::Value.
* @param d a Broker data value.
* @return a pointer to a new zeek::threading::Value or a nullptr if the conversion was not
* possible.
*/
zeek::threading::Value* data_to_threading_val(broker::data d);
/** /**
* Convert a Broker data value to a zeek::threading::Value. * Convert a Broker data value to a zeek::threading::Value.
* @param d a Broker data value. * @param d a Broker data value.
@ -327,9 +312,7 @@ inline zeek::RecordValPtr make_data_val(broker::data d) { return zeek::Broker::
constexpr auto get_data_type [[deprecated("Remove in v4.1. Use zeek::Broker::detail::get_data_type.")]] = zeek::Broker::detail::get_data_type; constexpr auto get_data_type [[deprecated("Remove in v4.1. Use zeek::Broker::detail::get_data_type.")]] = zeek::Broker::detail::get_data_type;
constexpr auto val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::val_to_data.")]] = zeek::Broker::detail::val_to_data; constexpr auto val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::val_to_data.")]] = zeek::Broker::detail::val_to_data;
constexpr auto data_to_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_val.")]] = zeek::Broker::detail::data_to_val; constexpr auto data_to_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_val.")]] = zeek::Broker::detail::data_to_val;
constexpr auto threading_val_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_val_to_data.")]] = zeek::Broker::detail::threading_val_to_data;
constexpr auto threading_field_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_field_to_data.")]] = zeek::Broker::detail::threading_field_to_data; constexpr auto threading_field_to_data [[deprecated("Remove in v4.1. Use zeek::Broker::detail::threading_field_to_data.")]] = zeek::Broker::detail::threading_field_to_data;
constexpr auto data_to_threading_val [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_val.")]] = zeek::Broker::detail::data_to_threading_val;
constexpr auto data_to_threading_field [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_field.")]] = zeek::Broker::detail::data_to_threading_field; constexpr auto data_to_threading_field [[deprecated("Remove in v4.1. Use zeek::Broker::detail::data_to_threading_field.")]] = zeek::Broker::detail::data_to_threading_field;
using DataVal [[deprecated("Remove in v4.1. Use zeek::Broker::detail::DataVal.")]] = zeek::Broker::detail::DataVal; using DataVal [[deprecated("Remove in v4.1. Use zeek::Broker::detail::DataVal.")]] = zeek::Broker::detail::DataVal;