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

16
src/BroString.cc
View file

@ -44,7 +44,7 @@ BroString::BroString(const char* str) : BroString()
Set(str);
}
BroString::BroString(const string &str) : BroString()
BroString::BroString(const std::string &str) : BroString()
{
Set(str);
}
@ -137,7 +137,7 @@ void BroString::Set(const char* str)
use_free_to_delete = false;
}
void BroString::Set(const string& str)
void BroString::Set(const std::string& str)
{
Reset();
@ -234,7 +234,7 @@ char* BroString::Render(int format, int* len) const
return s;
}
ostream& BroString::Render(ostream &os, int format) const
std::ostream& BroString::Render(std::ostream &os, int format) const
{
char* tmp = Render(format);
os << tmp;
@ -242,7 +242,7 @@ ostream& BroString::Render(ostream &os, int format) const
return os;
}
istream& BroString::Read(istream &is, int format)
std::istream& BroString::Read(std::istream &is, int format)
{
if ( (format & BroString::ESC_SER) )
{
@ -260,7 +260,7 @@ istream& BroString::Read(istream &is, int format)
}
else
{
string str;
std::string str;
is >> str;
Set(str);
}
@ -376,7 +376,7 @@ BroString::Vec* BroString::VecFromPolicy(VectorVal* vec)
char* BroString::VecToString(const Vec* vec)
{
string result("[");
std::string result("[");
for ( BroString::VecCIt it = vec->begin(); it != vec->end(); ++it )
{
@ -396,7 +396,7 @@ bool BroStringLenCmp::operator()(BroString * const& bst1,
(bst1->Len() > bst2->Len());
}
ostream& operator<<(ostream& os, const BroString& bs)
std::ostream& operator<<(std::ostream& os, const BroString& bs)
{
char* tmp = bs.Render(BroString::EXPANDED_STRING);
os << tmp;
@ -414,7 +414,7 @@ int Bstr_eq(const BroString* s1, const BroString* s2)
int Bstr_cmp(const BroString* s1, const BroString* s2)
{
int n = min(s1->Len(), s2->Len());
int n = std::min(s1->Len(), s2->Len());
int cmp = memcmp(s1->Bytes(), s2->Bytes(), n);
if ( cmp || s1->Len() == s2->Len() )