aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-11-29 01:57:24 -0600
committerluigi1111 <luigi1111w@gmail.com>2020-11-29 01:57:24 -0600
commitad843541d526ef9216f5cfbfd7c18f859964c4d2 (patch)
tree47faf3c3142a744ebf42cdf5119bad0700b24963
parentMerge pull request #6999 (diff)
parentSilence stupid warnings (diff)
downloadmonero-ad843541d526ef9216f5cfbfd7c18f859964c4d2.tar.xz
Merge pull request #7008
3247f11 Silence stupid warnings (Howard Chu)
-rw-r--r--src/p2p/net_node.inl2
-rw-r--r--src/rpc/zmq_pub.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 73c37e284..f19865adb 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -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())
diff --git a/src/rpc/zmq_pub.cpp b/src/rpc/zmq_pub.cpp
index 0dffffac6..eac530968 100644
--- a/src/rpc/zmq_pub.cpp
+++ b/src/rpc/zmq_pub.cpp
@@ -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)
{