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

* 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

View file

@ -4,8 +4,6 @@
#include "zeek-config.h"
#include <vector>
#include <sys/types.h> // for u_char
#include <netinet/in.h>
#include <netinet/ip.h>
@ -14,7 +12,7 @@
#include <netinet/ip6.h>
#endif
using std::vector;
#include <vector>
class IPAddr;
class RecordVal;
@ -263,7 +261,7 @@ protected:
void ProcessDstOpts(const struct ip6_dest* d, uint16_t len);
#endif
vector<IPv6_Hdr*> chain;
std::vector<IPv6_Hdr*> chain;
/**
* The summation of all header lengths in the chain in bytes.