Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 02:58: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

8
src/Desc.cc
View file

@ -251,7 +251,7 @@ size_t ODesc::StartsWithEscapeSequence(const char* start, const char* end)
for ( it = escape_sequences.begin(); it != escape_sequences.end(); ++it )
{
const string& esc_str = *it;
const std::string& esc_str = *it;
size_t esc_len = esc_str.length();
if ( start + esc_len > end )
@ -264,9 +264,9 @@ size_t ODesc::StartsWithEscapeSequence(const char* start, const char* end)
return 0;
}
pair<const char*, size_t> ODesc::FirstEscapeLoc(const char* bytes, size_t n)
std::pair<const char*, size_t> ODesc::FirstEscapeLoc(const char* bytes, size_t n)
{
typedef pair<const char*, size_t> escape_pos;
typedef std::pair<const char*, size_t> escape_pos;
if ( IsBinary() )
return escape_pos(0, 0);
@ -327,7 +327,7 @@ void ODesc::AddBytes(const void* bytes, unsigned int n)
while ( s < e )
{
pair<const char*, size_t> p = FirstEscapeLoc(s, e - s);
std::pair<const char*, size_t> p = FirstEscapeLoc(s, e - s);
if ( p.first )
{