generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-21 08:18:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'pocoproject/develop' into CygwinOnAppVeyor

Browse Source 
Conflicts:
	Data/src/RecordSet.cpp


Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2016-03-24 10:27:12 +01:00
commit 0062b657c4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/include/Poco/Data/AbstractSessionImpl.h
View File

@ -52,8 +52,8 @@ public:
typedef Poco::Any (C::*PropertyGetter)(const std::string&); typedef Poco::Any (C::*PropertyGetter)(const std::string&);
/// The getter method for a property. /// The getter method for a property.
AbstractSessionImpl(const std::string& connectionString, AbstractSessionImpl(const std::string& rConnectionString,
std::size_t timeout = LOGIN_TIMEOUT_DEFAULT): SessionImpl(connectionString, timeout), std::size_t timeout = LOGIN_TIMEOUT_DEFAULT): SessionImpl(rConnectionString, timeout),
_storage(std::string("deque")), _storage(std::string("deque")),
_bulk(false), _bulk(false),
_emptyStringIsNull(false), _emptyStringIsNull(false),

4
Redis/src/Client.cpp
View File

@ -123,14 +123,14 @@ void Client::disconnect()
_socket.close(); _socket.close();
} }
void Client::writeCommand(const Array& command, bool flush) void Client::writeCommand(const Array& command, bool doFlush)
{ {
poco_assert(_output); poco_assert(_output);
std::string commandStr = command.toString(); std::string commandStr = command.toString();
_output->write(commandStr.c_str(), commandStr.length()); _output->write(commandStr.c_str(), commandStr.length());
if ( flush ) _output->flush(); if ( doFlush ) _output->flush();
} }
RedisType::Ptr Client::readReply() RedisType::Ptr Client::readReply()

8
Redis/src/RedisEventArgs.cpp
View File

@ -20,16 +20,16 @@
namespace Poco { namespace Poco {
namespace Redis { namespace Redis {
RedisEventArgs::RedisEventArgs(RedisType::Ptr message) : RedisEventArgs::RedisEventArgs(RedisType::Ptr pMessage) :
_message(message), _message(pMessage),
_exception(0), _exception(0),
_stop(false) _stop(false)
{ {
} }
RedisEventArgs::RedisEventArgs(Exception* exception) : RedisEventArgs::RedisEventArgs(Exception* pException) :
_message(), _message(),
_exception(exception ? exception->clone() : 0), _exception(pException ? pException->clone() : 0),
_stop(false) _stop(false)
{ {
} }