Merge pull request #7008

3247f11 Silence stupid warnings (Howard Chu)
This commit is contained in:
luigi1111 2020-11-29 01:57:24 -06:00
commit ad843541d5
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 3 additions and 3 deletions

View file

@ -2180,7 +2180,7 @@ namespace nodetool
const epee::net_utils::network_address na = context.m_remote_address;
std::string ip;
uint32_t ipv4_addr;
uint32_t ipv4_addr = 0;
boost::asio::ip::address_v6 ipv6_addr;
bool is_ipv4;
if (na.get_type_id() == epee::net_utils::ipv4_network_address::get_type_id())

View file

@ -221,7 +221,7 @@ namespace
void add_subscriptions(std::array<std::size_t, N>& subs, const epee::span<const context<T>> range, context<T> const* const first)
{
assert(range.size() <= N);
assert(range.begin() - first <= N - range.size());
assert((unsigned long)(range.begin() - first) <= N - range.size());
for (const auto& ctx : range)
{
@ -234,7 +234,7 @@ namespace
void remove_subscriptions(std::array<std::size_t, N>& subs, const epee::span<const context<T>> range, context<T> const* const first)
{
assert(range.size() <= N);
assert(range.begin() - first <= N - range.size());
assert((unsigned long)(range.begin() - first) <= N - range.size());
for (const auto& ctx : range)
{