bifcl: Update namespace for plugin::Plugin and plugin::BifItem classes

This commit is contained in:
Tim Wojtulewicz 2020-05-14 17:17:21 -07:00
parent 9f317f02a4
commit 6813ddaaa9
2 changed files with 3 additions and 3 deletions

View file

@ -271,13 +271,13 @@ void init_alternative_mode()
fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\n");
fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon); fprintf(fp_func_init, "namespace plugin { namespace %s {\n", plugin_canon);
fprintf(fp_func_init, "\n"); fprintf(fp_func_init, "\n");
fprintf(fp_func_init, "void __bif_%s_init(plugin::Plugin* plugin)\n", name); fprintf(fp_func_init, "void __bif_%s_init(zeek::plugin::Plugin* plugin)\n", name);
fprintf(fp_func_init, "\t{\n"); fprintf(fp_func_init, "\t{\n");
fprintf(fp_func_register, "#include \"plugin/Manager.h\"\n"); fprintf(fp_func_register, "#include \"plugin/Manager.h\"\n");
fprintf(fp_func_register, "\n"); fprintf(fp_func_register, "\n");
fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon); fprintf(fp_func_register, "namespace plugin { namespace %s {\n", plugin_canon);
fprintf(fp_func_register, "void __bif_%s_init(plugin::Plugin* plugin);\n", name); fprintf(fp_func_register, "void __bif_%s_init(zeek::plugin::Plugin* plugin);\n", name);
fprintf(fp_func_register, "zeek::detail::plugin::__RegisterBif __register_bifs_%s_%s(\"%s\", __bif_%s_init);\n", plugin_canon, name, plugin, name); fprintf(fp_func_register, "zeek::detail::plugin::__RegisterBif __register_bifs_%s_%s(\"%s\", __bif_%s_init);\n", plugin_canon, name, plugin, name);
fprintf(fp_func_register, "} }\n"); fprintf(fp_func_register, "} }\n");
} }

View file

@ -304,7 +304,7 @@ void record_bif_item(const char* id, const char* type)
if ( ! plugin ) if ( ! plugin )
return; return;
fprintf(fp_func_init, "\tplugin->AddBifItem(\"%s\", plugin::BifItem::%s);\n", id, type); fprintf(fp_func_init, "\tplugin->AddBifItem(\"%s\", zeek::plugin::BifItem::%s);\n", id, type);
} }
%} %}