mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 22:58:20 +00:00
Merge branch 'intrusive_ptr' of https://github.com/MaxKellermann/zeek
* 'intrusive_ptr' of https://github.com/MaxKellermann/zeek: (32 commits) Scope: store IntrusivePtr in `local` Scope: pass IntrusivePtr to AddInit() DNS_Mgr: use class IntrusivePtr Scope: use class IntrusivePtr Attr: use class IntrusivePtr Expr: check_and_promote_expr() returns IntrusivePtr Frame: use class IntrusivePtr Val: RecordVal::LookupWithDefault() returns IntrusivePtr Type: RecordType::FieldDefault() returns IntrusivePtr Val: TableVal::Delete() returns IntrusivePtr Type: base_type() returns IntrusivePtr Type: init_type() returns IntrusivePtr Type: merge_types() returns IntrusivePtr Type: use class IntrusivePtr in VectorType Type: use class IntrusivePtr in EnumType Type: use class IntrusivePtr in FileType Type: use class IntrusivePtr in TypeDecl Type: make TypeDecl `final` and the dtor non-`virtual` Type: use class IntrusivePtr in TypeType Type: use class IntrusivePtr in FuncType ...
This commit is contained in:
commit
b62727a7fa
108 changed files with 1737 additions and 2067 deletions
|
@ -234,7 +234,7 @@ static void parse_function_name(vector<ParseLocationRec>& result,
|
|||
Stmt* body = 0; // the particular body we care about; 0 = all
|
||||
|
||||
if ( bodies.size() == 1 )
|
||||
body = bodies[0].stmts;
|
||||
body = bodies[0].stmts.get();
|
||||
else
|
||||
{
|
||||
while ( 1 )
|
||||
|
@ -245,8 +245,7 @@ static void parse_function_name(vector<ParseLocationRec>& result,
|
|||
{
|
||||
Stmt* first;
|
||||
Location stmt_loc;
|
||||
get_first_statement(bodies[i].stmts, first,
|
||||
stmt_loc);
|
||||
get_first_statement(bodies[i].stmts.get(), first, stmt_loc);
|
||||
debug_msg("[%d] %s:%d\n", i+1, stmt_loc.filename, stmt_loc.first_line);
|
||||
}
|
||||
|
||||
|
@ -278,7 +277,7 @@ static void parse_function_name(vector<ParseLocationRec>& result,
|
|||
int option = atoi(input.c_str());
|
||||
if ( option > 0 && option <= (int) bodies.size() )
|
||||
{
|
||||
body = bodies[option - 1].stmts;
|
||||
body = bodies[option - 1].stmts.get();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -308,7 +307,7 @@ static void parse_function_name(vector<ParseLocationRec>& result,
|
|||
|
||||
for ( unsigned int i = 0; i < bodies.size(); ++i )
|
||||
{
|
||||
get_first_statement(bodies[i].stmts, first, stmt_loc);
|
||||
get_first_statement(bodies[i].stmts.get(), first, stmt_loc);
|
||||
if ( ! first )
|
||||
continue;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue