mirror of
https://github.com/mariadb-corporation/mariadb-connector-cpp.git
synced 2025-08-11 23:32:23 +00:00
Some additions to previous patch + downmerge from 1.1
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:
@ -48,13 +48,13 @@ private:
|
||||
|
||||
typedef std::map<String, bool> BoolParamsType;
|
||||
|
||||
List unnamedParams;
|
||||
TestList unnamedParams;
|
||||
|
||||
BoolParamsType defBoolValues;
|
||||
Properties defStringValues;
|
||||
BoolParamsType defBoolValues;
|
||||
TestProperties defStringValues;
|
||||
|
||||
BoolParamsType bOptions;
|
||||
Properties sOptions;
|
||||
TestProperties sOptions;
|
||||
|
||||
protected:
|
||||
|
||||
@ -66,13 +66,13 @@ public:
|
||||
|
||||
StartOptions();
|
||||
|
||||
StartOptions( const List & orderedParams
|
||||
, const Properties * defStrVals = NULL
|
||||
StartOptions( const TestList & orderedParams
|
||||
, const TestProperties * defStrVals = NULL
|
||||
, const std::map<String, bool> * defBoolVals = NULL );
|
||||
|
||||
/* Last array member must be NULL */
|
||||
StartOptions( const String::value_type * orderedParams[]
|
||||
, const Properties * defStrVals = NULL
|
||||
, const TestProperties * defStrVals = NULL
|
||||
, const std::map<String, bool> * defBoolVals = NULL );
|
||||
|
||||
bool parseParams(int paramsNumber, char** paramsValues);
|
||||
|
Reference in New Issue
Block a user