mirror/soci
1
0
Fork 0
mirror of https://github.com/SOCI/soci.git synced 2026-02-14 01:28:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add more qualifications uses of session class with namespace soci::session.

Browse Source 
This should solve compilation errors on OSX where struct session defined in
global namespace in /usr/include/sys/proc.h conflicts with unqualified uses of
soci::session.
Fixes #340
This commit is contained in:
Mateusz Loskot
2015-05-19 21:00:54 +02:00
parent 1e89d43640
commit 7d7516d417
11 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/sqlite3/test-sqlite3.cpp
View File

@@ -73,7 +73,7 @@ TEST_CASE("SQLite rowid", "[sqlite][rowid][oid]")
// BLOB test
struct blob_table_creator : public table_creator_base
{
blob_table_creator(session & sql)
blob_table_creator(soci::session & sql)
: table_creator_base(sql)
{
sql <<
@@ -128,7 +128,7 @@ TEST_CASE("SQLite blob", "[sqlite][blob]")
struct test3_table_creator : table_creator_base
{
test3_table_creator(session & sql) : table_creator_base(sql)
test3_table_creator(soci::session & sql) : table_creator_base(sql)
{
sql << "create table soci_test( id integer, name varchar, subname varchar);";
}
@@ -173,7 +173,7 @@ TEST_CASE("SQLite use and vector into", "[sqlite][use][into][vector]")
struct test4_table_creator : table_creator_base
{
test4_table_creator(session & sql) : table_creator_base(sql)
test4_table_creator(soci::session & sql) : table_creator_base(sql)
{
sql << "create table soci_test (col INTEGER PRIMARY KEY AUTOINCREMENT, name char)";
}
@@ -205,7 +205,7 @@ TEST_CASE("SQLite select from sequence", "[sqlite][sequence]")
struct longlong_table_creator : table_creator_base
{
longlong_table_creator(session & sql)
longlong_table_creator(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(val number(20))";
@@ -256,7 +256,7 @@ TEST_CASE("SQLite vector long long", "[sqlite][vector][longlong]")
struct table_creator_for_get_last_insert_id : table_creator_base
{
table_creator_for_get_last_insert_id(session & sql)
table_creator_for_get_last_insert_id(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(id integer primary key autoincrement)";
@@ -279,7 +279,7 @@ TEST_CASE("SQLite last insert id", "[sqlite][last-insert-id]")
// DDL Creation objects for common tests
struct table_creator_one : public table_creator_base
{
table_creator_one(session & sql)
table_creator_one(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(id integer, val integer, c char, "
@@ -292,7 +292,7 @@ struct table_creator_one : public table_creator_base
struct table_creator_two : public table_creator_base
{
table_creator_two(session & sql)
table_creator_two(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(num_float float, num_int integer,"
@@ -302,7 +302,7 @@ struct table_creator_two : public table_creator_base
struct table_creator_three : public table_creator_base
{
table_creator_three(session & sql)
table_creator_three(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(name varchar(100) not null, "
@@ -317,7 +317,7 @@ struct table_creator_three : public table_creator_base
// Implement get_affected_rows for SQLite3 backend
struct table_creator_for_get_affected_rows : table_creator_base
{
table_creator_for_get_affected_rows(session & sql)
table_creator_for_get_affected_rows(soci::session & sql)
: table_creator_base(sql)
{
sql << "create table soci_test(val integer)";
@@ -335,22 +335,22 @@ public:
std::string const &connectString)
: test_context_base(backEnd, connectString) {}
table_creator_base* table_creator_1(session& s) const
table_creator_base* table_creator_1(soci::session& s) const
{
return new table_creator_one(s);
}
table_creator_base* table_creator_2(session& s) const
table_creator_base* table_creator_2(soci::session& s) const
{
return new table_creator_two(s);
}
table_creator_base* table_creator_3(session& s) const
table_creator_base* table_creator_3(soci::session& s) const
{
return new table_creator_three(s);
}
table_creator_base* table_creator_4(session& s) const
table_creator_base* table_creator_4(soci::session& s) const
{
return new table_creator_for_get_affected_rows(s);
}