diff options
Diffstat (limited to 'net/rtorrent/patches/patch-src_command__dynamic.cc')
| -rw-r--r-- | net/rtorrent/patches/patch-src_command__dynamic.cc | 130 |
1 files changed, 130 insertions, 0 deletions
diff --git a/net/rtorrent/patches/patch-src_command__dynamic.cc b/net/rtorrent/patches/patch-src_command__dynamic.cc new file mode 100644 index 00000000000..45bdeea5142 --- /dev/null +++ b/net/rtorrent/patches/patch-src_command__dynamic.cc @@ -0,0 +1,130 @@ +$NetBSD: patch-src_command__dynamic.cc,v 1.1 2013/05/09 14:28:25 joerg Exp $ + +--- src/command_dynamic.cc.orig 2013-05-03 23:01:52.000000000 +0000 ++++ src/command_dynamic.cc +@@ -43,6 +43,16 @@ + #include "command_helpers.h" + #include "rpc/parse.h" + ++#if __cplusplus >= 201103L ++#include <functional> ++using std::bind; ++#define STD_PLACEHOLDERS std::placeholders ++#else ++#include <tr1/functional> ++using std::tr1::bind; ++#define STD_PLACEHOLDERS std::tr1::placeholders ++#endif ++ + std::string + system_method_generate_command(torrent::Object::list_const_iterator first, torrent::Object::list_const_iterator last) { + std::string command; +@@ -157,15 +167,15 @@ system_method_insert_object(const torren + + rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type> + (create_new_key(rawKey), +- tr1::bind(&rpc::object_storage::call_function_str, control->object_storage(), +- rawKey, tr1::placeholders::_1, tr1::placeholders::_2), ++ bind(&rpc::object_storage::call_function_str, control->object_storage(), ++ rawKey, STD_PLACEHOLDERS::_1, STD_PLACEHOLDERS::_2), + &rpc::command_base_call<rpc::target_type>, + cmd_flags, NULL, NULL); + + } else { + rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type> + (create_new_key(rawKey), +- tr1::bind(&rpc::object_storage::get_str, control->object_storage(), rawKey), ++ bind(&rpc::object_storage::get_str, control->object_storage(), rawKey), + &rpc::command_base_call<rpc::target_type>, + cmd_flags, NULL, NULL); + } +@@ -174,7 +184,7 @@ system_method_insert_object(const torren + // if (flags & rpc::object_storage::flag_rlookup) { + // rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_string<rpc::target_type> >::type> + // (create_new_key<9>(rawKey, ".rlookup"), +- // tr1::bind(&rpc::object_storage::rlookup_obj_list, control->object_storage(), rawKey), ++ // bind(&rpc::object_storage::rlookup_obj_list, control->object_storage(), rawKey), + // &rpc::command_base_call_string<rpc::target_type>, + // cmd_flags, NULL, NULL); + // } +@@ -188,21 +198,21 @@ system_method_insert_object(const torren + case rpc::object_storage::flag_bool_type: + rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_value<rpc::target_type> >::type> + (create_new_key<5>(rawKey, ".set"), +- tr1::bind(&rpc::object_storage::set_str_bool, control->object_storage(), rawKey, tr1::placeholders::_2), ++ bind(&rpc::object_storage::set_str_bool, control->object_storage(), rawKey, STD_PLACEHOLDERS::_2), + &rpc::command_base_call_value<rpc::target_type>, + cmd_flags, NULL, NULL); + break; + case rpc::object_storage::flag_value_type: + rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_value<rpc::target_type> >::type> + (create_new_key<5>(rawKey, ".set"), +- tr1::bind(&rpc::object_storage::set_str_value, control->object_storage(), rawKey, tr1::placeholders::_2), ++ bind(&rpc::object_storage::set_str_value, control->object_storage(), rawKey, STD_PLACEHOLDERS::_2), + &rpc::command_base_call_value<rpc::target_type>, + cmd_flags, NULL, NULL); + break; + case rpc::object_storage::flag_string_type: + rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_string<rpc::target_type> >::type> + (create_new_key<5>(rawKey, ".set"), +- tr1::bind(&rpc::object_storage::set_str_string, control->object_storage(), rawKey, tr1::placeholders::_2), ++ bind(&rpc::object_storage::set_str_string, control->object_storage(), rawKey, STD_PLACEHOLDERS::_2), + &rpc::command_base_call_string<rpc::target_type>, + cmd_flags, NULL, NULL); + break; +@@ -423,36 +433,36 @@ system_method_list_keys(const torrent::O + } + + #define CMD2_METHOD_INSERT(key, flags) \ +- CMD2_ANY_LIST(key, tr1::bind(&system_method_insert_object, tr1::placeholders::_2, flags)); ++ CMD2_ANY_LIST(key, bind(&system_method_insert_object, STD_PLACEHOLDERS::_2, flags)); + + void + initialize_command_dynamic() { + CMD2_VAR_BOOL ("method.use_deprecated", true); + CMD2_VAR_VALUE ("method.use_intermediate", 1); + +- CMD2_ANY_LIST ("method.insert", tr1::bind(&system_method_insert, tr1::placeholders::_2)); +- CMD2_ANY_LIST ("method.insert.value", tr1::bind(&system_method_insert_object, tr1::placeholders::_2, rpc::object_storage::flag_value_type)); ++ CMD2_ANY_LIST ("method.insert", bind(&system_method_insert, STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_LIST ("method.insert.value", bind(&system_method_insert_object, STD_PLACEHOLDERS::_2, rpc::object_storage::flag_value_type)); + + CMD2_METHOD_INSERT("method.insert.simple", rpc::object_storage::flag_function_type); + CMD2_METHOD_INSERT("method.insert.c_simple", rpc::object_storage::flag_constant | rpc::object_storage::flag_function_type); + CMD2_METHOD_INSERT("method.insert.s_c_simple", rpc::object_storage::flag_static | + rpc::object_storage::flag_constant |rpc::object_storage::flag_function_type); + +- CMD2_ANY_STRING ("method.erase", tr1::bind(&system_method_erase, tr1::placeholders::_2)); +- CMD2_ANY_LIST ("method.redirect", tr1::bind(&system_method_redirect, tr1::placeholders::_2)); +- CMD2_ANY_STRING ("method.get", tr1::bind(&rpc::object_storage::get_str, control->object_storage(), +- tr1::placeholders::_2)); +- CMD2_ANY_LIST ("method.set", tr1::bind(&system_method_set_function, tr1::placeholders::_2)); +- +- CMD2_ANY_STRING ("method.const", tr1::bind(&rpc::object_storage::has_flag_str, control->object_storage(), +- tr1::placeholders::_2, rpc::object_storage::flag_constant)); +- CMD2_ANY_STRING_V("method.const.enable", tr1::bind(&rpc::object_storage::enable_flag_str, control->object_storage(), +- tr1::placeholders::_2, rpc::object_storage::flag_constant)); +- +- CMD2_ANY_LIST ("method.has_key", tr1::bind(&system_method_has_key, tr1::placeholders::_2)); +- CMD2_ANY_LIST ("method.set_key", tr1::bind(&system_method_set_key, tr1::placeholders::_2)); +- CMD2_ANY_STRING ("method.list_keys", tr1::bind(&system_method_list_keys, tr1::placeholders::_2)); ++ CMD2_ANY_STRING ("method.erase", bind(&system_method_erase, STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_LIST ("method.redirect", bind(&system_method_redirect, STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_STRING ("method.get", bind(&rpc::object_storage::get_str, control->object_storage(), ++ STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_LIST ("method.set", bind(&system_method_set_function, STD_PLACEHOLDERS::_2)); ++ ++ CMD2_ANY_STRING ("method.const", bind(&rpc::object_storage::has_flag_str, control->object_storage(), ++ STD_PLACEHOLDERS::_2, rpc::object_storage::flag_constant)); ++ CMD2_ANY_STRING_V("method.const.enable", bind(&rpc::object_storage::enable_flag_str, control->object_storage(), ++ STD_PLACEHOLDERS::_2, rpc::object_storage::flag_constant)); ++ ++ CMD2_ANY_LIST ("method.has_key", bind(&system_method_has_key, STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_LIST ("method.set_key", bind(&system_method_set_key, STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_STRING ("method.list_keys", bind(&system_method_list_keys, STD_PLACEHOLDERS::_2)); + +- CMD2_ANY_STRING ("method.rlookup", tr1::bind(&rpc::object_storage::rlookup_obj_list, control->object_storage(), tr1::placeholders::_2)); +- CMD2_ANY_STRING_V("method.rlookup.clear", tr1::bind(&rpc::object_storage::rlookup_clear, control->object_storage(), tr1::placeholders::_2)); ++ CMD2_ANY_STRING ("method.rlookup", bind(&rpc::object_storage::rlookup_obj_list, control->object_storage(), STD_PLACEHOLDERS::_2)); ++ CMD2_ANY_STRING_V("method.rlookup.clear", bind(&rpc::object_storage::rlookup_clear, control->object_storage(), STD_PLACEHOLDERS::_2)); + } |