Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 20:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move BroFile to zeek namespace, rename to File

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-20 12:10:58 -07:00
parent bfab224d7c
commit 910aa77d95
29 changed files with 135 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Desc.h
View file

@ -22,7 +22,8 @@ typedef enum {
RAW_STYLE,
} desc_style;
class BroFile;
namespace zeek { class File; }
using BroFile [[deprecated("Remove in v4.1. Use zeek::File.")]] = zeek::File;
ZEEK_FORWARD_DECLARE_NAMESPACED(IPAddr, zeek);
ZEEK_FORWARD_DECLARE_NAMESPACED(IPPrefix, zeek);
@ -32,7 +33,7 @@ using BroType [[deprecated("Remove in v4.1. Use zeek::Type instead.")]] = zeek::
class ODesc {
public:
explicit ODesc(desc_type t=DESC_READABLE, BroFile* f=nullptr);
explicit ODesc(desc_type t=DESC_READABLE, zeek::File* f=nullptr);
~ODesc();
@ -201,7 +202,7 @@ protected:
using escape_set = std::set<std::string>;
escape_set escape_sequences; // additional sequences of chars to escape
BroFile* f; // or the file we're using.
zeek::File* f; // or the file we're using.
int indent_level;
bool do_flush;