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

Merge remote-tracking branch 'origin/topic/timw/776-using-statements'

Browse source 
* origin/topic/timw/776-using-statements:
  Remove 'using namespace std' from SerialTypes.h
  Remove other using statements from headers
  GH-776: Remove using statements added by PR 770

Includes small fixes in files that changed since the merge request was
made.

Also includes a few small indentation fixes.
This commit is contained in:
Johanna Amann 2020-04-09 13:11:12 -07:00
commit 876c803d75
147 changed files with 553 additions and 579 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Func.h
View file

@ -2,13 +2,6 @@
#pragma once
#include "BroList.h"
#include "Obj.h"
#include "IntrusivePtr.h"
#include "Type.h" /* for function_flavor */
#include "TraverseTypes.h"
#include "ZeekArgs.h"
#include <utility>
#include <memory>
#include <string>
@ -19,8 +12,12 @@
#include <broker/data.hh>
#include <broker/expected.hh>
using std::string;
using std::vector;
#include "BroList.h"
#include "Obj.h"
#include "IntrusivePtr.h"
#include "Type.h" /* for function_flavor */
#include "TraverseTypes.h"
#include "ZeekArgs.h"
class Val;
class ListExpr;
@ -49,7 +46,7 @@ public:
{ return priority > other.priority; } // reverse sort
};
const vector<Body>& GetBodies() const { return bodies; }
const std::vector<Body>& GetBodies() const { return bodies; }
bool HasBodies() const { return bodies.size(); }
[[deprecated("Remove in v4.1. Use zeek::Args overload instead.")]]
@ -108,13 +105,13 @@ protected:
// Helper function for handling result of plugin hook.
std::pair<bool, Val*> HandlePluginResult(std::pair<bool, Val*> plugin_result, function_flavor flavor) const;
vector<Body> bodies;
std::vector<Body> bodies;
IntrusivePtr<Scope> scope;
Kind kind;
uint32_t unique_id;
IntrusivePtr<BroType> type;
string name;
static vector<Func*> unique_ids;
std::string name;
static std::vector<Func*> unique_ids;
};
@ -244,7 +241,7 @@ struct function_ingredients {
IntrusivePtr<Scope> scope;
};
extern vector<CallInfo> call_stack;
extern std::vector<CallInfo> call_stack;
extern std::string render_call_stack();