From 9a3ac5de98f90ec36b2b36cd3c0fb0503c5b60f7 Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Fri, 3 Apr 2020 16:30:32 -0700 Subject: [PATCH] bifcl: Change BIFs to return a wrapper object That allows implicit conversion from either Val* or IntrusivePtr --- tools/bifcl/builtin-func.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bifcl/builtin-func.y b/tools/bifcl/builtin-func.y index c1121a8ef5..000e90f0de 100644 --- a/tools/bifcl/builtin-func.y +++ b/tools/bifcl/builtin-func.y @@ -554,11 +554,11 @@ head_1: TOK_ID opt_ws arg_begin decl.c_fullname.c_str(), decl.bro_fullname.c_str()); fprintf(fp_func_h, - "%sextern Val* %s(Frame* frame, const zeek::Args*);%s\n", + "%sextern BifReturnVal %s(Frame* frame, const zeek::Args*);%s\n", decl.c_namespace_start.c_str(), decl.bare_name.c_str(), decl.c_namespace_end.c_str()); fprintf(fp_func_def, - "Val* %s(Frame* frame, const zeek::Args* %s)", + "BifReturnVal %s(Frame* frame, const zeek::Args* %s)", decl.c_fullname.c_str(), arg_list_name); record_bif_item(decl.bro_fullname.c_str(), "FUNCTION");