mirror of
https://github.com/zeek/zeek.git
synced 2025-10-16 05:28:20 +00:00
Convert Dictionary types to be templated classes
This has the fortunate side-effect of also making it so we can store the value objects as typed pointers, instead of void*.
This commit is contained in:
parent
15c0bd9b9d
commit
47e7fe2cd1
15 changed files with 1153 additions and 1284 deletions
|
@ -924,8 +924,6 @@ broker::expected<broker::data> val_to_data(const Val* v)
|
|||
for ( const auto& te : *table )
|
||||
{
|
||||
auto hk = te.GetHashKey();
|
||||
auto* entry = te.GetValue<TableEntryVal*>();
|
||||
|
||||
auto vl = table_val->RecreateIndex(*hk);
|
||||
|
||||
broker::vector composite_key;
|
||||
|
@ -952,7 +950,7 @@ broker::expected<broker::data> val_to_data(const Val* v)
|
|||
get<broker::set>(rval).emplace(move(key));
|
||||
else
|
||||
{
|
||||
auto val = val_to_data(entry->GetVal().get());
|
||||
auto val = val_to_data(te.value->GetVal().get());
|
||||
|
||||
if ( ! val )
|
||||
return broker::ec::invalid_data;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue