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

GH-776: Remove using statements added by PR 770

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-04-07 13:08:20 -07:00
parent 08fbdb1418
commit eb010290eb
4 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Anon.h
View file

@ -13,8 +13,6 @@
#include <vector> #include <vector>
#include <map> #include <map>
using std::map;
// TODO: Anon.h may not be the right place to put these functions ... // TODO: Anon.h may not be the right place to put these functions ...
enum ip_addr_anonymization_class_t { enum ip_addr_anonymization_class_t {
@ -51,7 +49,7 @@ public:
bool PreserveNet(ipaddr32_t input); bool PreserveNet(ipaddr32_t input);
protected: protected:
map<ipaddr32_t, ipaddr32_t> mapping; std::map<ipaddr32_t, ipaddr32_t> mapping;
}; };
class AnonymizeIPAddr_Seq : public AnonymizeIPAddr { class AnonymizeIPAddr_Seq : public AnonymizeIPAddr {

10
src/Base64.h
View file

@ -2,8 +2,6 @@
#include <string> #include <string>
using std::string;
class BroString; class BroString;
class Connection; class Connection;
@ -15,7 +13,7 @@ public:
// encode_base64()), encoding-errors will go to Reporter instead of // encode_base64()), encoding-errors will go to Reporter instead of
// Weird. Usage errors go to Reporter in any case. Empty alphabet // Weird. Usage errors go to Reporter in any case. Empty alphabet
// indicates the default base64 alphabet. // indicates the default base64 alphabet.
explicit Base64Converter(Connection* conn, const string& alphabet = ""); explicit Base64Converter(Connection* conn, const std::string& alphabet = "");
~Base64Converter(); ~Base64Converter();
// A note on Decode(): // A note on Decode():
@ -44,10 +42,10 @@ protected:
char error_msg[256]; char error_msg[256];
protected: protected:
static const string default_alphabet; static const std::string default_alphabet;
string alphabet; std::string alphabet;
static int* InitBase64Table(const string& alphabet); static int* InitBase64Table(const std::string& alphabet);
static int default_base64_table[256]; static int default_base64_table[256];
char base64_group[4]; char base64_group[4];
int base64_group_next; int base64_group_next;

9
src/Brofiler.h
View file

@ -5,11 +5,6 @@
#include <list> #include <list>
#include <string> #include <string>
using std::list;
using std::map;
using std::pair;
using std::string;
class Stmt; class Stmt;
/** /**
@ -50,7 +45,7 @@ private:
/** /**
* The current, global Brofiler instance creates this list at parse-time. * The current, global Brofiler instance creates this list at parse-time.
*/ */
list<Stmt*> stmts; std::list<Stmt*> stmts;
/** /**
* Indicates whether new statments will not be considered as part of * Indicates whether new statments will not be considered as part of
@ -64,7 +59,7 @@ private:
* startup time and modified at shutdown time before writing back * startup time and modified at shutdown time before writing back
* to a file. * to a file.
*/ */
map<pair<string, string>, uint64_t> usage_map; std::map<std::pair<std::string, std::string>, uint64_t> usage_map;
/** /**
* The character to use to delimit Brofiler output files. Default is '\t'. * The character to use to delimit Brofiler output files. Default is '\t'.

10
src/DbgBreakpoint.h
View file

@ -4,8 +4,6 @@
#include <string> #include <string>
using std::string;
struct ParseLocationRec; struct ParseLocationRec;
class Stmt; class Stmt;
@ -40,8 +38,8 @@ public:
BreakCode ShouldBreak(Stmt* s); BreakCode ShouldBreak(Stmt* s);
BreakCode ShouldBreak(double t); BreakCode ShouldBreak(double t);
const string& GetCondition() const { return condition; } const std::string& GetCondition() const { return condition; }
bool SetCondition(const string& new_condition); bool SetCondition(const std::string& new_condition);
int GetRepeatCount() const { return repeat_count; } int GetRepeatCount() const { return repeat_count; }
bool SetRepeatCount(int count); // implements function of ignore command in gdb bool SetRepeatCount(int count); // implements function of ignore command in gdb
@ -68,7 +66,7 @@ protected:
int BPID; int BPID;
char description[512]; char description[512];
string function_name; // location std::string function_name; // location
const char* source_filename; const char* source_filename;
int source_line; int source_line;
@ -79,5 +77,5 @@ protected:
int repeat_count; // if positive, break after this many hits int repeat_count; // if positive, break after this many hits
int hit_count; // how many times it's been hit (w/o breaking) int hit_count; // how many times it's been hit (w/o breaking)
string condition; // condition to evaluate; nil for none std::string condition; // condition to evaluate; nil for none
}; };