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

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

4
src/Trigger.h
View file

@ -20,8 +20,6 @@ namespace trigger {
// Triggers are the heart of "when" statements: expressions that when
// they become true execute a body of statements.
using std::map;
class TriggerTimer;
class TriggerTraversalCallback;
@ -110,7 +108,7 @@ private:
std::vector<std::pair<BroObj *, notifier::Modifiable*>> objs;
using ValCache = map<const CallExpr*, Val*>;
using ValCache = std::map<const CallExpr*, Val*>;
ValCache cache;
};