Little fixes.

This commit is contained in:
Robin Sommer 2013-05-30 19:13:08 -07:00
parent b3370584c7
commit 23463d064c
4 changed files with 3 additions and 5 deletions

2
cmake

@ -1 +1 @@
Subproject commit 94e72a3075bb0b9550ad05758963afda394bfb2c Subproject commit 0187b33a29d5ec824f940feff60dc5d8c2fe314f

View file

@ -853,8 +853,8 @@ int main(int argc, char** argv)
yyparse(); yyparse();
analyzer_mgr->InitPostScript();
plugin_mgr->InitPostScript(); plugin_mgr->InitPostScript();
analyzer_mgr->InitPostScript();
if ( print_plugins ) if ( print_plugins )
{ {

View file

@ -37,7 +37,7 @@
namespace plugin { namespace _ns ## _ ## _name {\ namespace plugin { namespace _ns ## _ ## _name {\
class Plugin : public plugin::Plugin { \ class Plugin : public plugin::Plugin { \
protected: \ protected: \
void Init() \ void InitPreScript() \
{ \ { \
SetName(#_ns "::" #_name); \ SetName(#_ns "::" #_name); \
SetVersion(_BRO_PLUGIN_VERSION_DEFAULT);\ SetVersion(_BRO_PLUGIN_VERSION_DEFAULT);\

View file

@ -52,8 +52,6 @@ void Manager::InitPostScript()
for ( plugin_list::iterator i = Manager::PluginsInternal()->begin(); i != Manager::PluginsInternal()->end(); i++ ) for ( plugin_list::iterator i = Manager::PluginsInternal()->begin(); i != Manager::PluginsInternal()->end(); i++ )
(*i)->InitPostScript(); (*i)->InitPostScript();
init = true;
} }
void Manager::FinishPlugins() void Manager::FinishPlugins()