Use type aliases for IntrusivePtr definitions

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

View file

@ -472,7 +472,7 @@ bool Manager::CreateTableStream(RecordVal* fval)
auto idx_val = fval->GetFieldOrDefault("idx");
zeek::RecordType* idx = idx_val->AsType()->AsTypeType()->GetType()->AsRecordType();
zeek::IntrusivePtr<zeek::RecordType> val;
zeek::RecordTypePtr val;
auto val_val = fval->GetFieldOrDefault("val");
if ( val_val )
@ -929,7 +929,7 @@ bool Manager::UnrollRecordType(vector<Field*> *fields, const zeek::RecordType *r
{
string name = nameprepend + rec->FieldName(i);
const char* secondary = nullptr;
zeek::IntrusivePtr<Val> c;
ValPtr c;
zeek::TypeTag ty = rec->GetFieldType(i)->Tag();
zeek::TypeTag st = zeek::TYPE_VOID;
bool optional = false;
@ -991,7 +991,7 @@ bool Manager::ForceUpdate(const string &name)
Val* Manager::RecordValToIndexVal(RecordVal *r) const
{
zeek::IntrusivePtr<Val> idxval;
ValPtr idxval;
zeek::RecordType *type = r->GetType()->AsRecordType();
@ -1159,7 +1159,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
// call stream first to determine if we really add / change the entry
if ( stream->pred && ! convert_error )
{
zeek::IntrusivePtr<EnumVal> ev;
EnumValPtr ev;
int startpos = 0;
bool pred_convert_error = false;
predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, pred_convert_error);
@ -1230,7 +1230,7 @@ int Manager::SendEntryTable(Stream* i, const Value* const *vals)
assert(idxval);
zeek::IntrusivePtr<Val> oldval;
ValPtr oldval;
if ( updated == true )
{
assert(stream->num_val_fields > 0);
@ -1326,9 +1326,9 @@ void Manager::EndCurrentSend(ReaderFrontend* reader)
while ( ( ih = stream->lastDict->NextEntry(lastDictIdxKey, c) ) )
{
zeek::IntrusivePtr<Val> val;
zeek::IntrusivePtr<Val> predidx;
zeek::IntrusivePtr<EnumVal> ev;
ValPtr val;
ValPtr predidx;
EnumValPtr ev;
int startpos = 0;
if ( stream->pred || stream->event )
@ -1541,7 +1541,7 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
if ( stream->pred || stream->event )
{
bool updated = false;
zeek::IntrusivePtr<Val> oldval;
ValPtr oldval;
if ( stream->num_val_fields > 0 )
{
@ -1559,7 +1559,7 @@ int Manager::PutTable(Stream* i, const Value* const *vals)
// predicate if we want the update or not
if ( stream->pred )
{
zeek::IntrusivePtr<EnumVal> ev;
EnumValPtr ev;
int startpos = 0;
bool pred_convert_error = false;
Val* predidx = ValueToRecordVal(i, vals, stream->itype, &startpos, pred_convert_error);
@ -2435,7 +2435,7 @@ void Manager::ErrorHandler(const Stream* i, ErrorType et, bool reporter_send, co
// send our script level error event
if ( i->error_event )
{
zeek::IntrusivePtr<EnumVal> ev;
EnumValPtr ev;
switch (et)
{
case ErrorType::INFO:

View file

@ -16,7 +16,7 @@ input::Tag& input::Tag::operator=(const input::Tag& other)
return *this;
}
const zeek::IntrusivePtr<EnumVal>& input::Tag::AsVal() const
const EnumValPtr& input::Tag::AsVal() const
{
return ::Tag::AsVal(input_mgr->GetTagType());
}
@ -26,7 +26,7 @@ EnumVal* input::Tag::AsEnumVal() const
return AsVal().get();
}
input::Tag::Tag(zeek::IntrusivePtr<EnumVal> val)
input::Tag::Tag(EnumValPtr val)
: ::Tag(std::move(val))
{ }

View file

@ -89,7 +89,7 @@ public:
*
* @param etype the script-layer enum type associated with the tag.
*/
const zeek::IntrusivePtr<EnumVal>& AsVal() const;
const EnumValPtr& AsVal() const;
[[deprecated("Remove in v4.1. Use AsVal() instead.")]]
EnumVal* AsEnumVal() const;
@ -117,7 +117,7 @@ protected:
*
* @param val An enum value of script type \c Input::Reader.
*/
explicit Tag(zeek::IntrusivePtr<EnumVal> val);
explicit Tag(EnumValPtr val);
[[deprecated("Remove in v4.1. Construct from IntrusivePtr isntead.")]]
explicit Tag(EnumVal* val);