net: remove CNetAddr::ToString() and use ToStringAddr() instead

Both methods do the same thing, so simplify to having just one.

Further, `CService` inherits `CNetAddr` and `CService::ToString()`
overrides `CNetAddr::ToString()` but the latter is not virtual which
may be confusing. Avoid such a confusion by not having non-virtual
methods with the same names in inheritance.
This commit is contained in:
Vasil Dimov
2022-07-15 13:49:17 +02:00
parent 043b9de59a
commit 944a9de08a
9 changed files with 26 additions and 33 deletions

View File

@@ -622,11 +622,6 @@ std::string CNetAddr::ToStringAddr() const
assert(false);
}
std::string CNetAddr::ToString() const
{
return ToStringAddr();
}
bool operator==(const CNetAddr& a, const CNetAddr& b)
{
return a.m_net == b.m_net && a.m_addr == b.m_addr;
@@ -1098,7 +1093,7 @@ std::string CSubNet::ToString() const
break;
}
return network.ToString() + suffix;
return network.ToStringAddr() + suffix;
}
bool CSubNet::IsValid() const