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

Remove 'using namespace std' from SerialTypes.h

Browse source 
This unfortunately cuases a ton of flow-down changes because a lot of other
code was depending on that definition existing. This has a fairly large chance
to break builds of external plugins, considering how many internal ones it broke.
This commit is contained in:
Tim Wojtulewicz 2020-04-07 15:45:20 -07:00
parent a525f9532e
commit d53c1454c0
119 changed files with 402 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/logging/writers/ascii/Ascii.h
View file

@ -17,7 +17,7 @@ public:
explicit Ascii(WriterFrontend* frontend);
~Ascii() override;
static string LogExt();
static std::string LogExt();
static WriterBackend* Instantiate(WriterFrontend* frontend)
{ return new Ascii(frontend); }
@ -35,11 +35,11 @@ protected:
bool DoHeartbeat(double network_time, double current_time) override;
private:
bool IsSpecial(const string &path) { return path.find("/dev/") == 0; }
bool WriteHeader(const string& path);
bool WriteHeaderField(const string& key, const string& value);
bool IsSpecial(const std::string &path) { return path.find("/dev/") == 0; }
bool WriteHeader(const std::string& path);
bool WriteHeaderField(const std::string& key, const std::string& value);
void CloseFile(double t);
string Timestamp(double t); // Uses current time if t is zero.
std::string Timestamp(double t); // Uses current time if t is zero.
void InitConfigOptions();
bool InitFilterOptions();
bool InitFormatter();
@ -48,7 +48,7 @@ private:
int fd;
gzFile gzfile;
string fname;
std::string fname;
ODesc desc;
bool ascii_done;
@ -57,17 +57,17 @@ private:
bool include_meta;
bool tsv;
string separator;
string set_separator;
string empty_field;
string unset_field;
string meta_prefix;
std::string separator;
std::string set_separator;
std::string empty_field;
std::string unset_field;
std::string meta_prefix;
int gzip_level; // level > 0 enables gzip compression
string gzip_file_extension;
std::string gzip_file_extension;
bool use_json;
bool enable_utf_8;
string json_timestamps;
std::string json_timestamps;
threading::formatter::Formatter* formatter;
bool init_options;
@ -75,4 +75,3 @@ private:
}
}