Move input code to zeek namespaces

This commit is contained in:
Tim Wojtulewicz 2020-08-01 10:47:51 -07:00
parent 14408235b8
commit 9a800265ff
31 changed files with 227 additions and 162 deletions

View file

@ -6,10 +6,9 @@
#include "threading/SerialTypes.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, input);
namespace input {
class Manager;
namespace zeek::input {
/**
* Bridge class between the input::Manager and backend input threads. The
@ -119,7 +118,7 @@ public:
const threading::Field* const * Fields() const { return fields; }
protected:
friend class Manager;
friend class zeek::input::Manager;
private:
ReaderBackend* backend; // The backend we have instanatiated.
@ -131,4 +130,8 @@ private:
const char* name; // Descriptive name.
};
} // namespace zeek::input
namespace input {
using ReaderFrontend [[deprecated("Remove in v4.1. Use zeek::input::ReaderFrontend.")]] = zeek::input::ReaderFrontend;
}