Ticket #52477: patch-extra-clang.diff

File patch-extra-clang.diff, 23.5 KB (added by 3add3287 (3add3287), 8 years ago)

  • src/command_download.cc

    initialize_command_download() { 
    813813  CMD2_DL_V       ("d.disconnect.seeders",        tr1::bind(&torrent::ConnectionList::erase_seeders, CMD2_BIND_CL));
    814814
    815815  CMD2_DL         ("d.accepting_seeders",         CMD2_ON_INFO(is_accepting_seeders));
    816   CMD2_DL_V       ("d.accepting_seeders.enable",  tr1::bind(&torrent::DownloadInfo::public_set_flags,   CMD2_BIND_INFO, torrent::DownloadInfo::flag_accepting_seeders));
    817   CMD2_DL_V       ("d.accepting_seeders.disable", tr1::bind(&torrent::DownloadInfo::public_unset_flags, CMD2_BIND_INFO, torrent::DownloadInfo::flag_accepting_seeders));
     816  CMD2_DL_V       ("d.accepting_seeders.enable",  tr1::bind(&torrent::DownloadInfo::public_set_flags,   CMD2_BIND_INFO, (1<<4)));
     817  CMD2_DL_V       ("d.accepting_seeders.disable", tr1::bind(&torrent::DownloadInfo::public_unset_flags, CMD2_BIND_INFO, (1<<4)));
    818818
    819819  CMD2_DL         ("d.throttle_name",     tr1::bind(&download_get_variable, tr1::placeholders::_1, "rtorrent", "throttle_name"));
    820820  CMD2_DL_STRING_V("d.throttle_name.set", tr1::bind(&core::Download::set_throttle_name, tr1::placeholders::_1, std::placeholders::_2));

  • src/command_dynamic.cc

    system_method_insert_object(const torren 
    127127
    128128  torrent::Object value;
    129129
    130   switch (flags & rpc::object_storage::mask_type) {
    131   case rpc::object_storage::flag_bool_type:
    132   case rpc::object_storage::flag_value_type:
     130  switch (flags & rpc::mask_type) {
     131  case rpc::flag_bool_type:
     132  case rpc::flag_value_type:
    133133    value = itrArgs != args.end() ? rpc::convert_to_value(*itrArgs) : int64_t();
    134134    break;
    135   case rpc::object_storage::flag_string_type:
     135  case rpc::flag_string_type:
    136136    value = itrArgs != args.end() ? rpc::convert_to_string(*itrArgs) : "";
    137137    break;
    138   case rpc::object_storage::flag_function_type:
     138  case rpc::flag_function_type:
    139139    system_method_generate_command2(&value, itrArgs, args.end());
    140140    break;
    141   case rpc::object_storage::flag_multi_type:
     141  case rpc::flag_multi_type:
    142142    break;
    143143  default:
    144144    throw torrent::input_error("Invalid type.");
    … … system_method_insert_object(const torren 
    146146
    147147  int cmd_flags = 0;
    148148
    149   if (!(flags & rpc::object_storage::flag_static))
     149  if (!(flags & rpc::flag_static))
    150150    cmd_flags |= rpc::CommandMap::flag_modifiable;
    151   if (!(flags & rpc::object_storage::flag_private))
     151  if (!(flags & rpc::flag_private))
    152152    cmd_flags |= rpc::CommandMap::flag_public_xmlrpc;
    153153
    154154  control->object_storage()->insert_str(rawKey, value, flags);
    155155
    156   if ((flags & rpc::object_storage::mask_type) == rpc::object_storage::flag_function_type ||
    157       (flags & rpc::object_storage::mask_type) == rpc::object_storage::flag_multi_type) {
     156  if ((flags & rpc::mask_type) == rpc::flag_function_type ||
     157      (flags & rpc::mask_type) == rpc::flag_multi_type) {
    158158
    159159    rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call<rpc::target_type> >::type>
    160160      (create_new_key(rawKey),
    … … system_method_insert_object(const torren 
    172172  }
    173173
    174174  // Not the right argument.
    175   // if (flags & rpc::object_storage::flag_rlookup) {
     175  // if (flags & rpc::flag_rlookup) {
    176176  //   rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_string<rpc::target_type> >::type>
    177177  //     (create_new_key<9>(rawKey, ".rlookup"),
    178178  //      tr1::bind(&rpc::object_storage::rlookup_obj_list, control->object_storage(), rawKey),
    … … system_method_insert_object(const torren 
    184184
    185185//   // Ehm... no proper handling if these throw.
    186186
    187   if (!(flags & rpc::object_storage::flag_constant)) {
    188     switch (flags & rpc::object_storage::mask_type) {
    189     case rpc::object_storage::flag_bool_type:
     187  if (!(flags & rpc::flag_constant)) {
     188    switch (flags & rpc::mask_type) {
     189    case rpc::flag_bool_type:
    190190      rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_value<rpc::target_type> >::type>
    191191        (create_new_key<5>(rawKey, ".set"),
    192192         tr1::bind(&rpc::object_storage::set_str_bool, control->object_storage(), rawKey, tr1::placeholders::_2),
    193193         &rpc::command_base_call_value<rpc::target_type>,
    194194         cmd_flags, NULL, NULL);
    195195      break;
    196     case rpc::object_storage::flag_value_type:
     196    case rpc::flag_value_type:
    197197      rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_value<rpc::target_type> >::type>
    198198        (create_new_key<5>(rawKey, ".set"),
    199199         tr1::bind(&rpc::object_storage::set_str_value, control->object_storage(), rawKey, tr1::placeholders::_2),
    200200         &rpc::command_base_call_value<rpc::target_type>,
    201201         cmd_flags, NULL, NULL);
    202202      break;
    203     case rpc::object_storage::flag_string_type:
     203    case rpc::flag_string_type:
    204204      rpc::commands.insert_slot<rpc::command_base_is_type<rpc::command_base_call_string<rpc::target_type> >::type>
    205205        (create_new_key<5>(rawKey, ".set"),
    206206         tr1::bind(&rpc::object_storage::set_str_string, control->object_storage(), rawKey, tr1::placeholders::_2),
    207207         &rpc::command_base_call_string<rpc::target_type>,
    208208         cmd_flags, NULL, NULL);
    209209      break;
    210     case rpc::object_storage::flag_function_type:
    211     case rpc::object_storage::flag_multi_type:
     210    case rpc::flag_function_type:
     211    case rpc::flag_multi_type:
    212212    default: break;
    213213    }
    214214  }
    … … system_method_insert(const torrent::Obje 
    256256    new_args.push_back(rawKey);
    257257    new_args.push_back(system_method_generate_command(++itrArgs, args.end()));
    258258
    259     int new_flags = rpc::object_storage::flag_multi_type;
     259    int new_flags = rpc::flag_multi_type;
    260260
    261261    if (options.find("static") != std::string::npos)
    262       new_flags |= rpc::object_storage::flag_static;
     262      new_flags |= rpc::flag_static;
    263263    if (options.find("private") != std::string::npos)
    264       new_flags |= rpc::object_storage::flag_private;
     264      new_flags |= rpc::flag_private;
    265265    if (options.find("const") != std::string::npos)
    266       new_flags |= rpc::object_storage::flag_constant;
     266      new_flags |= rpc::flag_constant;
    267267    if (options.find("rlookup") != std::string::npos)
    268       new_flags |= rpc::object_storage::flag_rlookup;
     268      new_flags |= rpc::flag_rlookup;
    269269
    270270    return system_method_insert_object(new_args, new_flags);
    271271
    … … system_method_insert(const torrent::Obje 
    274274    new_args.push_back(rawKey);
    275275    new_args.push_back(system_method_generate_command(++itrArgs, args.end()));
    276276
    277     int new_flags = rpc::object_storage::flag_function_type;
     277    int new_flags = rpc::flag_function_type;
    278278
    279279    if (options.find("static") != std::string::npos)
    280       new_flags |= rpc::object_storage::flag_static;
     280      new_flags |= rpc::flag_static;
    281281    if (options.find("private") != std::string::npos)
    282       new_flags |= rpc::object_storage::flag_private;
     282      new_flags |= rpc::flag_private;
    283283    if (options.find("const") != std::string::npos)
    284       new_flags |= rpc::object_storage::flag_constant;
     284      new_flags |= rpc::flag_constant;
    285285
    286286    return system_method_insert_object(new_args, new_flags);
    287287
    … … system_method_insert(const torrent::Obje 
    299299    int new_flags;
    300300
    301301    if (options.find("value") != std::string::npos)
    302       new_flags = rpc::object_storage::flag_value_type;
     302      new_flags = rpc::flag_value_type;
    303303    else if (options.find("bool") != std::string::npos)
    304       new_flags = rpc::object_storage::flag_bool_type;
     304      new_flags = rpc::flag_bool_type;
    305305    else if (options.find("string") != std::string::npos)
    306       new_flags = rpc::object_storage::flag_string_type;
     306      new_flags = rpc::flag_string_type;
    307307    else if (options.find("list") != std::string::npos)
    308       new_flags = rpc::object_storage::flag_list_type;
     308      new_flags = rpc::flag_list_type;
    309309    else if (options.find("simple") != std::string::npos)
    310       new_flags = rpc::object_storage::flag_function_type;
     310      new_flags = rpc::flag_function_type;
    311311    else
    312312      throw torrent::input_error("No support for 'list' variable type.");
    313313
    314314    if (options.find("static") != std::string::npos)
    315       new_flags |= rpc::object_storage::flag_static;
     315      new_flags |= rpc::flag_static;
    316316    if (options.find("private") != std::string::npos)
    317       new_flags |= rpc::object_storage::flag_private;
     317      new_flags |= rpc::flag_private;
    318318    if (options.find("const") != std::string::npos)
    319       new_flags |= rpc::object_storage::flag_constant;
     319      new_flags |= rpc::flag_constant;
    320320
    321321    return system_method_insert_object(new_args, new_flags);
    322322
    … … system_method_set_function(const torrent 
    369369  rpc::object_storage::local_iterator itr =
    370370    control->object_storage()->find_local(torrent::raw_string::from_string(args.front().as_string()));
    371371
    372   if (itr == control->object_storage()->end(0) || itr->second.flags & rpc::object_storage::flag_constant)
     372  if (itr == control->object_storage()->end(0) || itr->second.flags & rpc::flag_constant)
    373373    throw torrent::input_error("Command is not modifiable.");   
    374374
    375375  return control->object_storage()->set_str_function(args.front().as_string(),
    … … initialize_command_dynamic() { 
    442442  CMD2_VAR_VALUE   ("method.use_intermediate", 1);
    443443
    444444  CMD2_ANY_LIST    ("method.insert",             tr1::bind(&system_method_insert, tr1::placeholders::_2));
    445   CMD2_ANY_LIST    ("method.insert.value",       tr1::bind(&system_method_insert_object, tr1::placeholders::_2, rpc::object_storage::flag_value_type));
     445  CMD2_ANY_LIST    ("method.insert.value",       tr1::bind(&system_method_insert_object, tr1::placeholders::_2, rpc::flag_value_type));
    446446
    447   CMD2_METHOD_INSERT("method.insert.simple",     rpc::object_storage::flag_function_type);
    448   CMD2_METHOD_INSERT("method.insert.c_simple",   rpc::object_storage::flag_constant | rpc::object_storage::flag_function_type);
    449   CMD2_METHOD_INSERT("method.insert.s_c_simple", rpc::object_storage::flag_static |
    450                      rpc::object_storage::flag_constant |rpc::object_storage::flag_function_type);
     447  CMD2_METHOD_INSERT("method.insert.simple",     rpc::flag_function_type);
     448  CMD2_METHOD_INSERT("method.insert.c_simple",   rpc::flag_constant | rpc::flag_function_type);
     449  CMD2_METHOD_INSERT("method.insert.s_c_simple", rpc::flag_static |
     450                     rpc::flag_constant |rpc::flag_function_type);
    451451
    452452  CMD2_ANY_STRING  ("method.erase",     tr1::bind(&system_method_erase, tr1::placeholders::_2));
    453453  CMD2_ANY_LIST    ("method.redirect",  tr1::bind(&system_method_redirect, tr1::placeholders::_2));
    … … initialize_command_dynamic() { 
    456456  CMD2_ANY_LIST    ("method.set",       tr1::bind(&system_method_set_function, tr1::placeholders::_2));
    457457
    458458  CMD2_ANY_STRING  ("method.const",        tr1::bind(&rpc::object_storage::has_flag_str, control->object_storage(),
    459                                                       tr1::placeholders::_2, rpc::object_storage::flag_constant));
     459                                                      tr1::placeholders::_2, rpc::flag_constant));
    460460  CMD2_ANY_STRING_V("method.const.enable", tr1::bind(&rpc::object_storage::enable_flag_str, control->object_storage(),
    461                                                      tr1::placeholders::_2, rpc::object_storage::flag_constant));
     461                                                     tr1::placeholders::_2, rpc::flag_constant));
    462462
    463463  CMD2_ANY_LIST    ("method.has_key",   tr1::bind(&system_method_has_key, tr1::placeholders::_2));
    464464  CMD2_ANY_LIST    ("method.set_key",   tr1::bind(&system_method_set_key, tr1::placeholders::_2));

  • src/command_events.cc

    initialize_command_events() { 
    321321  CMD2_ANY_STRING_V("import",          tr1::bind(&apply_import, tr1::placeholders::_2));
    322322  CMD2_ANY_STRING_V("try_import",      tr1::bind(&apply_try_import, tr1::placeholders::_2));
    323323
    324   CMD2_ANY_LIST    ("load.normal",        tr1::bind(&apply_load, tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_tied));
    325   CMD2_ANY_LIST    ("load.verbose",       tr1::bind(&apply_load, tr1::placeholders::_2, core::Manager::create_tied));
     324  CMD2_ANY_LIST    ("load.normal",        tr1::bind(&apply_load, tr1::placeholders::_2, core::create_quiet | core::create_tied));
     325  CMD2_ANY_LIST    ("load.verbose",       tr1::bind(&apply_load, tr1::placeholders::_2, core::create_tied));
    326326  CMD2_ANY_LIST    ("load.start",         tr1::bind(&apply_load, tr1::placeholders::_2,
    327                                                          core::Manager::create_quiet | core::Manager::create_tied | core::Manager::create_start));
    328   CMD2_ANY_LIST    ("load.start_verbose", tr1::bind(&apply_load, tr1::placeholders::_2, core::Manager::create_tied  | core::Manager::create_start));
    329   CMD2_ANY_LIST    ("load.raw",           tr1::bind(&apply_load, tr1::placeholders::_2, core::Manager::create_quiet | core::Manager::create_raw_data));
    330   CMD2_ANY_LIST    ("load.raw_verbose",   tr1::bind(&apply_load, tr1::placeholders::_2, core::Manager::create_raw_data));
     327                                                         core::create_quiet | core::create_tied | core::create_start));
     328  CMD2_ANY_LIST    ("load.start_verbose", tr1::bind(&apply_load, tr1::placeholders::_2, core::create_tied  | core::create_start));
     329  CMD2_ANY_LIST    ("load.raw",           tr1::bind(&apply_load, tr1::placeholders::_2, core::create_quiet | core::create_raw_data));
     330  CMD2_ANY_LIST    ("load.raw_verbose",   tr1::bind(&apply_load, tr1::placeholders::_2, core::create_raw_data));
    331331  CMD2_ANY_LIST    ("load.raw_start",     tr1::bind(&apply_load, tr1::placeholders::_2,
    332                                                          core::Manager::create_quiet | core::Manager::create_start | core::Manager::create_raw_data));
     332                                                         core::create_quiet | core::create_start | core::create_raw_data));
    333333
    334334  CMD2_ANY_VALUE   ("close_low_diskspace", tr1::bind(&apply_close_low_diskspace, tr1::placeholders::_2));
    335335

  • src/command_helpers.h

    void initialize_commands(); 
    9898#define CMD2_TRACKER_VALUE_V(key, slot) CMD2_A_FUNCTION(key, command_base_call_value<torrent::Tracker*>, object_convert_void(slot), "i:i", "")
    9999
    100100#define CMD2_VAR_BOOL(key, value)                                       \
    101   control->object_storage()->insert_c_str(key, int64_t(value), rpc::object_storage::flag_bool_type); \
     101  control->object_storage()->insert_c_str(key, int64_t(value), rpc::flag_bool_type); \
    102102  CMD2_ANY(key, tr1::bind(&rpc::object_storage::get, control->object_storage(), \
    103103                               torrent::raw_string::from_c_str(key)));  \
    104104  CMD2_ANY_VALUE(key ".set", tr1::bind(&rpc::object_storage::set_bool, control->object_storage(), \
    105105                                            torrent::raw_string::from_c_str(key), tr1::placeholders::_2));
    106106
    107107#define CMD2_VAR_VALUE(key, value)                                      \
    108   control->object_storage()->insert_c_str(key, int64_t(value), rpc::object_storage::flag_value_type); \
     108  control->object_storage()->insert_c_str(key, int64_t(value), rpc::flag_value_type); \
    109109  CMD2_ANY(key, tr1::bind(&rpc::object_storage::get, control->object_storage(), \
    110110                               torrent::raw_string::from_c_str(key)));  \
    111111  CMD2_ANY_VALUE(key ".set", tr1::bind(&rpc::object_storage::set_value, control->object_storage(), \
    112112                                            torrent::raw_string::from_c_str(key), tr1::placeholders::_2));
    113113
    114114#define CMD2_VAR_STRING(key, value)                                     \
    115   control->object_storage()->insert_c_str(key, value, rpc::object_storage::flag_string_type); \
     115  control->object_storage()->insert_c_str(key, value, rpc::flag_string_type); \
    116116  CMD2_ANY(key, tr1::bind(&rpc::object_storage::get, control->object_storage(), \
    117117                               torrent::raw_string::from_c_str(key)));  \
    118118  CMD2_ANY_STRING(key ".set", tr1::bind(&rpc::object_storage::set_string, control->object_storage(), \
    … … void initialize_commands(); 
    120120
    121121
    122122#define CMD2_VAR_C_STRING(key, value)                                   \
    123   control->object_storage()->insert_c_str(key, value, rpc::object_storage::flag_string_type); \
     123  control->object_storage()->insert_c_str(key, value, rpc::flag_string_type); \
    124124  CMD2_ANY(key, tr1::bind(&rpc::object_storage::get, control->object_storage(), \
    125125                               torrent::raw_string::from_c_str(key)));
    126126
    127127#define CMD2_VAR_LIST(key)                                              \
    128   control->object_storage()->insert_c_str(key, torrent::Object::create_list(), rpc::object_storage::flag_list_type); \
     128  control->object_storage()->insert_c_str(key, torrent::Object::create_list(), rpc::flag_list_type); \
    129129  CMD2_ANY(key, tr1::bind(&rpc::object_storage::get, control->object_storage(), \
    130130                               torrent::raw_string::from_c_str(key)));  \
    131131  CMD2_ANY_LIST(key ".set", tr1::bind(&rpc::object_storage::set_list, control->object_storage(), \

  • src/command_local.cc

    initialize_command_local() { 
    401401#define CMD2_EXECUTE(key, flags)                                         \
    402402  CMD2_ANY(key, tr1::bind(&rpc::ExecFile::execute_object, &rpc::execFile, tr1::placeholders::_2, flags));
    403403
    404   CMD2_EXECUTE     ("execute2",                rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_throw);
    405   CMD2_EXECUTE     ("execute.throw",           rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_throw);
    406   CMD2_EXECUTE     ("execute.throw.bg",        rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_throw | rpc::ExecFile::flag_background);
    407   CMD2_EXECUTE     ("execute.nothrow",         rpc::ExecFile::flag_expand_tilde);
    408   CMD2_EXECUTE     ("execute.nothrow.bg",      rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_background);
    409   CMD2_EXECUTE     ("execute.raw",             rpc::ExecFile::flag_throw);
    410   CMD2_EXECUTE     ("execute.raw.bg",          rpc::ExecFile::flag_throw | rpc::ExecFile::flag_background);
     404  CMD2_EXECUTE     ("execute2",                rpc::flag_expand_tilde | rpc::flag_throw);
     405  CMD2_EXECUTE     ("execute.throw",           rpc::flag_expand_tilde | rpc::flag_throw);
     406  CMD2_EXECUTE     ("execute.throw.bg",        rpc::flag_expand_tilde | rpc::flag_throw | rpc::flag_background);
     407  CMD2_EXECUTE     ("execute.nothrow",         rpc::flag_expand_tilde);
     408  CMD2_EXECUTE     ("execute.nothrow.bg",      rpc::flag_expand_tilde | rpc::flag_background);
     409  CMD2_EXECUTE     ("execute.raw",             rpc::flag_throw);
     410  CMD2_EXECUTE     ("execute.raw.bg",          rpc::flag_throw | rpc::flag_background);
    411411  CMD2_EXECUTE     ("execute.raw_nothrow",     0);
    412   CMD2_EXECUTE     ("execute.raw_nothrow.bg",  rpc::ExecFile::flag_background);
    413   CMD2_EXECUTE     ("execute.capture",         rpc::ExecFile::flag_throw | rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_capture);
    414   CMD2_EXECUTE     ("execute.capture_nothrow", rpc::ExecFile::flag_expand_tilde | rpc::ExecFile::flag_capture);
     412  CMD2_EXECUTE     ("execute.raw_nothrow.bg",  rpc::flag_background);
     413  CMD2_EXECUTE     ("execute.capture",         rpc::flag_throw | rpc::flag_expand_tilde | rpc::flag_capture);
     414  CMD2_EXECUTE     ("execute.capture_nothrow", rpc::flag_expand_tilde | rpc::flag_capture);
    415415
    416416  CMD2_ANY_LIST    ("log.open_file",  tr1::bind(&apply_log_open_file, tr1::placeholders::_2));
    417417  CMD2_ANY_LIST    ("log.add_output", tr1::bind(&apply_log_add_output, tr1::placeholders::_2));

  • src/core/manager.h

    typedef std::map<std::string, torrent::T 
    6464
    6565class View;
    6666
     67static const int create_start    = 0x1;
     68static const int create_tied     = 0x2;
     69static const int create_quiet    = 0x4;
     70static const int create_raw_data = 0x8;
     71
    6772class Manager {
    6873public:
    6974  typedef DownloadList::iterator                    DListItr;
    … … public: 
    118123
    119124  void                handshake_log(const sockaddr* sa, int msg, int err, const torrent::HashString* hash);
    120125
    121   static const int create_start    = 0x1;
    122   static const int create_tied     = 0x2;
    123   static const int create_quiet    = 0x4;
    124   static const int create_raw_data = 0x8;
    125 
    126126  typedef std::vector<std::string> command_list_type;
    127127
    128128  // Temporary, find a better place for this.

  • src/rpc/exec_file.h

     
    4141
    4242namespace rpc {
    4343
     44const unsigned int max_args    = 128;
     45const unsigned int buffer_size = 4096;
     46
     47const int flag_expand_tilde = 0x1;
     48const int flag_throw        = 0x2;
     49const int flag_capture      = 0x4;
     50const int flag_background   = 0x8;
     51
    4452class ExecFile {
    4553public:
    46   static const unsigned int max_args    = 128;
    47   static const unsigned int buffer_size = 4096;
    48    
    49   static const int flag_expand_tilde = 0x1;
    50   static const int flag_throw        = 0x2;
    51   static const int flag_capture      = 0x4;
    52   static const int flag_background   = 0x8;
    5354
    5455  ExecFile() : m_logFd(-1) {}
    5556

  • src/rpc/object_storage.h

    struct object_storage_node { 
    5858
    5959typedef std::unordered_map<fixed_key_type<64>, object_storage_node, hash_fixed_key_type> object_storage_base_type;
    6060
     61static const unsigned int flag_generic_type  = 0x1;
     62static const unsigned int flag_bool_type     = 0x2;
     63static const unsigned int flag_value_type    = 0x3;
     64static const unsigned int flag_string_type   = 0x4;
     65static const unsigned int flag_list_type     = 0x5;
     66static const unsigned int flag_function_type = 0x6;
     67static const unsigned int flag_multi_type    = 0x7;
     68
     69static const unsigned int mask_type          = 0xf;
     70
     71static const unsigned int flag_constant      = 0x10;
     72static const unsigned int flag_static        = 0x20;
     73static const unsigned int flag_private       = 0x40;
     74static const unsigned int flag_rlookup       = 0x80;
     75
    6176class object_storage : private object_storage_base_type {
    6277public:
    6378  // Should really change rlookup_type into a set with pair values.
    … … public: 
    90105  using base_type::find;
    91106  using base_type::erase;
    92107 
    93   static const unsigned int flag_generic_type  = 0x1;
    94   static const unsigned int flag_bool_type     = 0x2;
    95   static const unsigned int flag_value_type    = 0x3;
    96   static const unsigned int flag_string_type   = 0x4;
    97   static const unsigned int flag_list_type     = 0x5;
    98   static const unsigned int flag_function_type = 0x6;
    99   static const unsigned int flag_multi_type    = 0x7;
    100 
    101   static const unsigned int mask_type          = 0xf;
    102 
    103   static const unsigned int flag_constant      = 0x10;
    104   static const unsigned int flag_static        = 0x20;
    105   static const unsigned int flag_private       = 0x40;
    106   static const unsigned int flag_rlookup       = 0x80;
    107 
    108108  static const size_t key_size = key_type::max_size;
    109109
    110110  local_iterator find_local(const torrent::raw_string& key);

  • src/ui/download_list.cc

    DownloadList::receive_exit_input(Input t 
    304304      if (input->str().empty())
    305305        break;
    306306
    307       control->core()->try_create_download_expand(input->str(), type == INPUT_LOAD_DEFAULT ? core::Manager::create_start : 0);
     307      control->core()->try_create_download_expand(input->str(), type == INPUT_LOAD_DEFAULT ? core::create_start : 0);
    308308      break;
    309309
    310310    case INPUT_CHANGE_DIRECTORY: