Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 17:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove 'using namespace std' from SerialTypes.h

Browse source 
This unfortunately cuases a ton of flow-down changes because a lot of other
code was depending on that definition existing. This has a fairly large chance
to break builds of external plugins, considering how many internal ones it broke.
This commit is contained in:
Tim Wojtulewicz 2020-04-07 15:45:20 -07:00
parent a525f9532e
commit d53c1454c0
119 changed files with 402 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/IPAddr.cc
View file

@ -153,7 +153,7 @@ void IPAddr::Init(const char* s)
}
}
string IPAddr::AsString() const
std::string IPAddr::AsString() const
{
if ( GetFamily() == IPv4 )
{
@ -175,7 +175,7 @@ string IPAddr::AsString() const
}
}
string IPAddr::AsHexString() const
std::string IPAddr::AsHexString() const
{
char buf[33];
@ -195,7 +195,7 @@ string IPAddr::AsHexString() const
return buf;
}
string IPAddr::PtrName() const
std::string IPAddr::PtrName() const
{
if ( GetFamily() == IPv4 )
{
@ -212,7 +212,7 @@ string IPAddr::PtrName() const
else
{
static const char hex_digit[] = "0123456789abcdef";
string ptr_name("ip6.arpa");
std::string ptr_name("ip6.arpa");
uint32_t* p = (uint32_t*) in6.s6_addr;
for ( unsigned int i = 0; i < 4; ++i )
@ -290,7 +290,7 @@ IPPrefix::IPPrefix(const IPAddr& addr, uint8_t length, bool len_is_v6_relative)
prefix.Mask(this->length);
}
string IPPrefix::AsString() const
std::string IPPrefix::AsString() const
{
char l[16];
@ -317,10 +317,10 @@ HashKey* IPPrefix::GetHashKey() const
bool IPPrefix::ConvertString(const char* text, IPPrefix* result)
{
string s(text);
std::string s(text);
size_t slash_loc = s.find('/');
if ( slash_loc == string::npos )
if ( slash_loc == std::string::npos )
return false;
auto ip_str = s.substr(0, slash_loc);