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

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

2
src/threading/Manager.h
View file

@ -59,7 +59,7 @@ public:
*/
bool Terminating() const { return terminating; }
typedef std::list<std::pair<string, MsgThread::Stats> > msg_stats_list;
typedef std::list<std::pair<std::string, MsgThread::Stats> > msg_stats_list;
/**
* Returns statistics from all current MsgThread instances.