Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 08:38:20 +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

9
src/TunnelEncapsulation.h
View file

@ -10,7 +10,6 @@
#include <vector>
using std::vector;
class Connection;
/**
@ -135,7 +134,7 @@ public:
EncapsulationStack(const EncapsulationStack& other)
{
if ( other.conns )
conns = new vector<EncapsulatingConn>(*(other.conns));
conns = new std::vector<EncapsulatingConn>(*(other.conns));
else
conns = nullptr;
}
@ -148,7 +147,7 @@ public:
delete conns;
if ( other.conns )
conns = new vector<EncapsulatingConn>(*(other.conns));
conns = new std::vector<EncapsulatingConn>(*(other.conns));
else
conns = nullptr;
@ -165,7 +164,7 @@ public:
void Add(const EncapsulatingConn& c)
{
if ( ! conns )
conns = new vector<EncapsulatingConn>();
conns = new std::vector<EncapsulatingConn>();
conns->push_back(c);
}
@ -215,5 +214,5 @@ public:
}
protected:
vector<EncapsulatingConn>* conns;
std::vector<EncapsulatingConn>* conns;
};