fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-10 12:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Added 'rpc/fixed_key.h' header.

Browse Source 
* Replaced Command with command_base.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1168 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2010-04-30 04:36:02 +00:00
parent 7dad6d34f3
commit 8b03988612
15 changed files with 307 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rpc/command_impl.h
+25 -25
View File
@@ -39,50 +39,50 @@
namespace rpc {
//template <> struct target_type_id<Command::generic_slot> { static const int value = Command::target_generic; };
template <> struct target_type_id<Command::cleaned_slot> { static const int value = Command::target_generic; };
template <> struct target_type_id<Command::any_slot> { static const int value = Command::target_any; };
template <> struct target_type_id<Command::download_slot> { static const int value = Command::target_download; };
template <> struct target_type_id<Command::peer_slot> { static const int value = Command::target_peer; };
template <> struct target_type_id<Command::tracker_slot> { static const int value = Command::target_tracker; };
template <> struct target_type_id<Command::file_slot> { static const int value = Command::target_file; };
template <> struct target_type_id<Command::file_itr_slot> { static const int value = Command::target_file_itr; };
//template <> struct target_type_id<command_base::generic_slot> { static const int value = command_base::target_generic; };
template <> struct target_type_id<command_base::cleaned_slot> { static const int value = command_base::target_generic; };
template <> struct target_type_id<command_base::any_slot> { static const int value = command_base::target_any; };
template <> struct target_type_id<command_base::download_slot> { static const int value = command_base::target_download; };
template <> struct target_type_id<command_base::peer_slot> { static const int value = command_base::target_peer; };
template <> struct target_type_id<command_base::tracker_slot> { static const int value = command_base::target_tracker; };
template <> struct target_type_id<command_base::file_slot> { static const int value = command_base::target_file; };
template <> struct target_type_id<command_base::file_itr_slot> { static const int value = command_base::target_file_itr; };
template <> struct target_type_id<Command::download_pair_slot> { static const int value = Command::target_download_pair; };
template <> struct target_type_id<command_base::download_pair_slot> { static const int value = command_base::target_download_pair; };
template <> struct target_type_id<> { static const int value = Command::target_generic; };
template <> struct target_type_id<target_type> { static const int value = Command::target_any; static const int proper_type = 1; };
template <> struct target_type_id<core::Download*> { static const int value = Command::target_download; static const int proper_type = 1; };
template <> struct target_type_id<torrent::Peer*> { static const int value = Command::target_peer; static const int proper_type = 1; };
template <> struct target_type_id<torrent::Tracker*> { static const int value = Command::target_tracker; static const int proper_type = 1; };
template <> struct target_type_id<torrent::File*> { static const int value = Command::target_file; static const int proper_type = 1; };
template <> struct target_type_id<torrent::FileListIterator*> { static const int value = Command::target_file_itr; static const int proper_type = 1; };
template <> struct target_type_id<> { static const int value = command_base::target_generic; };
template <> struct target_type_id<target_type> { static const int value = command_base::target_any; static const int proper_type = 1; };
template <> struct target_type_id<core::Download*> { static const int value = command_base::target_download; static const int proper_type = 1; };
template <> struct target_type_id<torrent::Peer*> { static const int value = command_base::target_peer; static const int proper_type = 1; };
template <> struct target_type_id<torrent::Tracker*> { static const int value = command_base::target_tracker; static const int proper_type = 1; };
template <> struct target_type_id<torrent::File*> { static const int value = command_base::target_file; static const int proper_type = 1; };
template <> struct target_type_id<torrent::FileListIterator*> { static const int value = command_base::target_file_itr; static const int proper_type = 1; };
template <> struct target_type_id<core::Download*, core::Download*> { static const int value = Command::target_download_pair; };
template <> struct target_type_id<core::Download*, core::Download*> { static const int value = command_base::target_download_pair; };
template <> inline bool
is_target_compatible<target_type>(const target_type& target) { return true; }
template <> inline bool
is_target_compatible<torrent::File*>(const target_type& target) { return target.first == Command::target_file || Command::target_file_itr; }
is_target_compatible<torrent::File*>(const target_type& target) { return target.first == command_base::target_file || command_base::target_file_itr; }
template <> inline target_type
get_target_cast<target_type>(target_type target, int type) { return target; }
template <> inline torrent::File*
get_target_cast<torrent::File*>(target_type target, int type) {
if (target.first == Command::target_file_itr)
if (target.first == command_base::target_file_itr)
return static_cast<torrent::FileListIterator*>(target.second)->file();
else
return static_cast<torrent::File*>(target.second);
}
inline torrent::Object*
Command::push_stack(const torrent::Object* first_arg, const torrent::Object* last_arg, stack_type* stack) {
command_base::push_stack(const torrent::Object* first_arg, const torrent::Object* last_arg, stack_type* stack) {
unsigned int idx = 0;
while (first_arg != last_arg && idx < Command::max_arguments) {
while (first_arg != last_arg && idx < command_base::max_arguments) {
new (&(*stack)[idx]) torrent::Object(*first_arg++);
(*stack)[idx].swap(*Command::argument(idx));
(*stack)[idx].swap(*command_base::argument(idx));
idx++;
}
@@ -91,14 +91,14 @@ Command::push_stack(const torrent::Object* first_arg, const torrent::Object* las
}
inline torrent::Object*
Command::push_stack(const torrent::Object::list_type& args, stack_type* stack) {
command_base::push_stack(const torrent::Object::list_type& args, stack_type* stack) {
return push_stack(args.data(), args.data() + args.size(), stack);
}
inline void
Command::pop_stack(stack_type* stack, torrent::Object* last_stack) {
command_base::pop_stack(stack_type* stack, torrent::Object* last_stack) {
while (last_stack-- != stack->begin()) {
last_stack->swap(*Command::argument(std::distance(stack->begin(), last_stack)));
last_stack->swap(*command_base::argument(std::distance(stack->begin(), last_stack)));
last_stack->~Object();
// To ensure we catch errors: