Skip to content

Commit cbc9c06

Browse files
committed
Merge pull request nekipelov#8 from burner/name_shadowing_fix
name shadowing fix (no bugs just less warnings)
2 parents 69c4c90 + f73307d commit cbc9c06

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/redisclient/impl/redisclientimpl.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ void RedisClientImpl::doProcessMessage(const RedisValue &v)
5656
if( result.size() == 3 )
5757
{
5858
const RedisValue &command = result[0];
59-
const RedisValue &queue = result[1];
59+
const RedisValue &queueName = result[1];
6060
const RedisValue &value = result[2];
6161

6262
const std::string &cmd = command.toString();
6363

6464
if( cmd == "message" )
6565
{
66-
SingleShotHandlersMap::iterator it = singleShotMsgHandlers.find(queue.toString());
66+
SingleShotHandlersMap::iterator it = singleShotMsgHandlers.find(queueName.toString());
6767
if( it != singleShotMsgHandlers.end() )
6868
{
6969
strand.post(boost::bind(it->second, value.toString()));
7070
singleShotMsgHandlers.erase(it);
7171
}
7272

7373
std::pair<MsgHandlersMap::iterator, MsgHandlersMap::iterator> pair =
74-
msgHandlers.equal_range(queue.toString());
75-
for(MsgHandlersMap::iterator it = pair.first; it != pair.second; ++it)
76-
strand.post(boost::bind(it->second.second, value.toString()));
74+
msgHandlers.equal_range(queueName.toString());
75+
for(MsgHandlersMap::iterator jt = pair.first; jt != pair.second; ++jt)
76+
strand.post(boost::bind(jt->second.second, value.toString()));
7777
}
7878
else if( cmd == "subscribe" && handlers.empty() == false )
7979
{

0 commit comments

Comments
 (0)