Move __RegisterBif from zeek::detail::plugin to zeek::plugin::detail

This commit is contained in:
Tim Wojtulewicz 2020-08-13 12:24:55 -07:00
parent 35d72a68e8
commit 81c70df62c
2 changed files with 8 additions and 10 deletions

@ -1 +1 @@
Subproject commit 1607cc50ddde62ac13c0f1d6539a96bb7182ca4e Subproject commit 1f7e277dd43fb69acaf44aaac4d2fe04207ff6ad

View file

@ -481,14 +481,7 @@ std::list<T *> Manager::Components() const
return result; return result;
} }
} // namespace plugin namespace detail {
extern zeek::plugin::Manager* plugin_mgr;
} // namespace zeek
// TOOD: should this just be zeek::detail?
namespace zeek::detail::plugin {
/** /**
* Internal class used by bifcl-generated code to register its init functions at runtime. * Internal class used by bifcl-generated code to register its init functions at runtime.
@ -501,7 +494,12 @@ public:
} }
}; };
} } // namespace detail
} // namespace plugin
extern zeek::plugin::Manager* plugin_mgr;
} // namespace zeek
namespace plugin { namespace plugin {
using Manager [[deprecated("Remove in v4.1. Use zeek::plugin::Manager.")]] = zeek::plugin::Manager; using Manager [[deprecated("Remove in v4.1. Use zeek::plugin::Manager.")]] = zeek::plugin::Manager;