From 501611173e737ea268fd76bc94c5e6899af93d9f Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Fri, 28 Dec 2007 19:46:08 +0000 Subject: [PATCH] removed unused header 'packet_iterator.hpp' --- include/libtorrent/kademlia/dht_tracker.hpp | 1 - include/libtorrent/kademlia/find_data.hpp | 1 - .../libtorrent/kademlia/packet_iterator.hpp | 95 ------------------- include/libtorrent/kademlia/rpc_manager.hpp | 1 - src/kademlia/dht_tracker.cpp | 1 - src/kademlia/node.cpp | 1 - 6 files changed, 100 deletions(-) delete mode 100644 include/libtorrent/kademlia/packet_iterator.hpp diff --git a/include/libtorrent/kademlia/dht_tracker.hpp b/include/libtorrent/kademlia/dht_tracker.hpp index 21a3c2f28..db01b7b64 100644 --- a/include/libtorrent/kademlia/dht_tracker.hpp +++ b/include/libtorrent/kademlia/dht_tracker.hpp @@ -49,7 +49,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/kademlia/node.hpp" #include "libtorrent/kademlia/node_id.hpp" #include "libtorrent/kademlia/traversal_algorithm.hpp" -#include "libtorrent/kademlia/packet_iterator.hpp" #include "libtorrent/session_settings.hpp" #include "libtorrent/session_status.hpp" #include "libtorrent/udp_socket.hpp" diff --git a/include/libtorrent/kademlia/find_data.hpp b/include/libtorrent/kademlia/find_data.hpp index 17d77c9d8..39a945296 100644 --- a/include/libtorrent/kademlia/find_data.hpp +++ b/include/libtorrent/kademlia/find_data.hpp @@ -39,7 +39,6 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #include #include diff --git a/include/libtorrent/kademlia/packet_iterator.hpp b/include/libtorrent/kademlia/packet_iterator.hpp deleted file mode 100644 index e906a90bf..000000000 --- a/include/libtorrent/kademlia/packet_iterator.hpp +++ /dev/null @@ -1,95 +0,0 @@ -/* - -Copyright (c) 2006, Arvid Norberg -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution. - * Neither the name of the author nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -*/ - -#ifndef PACKET_ITERATOR_HPP -#define PACKET_ITERATOR_HPP - -#include -#include -#include - -namespace libtorrent { namespace dht -{ - -class packet_iterator: public boost::iterator_facade< - packet_iterator, const char, boost::forward_traversal_tag> -{ -public: - typedef std::vector::const_iterator base_iterator; - - packet_iterator() {} - - packet_iterator(std::vector::const_iterator start - , std::vector::const_iterator end - , std::string const& error_msg = "") - : m_base(start) - , m_end(end) - , m_msg(error_msg) - {} - - base_iterator base() const - { return m_base; } - - base_iterator end() const - { return m_end; } - - int left() const { return int(m_end - m_base); } - -private: - friend class boost::iterator_core_access; - - bool equal(packet_iterator const& other) const - { return m_base == other.m_base; } - - void advance(int n) - { - m_base += n; - } - - void increment() - { ++m_base; } - - char const& dereference() const - { - if (m_base == m_end) throw std::runtime_error(m_msg); - return *m_base; - } - - base_iterator m_base; - base_iterator m_end; - std::string m_msg; -}; - -} } // namespace libtorrent::dht - -#endif // PACKET_ITERATOR_HPP - diff --git a/include/libtorrent/kademlia/rpc_manager.hpp b/include/libtorrent/kademlia/rpc_manager.hpp index a7c47f29a..abccdc760 100644 --- a/include/libtorrent/kademlia/rpc_manager.hpp +++ b/include/libtorrent/kademlia/rpc_manager.hpp @@ -44,7 +44,6 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include #include #include diff --git a/src/kademlia/dht_tracker.cpp b/src/kademlia/dht_tracker.cpp index cdddceefe..b9d5d1cc1 100644 --- a/src/kademlia/dht_tracker.cpp +++ b/src/kademlia/dht_tracker.cpp @@ -58,7 +58,6 @@ using libtorrent::dht::node_impl; using libtorrent::dht::node_id; using libtorrent::dht::packet_t; using libtorrent::dht::msg; -using libtorrent::dht::packet_iterator; namespace messages = libtorrent::dht::messages; using namespace libtorrent::detail; diff --git a/src/kademlia/node.cpp b/src/kademlia/node.cpp index be42c8635..75e9e4bc0 100644 --- a/src/kademlia/node.cpp +++ b/src/kademlia/node.cpp @@ -43,7 +43,6 @@ POSSIBILITY OF SUCH DAMAGE. #include "libtorrent/random_sample.hpp" #include "libtorrent/kademlia/node_id.hpp" #include "libtorrent/kademlia/rpc_manager.hpp" -#include "libtorrent/kademlia/packet_iterator.hpp" #include "libtorrent/kademlia/routing_table.hpp" #include "libtorrent/kademlia/node.hpp"