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

Use type aliases for IntrusivePtr definitions

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-24 16:46:34 -04:00
parent f6a251cdac
commit ec9eff0bd5
180 changed files with 2026 additions and 1893 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/supervisor/Supervisor.cc
View file

@ -1102,7 +1102,7 @@ std::string Supervisor::NodeConfig::ToJSON() const
return ToRecord()->ToJSON(false, re.get())->ToStdString();
}
zeek::IntrusivePtr<RecordVal> Supervisor::NodeConfig::ToRecord() const
RecordValPtr Supervisor::NodeConfig::ToRecord() const
{
const auto& rt = zeek::BifType::Record::Supervisor::NodeConfig;
auto rval = zeek::make_intrusive<RecordVal>(rt);
@ -1156,7 +1156,7 @@ zeek::IntrusivePtr<RecordVal> Supervisor::NodeConfig::ToRecord() const
return rval;
}
zeek::IntrusivePtr<RecordVal> Supervisor::Node::ToRecord() const
RecordValPtr Supervisor::Node::ToRecord() const
{
const auto& rt = zeek::BifType::Record::Supervisor::NodeStatus;
auto rval = zeek::make_intrusive<RecordVal>(rt);
@ -1170,7 +1170,7 @@ zeek::IntrusivePtr<RecordVal> Supervisor::Node::ToRecord() const
}
static zeek::IntrusivePtr<Val> supervisor_role_to_cluster_node_type(BifEnum::Supervisor::ClusterRole role)
static ValPtr supervisor_role_to_cluster_node_type(BifEnum::Supervisor::ClusterRole role)
{
static auto node_type = zeek::id::find_type<zeek::EnumType>("Cluster::NodeType");
@ -1312,7 +1312,7 @@ void Supervisor::SupervisedNode::Init(zeek::Options* options) const
options->scripts_to_load.emplace_back(s);
}
zeek::IntrusivePtr<RecordVal> Supervisor::Status(std::string_view node_name)
RecordValPtr Supervisor::Status(std::string_view node_name)
{
auto rval = zeek::make_intrusive<RecordVal>(zeek::BifType::Record::Supervisor::Status);
const auto& tt = zeek::BifType::Record::Supervisor::Status->GetFieldType("nodes");

6
src/supervisor/Supervisor.h
View file

@ -103,7 +103,7 @@ public:
* Convert his object into script-layer record value.
* @return the script-layer record value representing the node config.
*/
zeek::IntrusivePtr<RecordVal> ToRecord() const;
RecordValPtr ToRecord() const;
/**
* The name of the supervised Zeek node. These are unique within
@ -183,7 +183,7 @@ public:
* Convert the node into script-layer Supervisor::NodeStatus record
* representation.
*/
zeek::IntrusivePtr<RecordVal> ToRecord() const;
RecordValPtr ToRecord() const;
/**
* @return the name of the node.
@ -311,7 +311,7 @@ public:
* @return script-layer Supervisor::Status record value describing the
* status of a node or set of nodes.
*/
zeek::IntrusivePtr<RecordVal> Status(std::string_view node_name);
RecordValPtr Status(std::string_view node_name);
/**
* Create a new supervised node.