VladPolskiy/mariadb-connector-cpp
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-cpp.git synced 2025-08-11 23:32:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some additions to previous patch + downmerge from 1.1

Browse Source 
The merge was done manually copying relevant code changes from 1.1.
In particulary merged the patch for CONCPP-94
Also many changes, that fix real possible issues, that was also present in 1.0 and found while
working on 1.1. For example(but not limited to), there were many cases of incorrect
find_first_of std::string method, where find had to be really used.
This commit is contained in:
Lawrin Novitsky
2022-05-08 23:18:26 +02:00
parent aec36978c3
commit 014f4ac0be
101 changed files with 862 additions and 4496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/framework/start_options.cpp
View File

@ -68,7 +68,7 @@ namespace testsuite
/* Last orderedParams array member must be NULL */
StartOptions::StartOptions( const String::value_type * orderedParams[]
, const Properties * defStrVals
, const TestProperties * defStrVals
, const std::map<String, bool>* defBoolVals )
{
while ( *orderedParams != NULL )
@ -85,11 +85,11 @@ namespace testsuite
}
StartOptions::StartOptions( const List & orderedParams
, const Properties * defStrVals
StartOptions::StartOptions( const TestList & orderedParams
, const TestProperties * defStrVals
, const std::map<String, bool>* defBoolVals )
{
for ( List::const_iterator cit= orderedParams.begin();
for (TestList::const_iterator cit= orderedParams.begin();
cit != orderedParams.end();
++cit )
{
@ -119,11 +119,11 @@ namespace testsuite
bool StartOptions::parseParams(int paramsNumber, char** paramsValues)
{
List paramPair;
TestList paramPair;
if (paramsNumber > 1)
{
List::const_iterator curParam= unnamedParams.begin();
TestList::const_iterator curParam= unnamedParams.begin();
while (--paramsNumber)
{
@ -197,7 +197,7 @@ namespace testsuite
{
static String empty;
Properties::const_iterator cit= defStringValues.find( name );
TestProperties::const_iterator cit= defStringValues.find( name );
if ( cit != defStringValues.end() )
return cit->second;
@ -208,7 +208,7 @@ namespace testsuite
const String & StartOptions::getString( const String & param) const
{
Properties::const_iterator cit= sOptions.find( param );
TestProperties::const_iterator cit= sOptions.find( param );
if ( cit != sOptions.end() )
return cit->second;