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

6
src/SerializationFormat.cc
View file

@ -219,7 +219,7 @@ bool BinarySerializationFormat::Read(char** str, int* len, const char* tag)
return true;
}
bool BinarySerializationFormat::Read(string* v, const char* tag)
bool BinarySerializationFormat::Read(std::string* v, const char* tag)
{
char* buffer;
int len;
@ -227,7 +227,7 @@ bool BinarySerializationFormat::Read(string* v, const char* tag)
if ( ! Read(&buffer, &len, tag) )
return false;
*v = string(buffer, len);
*v = std::string(buffer, len);
delete [] buffer;
return true;
@ -362,7 +362,7 @@ bool BinarySerializationFormat::Write(const char* s, const char* tag)
return Write(s, strlen(s), tag);
}
bool BinarySerializationFormat::Write(const string& s, const char* tag)
bool BinarySerializationFormat::Write(const std::string& s, const char* tag)
{
return Write(s.data(), s.size(), tag);
}