diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h index c7b6e26f0..6108ba7a2 100644 --- a/Data/include/Poco/Data/AbstractSessionImpl.h +++ b/Data/include/Poco/Data/AbstractSessionImpl.h @@ -52,8 +52,8 @@ public: typedef Poco::Any (C::*PropertyGetter)(const std::string&); /// The getter method for a property. - AbstractSessionImpl(const std::string& connectionString, - std::size_t timeout = LOGIN_TIMEOUT_DEFAULT): SessionImpl(connectionString, timeout), + AbstractSessionImpl(const std::string& rConnectionString, + std::size_t timeout = LOGIN_TIMEOUT_DEFAULT): SessionImpl(rConnectionString, timeout), _storage(std::string("deque")), _bulk(false), _emptyStringIsNull(false), diff --git a/Redis/src/Client.cpp b/Redis/src/Client.cpp index 80a6c6222..e38b164f3 100644 --- a/Redis/src/Client.cpp +++ b/Redis/src/Client.cpp @@ -123,14 +123,14 @@ void Client::disconnect() _socket.close(); } -void Client::writeCommand(const Array& command, bool flush) +void Client::writeCommand(const Array& command, bool doFlush) { poco_assert(_output); std::string commandStr = command.toString(); _output->write(commandStr.c_str(), commandStr.length()); - if ( flush ) _output->flush(); + if ( doFlush ) _output->flush(); } RedisType::Ptr Client::readReply() diff --git a/Redis/src/RedisEventArgs.cpp b/Redis/src/RedisEventArgs.cpp index 4a7cd7e18..1f7979978 100644 --- a/Redis/src/RedisEventArgs.cpp +++ b/Redis/src/RedisEventArgs.cpp @@ -20,16 +20,16 @@ namespace Poco { namespace Redis { -RedisEventArgs::RedisEventArgs(RedisType::Ptr message) : - _message(message), +RedisEventArgs::RedisEventArgs(RedisType::Ptr pMessage) : + _message(pMessage), _exception(0), _stop(false) { } -RedisEventArgs::RedisEventArgs(Exception* exception) : +RedisEventArgs::RedisEventArgs(Exception* pException) : _message(), - _exception(exception ? exception->clone() : 0), + _exception(pException ? pException->clone() : 0), _stop(false) { } @@ -40,4 +40,4 @@ RedisEventArgs::~RedisEventArgs() } -}} // namespace Poco::Redis \ No newline at end of file +}} // namespace Poco::Redis