From 5aa875c2af1dcac80d22a0e7d425a50f69cb49b8 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 24 Sep 2006 11:32:08 +0000 Subject: [PATCH] fixed some warnings --- src/ip_filter.cpp | 6 ++---- src/kademlia/node.cpp | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ip_filter.cpp b/src/ip_filter.cpp index 38d92a7b1..0afb5a346 100644 --- a/src/ip_filter.cpp +++ b/src/ip_filter.cpp @@ -57,10 +57,8 @@ namespace libtorrent { if (addr.is_v4()) return m_filter4.access(addr.to_v4()); - else if (addr.is_v6()) - return m_filter6.access(addr.to_v6()); - else - assert(false); + assert(addr.is_v6()); + return m_filter6.access(addr.to_v6()); } ip_filter::filter_tuple_t ip_filter::export_filter() const diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp index 17e1d4789..46e5708ec 100644 --- a/src/kademlia/node.cpp +++ b/src/kademlia/node.cpp @@ -236,8 +236,7 @@ void node_impl::refresh_bucket(int bucket) target[(num_bits - 1) / 8] |= (~(m_id[(num_bits - 1) / 8])) & (0x80 >> ((num_bits - 1) % 8)); - int new_bucket = distance_exp(m_id, target); - assert(new_bucket == bucket); + assert(distance_exp(m_id, target) == bucket); std::vector start; start.reserve(m_table.bucket_size());