generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-22 08:02:06 +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
parent 2a6600ca62 75502b81b1
commit 0062b657c4
3 changed files with 9 additions and 9 deletions
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&);
/// 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),