diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-27 22:45:31 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-27 22:45:31 +0900 |
| commit | ae2e4cb7ffbe5d0384056cbf40f355e75f9defd7 (patch) | |
| tree | d7e4359b34c964c9c9085832dba94721d8dd35a6 /src/RpcMethod.cc | |
| parent | 8fc5cdea02afe9992acb680cf7ecce9f445fc5de (diff) | |
Handle OptionHandlers as raw pointer
Diffstat (limited to 'src/RpcMethod.cc')
| -rw-r--r-- | src/RpcMethod.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/RpcMethod.cc b/src/RpcMethod.cc index 46dba121..a06fd714 100644 --- a/src/RpcMethod.cc +++ b/src/RpcMethod.cc @@ -94,7 +94,7 @@ void gatherOption throw DL_ABORT_EX (fmt("We don't know how to deal with %s option", optionName.c_str())); } - const SharedHandle<OptionHandler>& handler = optionParser->find(pref); + const OptionHandler* handler = optionParser->find(pref); if(!handler || !pred(handler)) { // Just ignore the unacceptable options in this context. continue; @@ -123,7 +123,7 @@ void RpcMethod::gatherRequestOption(Option* option, const Dict* optionsDict) { if(optionsDict) { gatherOption(optionsDict->begin(), optionsDict->end(), - mem_fun_sh(&OptionHandler::getInitialOption), + std::mem_fun(&OptionHandler::getInitialOption), option, optionParser_); } } @@ -132,7 +132,7 @@ void RpcMethod::gatherChangeableOption(Option* option, const Dict* optionsDict) { if(optionsDict) { gatherOption(optionsDict->begin(), optionsDict->end(), - mem_fun_sh(&OptionHandler::getChangeOption), + std::mem_fun(&OptionHandler::getChangeOption), option, optionParser_); } } @@ -143,7 +143,7 @@ void RpcMethod::gatherChangeableOptionForReserved { if(optionsDict) { gatherOption(optionsDict->begin(), optionsDict->end(), - mem_fun_sh(&OptionHandler::getChangeOptionForReserved), + std::mem_fun(&OptionHandler::getChangeOptionForReserved), option, optionParser_); } } @@ -153,7 +153,7 @@ void RpcMethod::gatherChangeableGlobalOption { if(optionsDict) { gatherOption(optionsDict->begin(), optionsDict->end(), - mem_fun_sh(&OptionHandler::getChangeGlobalOption), + std::mem_fun(&OptionHandler::getChangeGlobalOption), option, optionParser_); } } |