3party/sqlpp11
0
0
Fork 0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-15 20:31:16 +08:00
Code Issues Projects Releases Wiki Activity

Fixed a bunch of shadowing warnings issued by g++

Browse Source 
A bit over the top in some places, I think
This commit is contained in:
rbock 2015-03-21 11:41:07 +01:00
parent 465a8e700c
commit cdf86695d1
26 changed files with 101 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/insert.cpp
View File

@ -27,13 +27,13 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
int main()
{
MockDb db;
test::TabPerson p;
test::TabFeature f;
int main()
{
db(insert_into(f).set(f.name = "loves c++", f.fatal = false));
//db(insert_into(f).set(f.nahme = "loves c++", f.fatal = false));

3
examples/ppgen.cpp
View File

@ -61,7 +61,8 @@ SQLPP_DECLARE_TABLE(
(fatal, bool , SQLPP_NOT_NULL )
)
int main() {
int main()
{
MockDb db;
tab_person::tab_person p;
tab_feature::tab_feature f;

4
examples/remove.cpp
View File

@ -27,13 +27,13 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
int main()
{
MockDb db;
test::TabPerson p;
test::TabFeature q;
int main()
{
db(remove_from(p)
.using_(p, q)
.where(p.feature == q.id and q.fatal == true));

4
examples/sample.cpp
View File

@ -27,13 +27,13 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
int main()
{
MockDb db;
test::TabPerson p;
test::TabFeature f;
int main()
{
db(insert_into(f).set(f.name = "Loves C++", p.fatal = false));
db(insert_into(f).set(p.name = "Roland", p.feature = 1));

8
examples/select.cpp
View File

@ -34,18 +34,18 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
SQLPP_ALIAS_PROVIDER(cheesecake)
int main()
{
static constexpr bool some_condition = true;
static constexpr bool some_other_condition = false;
SQLPP_ALIAS_PROVIDER(cheesecake)
MockDb db;
test::TabPerson p;
test::TabFeature f;
int main()
{
for (const auto& row : db(select(all_of(p)).from(p).where(p.id > 7)))
{
int64_t id = row.id;

6
examples/update.cpp
View File

@ -27,12 +27,12 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
int main()
{
MockDb db;
test::TabPerson p;
test::TabFeature q;
//test::TabFeature q;
int main()
{
db(update(p).set(p.feature = 7).where(p.id == 23));
}

8
include/sqlpp11/boolean.h
View File

@ -60,14 +60,14 @@ namespace sqlpp
_is_null(true)
{}
parameter_value_t(const _cpp_value_type& value):
_value(value),
parameter_value_t(const _cpp_value_type& val):
_value(val),
_is_null(false)
{}
parameter_value_t& operator=(const _cpp_value_type& value)
parameter_value_t& operator=(const _cpp_value_type& val)
{
_value = value;
_value = val;
_is_null = false;
return *this;
}

8
include/sqlpp11/floating_point.h
View File

@ -58,14 +58,14 @@ namespace sqlpp
_is_null(true)
{}
parameter_value_t(const _cpp_value_type& value):
_value(value),
parameter_value_t(const _cpp_value_type& val):
_value(val),
_is_null(false)
{}
parameter_value_t& operator=(const _cpp_value_type& value)
parameter_value_t& operator=(const _cpp_value_type& val)
{
_value = value;
_value = val;
_is_null = false;
return *this;
}

14
include/sqlpp11/insert_value_list.h
View File

@ -215,8 +215,8 @@ namespace sqlpp
template<typename... Columns>
struct column_list_data_t
{
column_list_data_t(Columns... columns):
_columns(simple_column_t<Columns>{columns}...)
column_list_data_t(Columns... cols):
_columns(simple_column_t<Columns>{cols}...)
{}
column_list_data_t(const column_list_data_t&) = default;
@ -370,13 +370,13 @@ namespace sqlpp
}
template<typename... Columns>
auto columns(Columns... columns) const
auto columns(Columns... cols) const
-> _new_statement_t<_column_check<Columns...>, column_list_t<Columns...>>
{
static_assert(logic::all_t<is_column_t<Columns>::value...>::value, "at least one argument is not a column in columns()");
static_assert(sizeof...(Columns), "at least one column required in columns()");
return _columns_impl(_column_check<Columns...>{}, columns...);
return _columns_impl(_column_check<Columns...>{}, cols...);
}
template<typename... Assignments>
@ -400,11 +400,11 @@ namespace sqlpp
}
private:
template<typename... Columns>
auto _columns_impl(const std::false_type&, Columns... columns) const
auto _columns_impl(const std::false_type&, Columns... cols) const
-> bad_statement;
template<typename... Columns>
auto _columns_impl(const std::true_type&, Columns... columns) const
auto _columns_impl(const std::true_type&, Columns... cols) const
-> _new_statement_t<std::true_type, column_list_t<Columns...>>
{
static_assert(not detail::has_duplicates<Columns...>::value, "at least one duplicate argument detected in columns()");
@ -414,7 +414,7 @@ namespace sqlpp
static_assert(detail::have_all_required_columns<Columns...>::value, "At least one required column is missing in columns()");
return { static_cast<const derived_statement_t<Policies>&>(*this), column_list_data_t<Columns...>{columns...} };
return { static_cast<const derived_statement_t<Policies>&>(*this), column_list_data_t<Columns...>{cols...} };
}
template<typename Database, typename... Assignments>

8
include/sqlpp11/integral.h
View File

@ -60,14 +60,14 @@ namespace sqlpp
_is_null(true)
{}
explicit parameter_value_t(const _cpp_value_type& value):
_value(value),
explicit parameter_value_t(const _cpp_value_type& val):
_value(val),
_is_null(false)
{}
parameter_value_t& operator=(const _cpp_value_type& value)
parameter_value_t& operator=(const _cpp_value_type& val)
{
_value = value;
_value = val;
_is_null = false;
return *this;
}

8
include/sqlpp11/result_row.h
View File

@ -206,9 +206,9 @@ namespace sqlpp
_is_valid(false),
_dynamic_field_names(dynamic_field_names)
{
for (auto name : _dynamic_field_names)
for (auto field_name : _dynamic_field_names)
{
_dynamic_fields.insert({name, _field_type{}});
_dynamic_fields.insert({field_name, _field_type{}});
}
}
@ -259,9 +259,9 @@ namespace sqlpp
_impl::_bind(target);
std::size_t index = _field_index_sequence::_next_index;
for (const auto& name : _dynamic_field_names)
for (const auto& field_name : _dynamic_field_names)
{
_dynamic_fields.at(name)._bind(target, index);
_dynamic_fields.at(field_name)._bind(target, index);
++index;
}
}

18
include/sqlpp11/select_flag_list.h
View File

@ -41,8 +41,8 @@ namespace sqlpp
template<typename Database, typename... Flags>
struct select_flag_list_data_t
{
select_flag_list_data_t(Flags... flags):
_flags(flags...)
select_flag_list_data_t(Flags... flgs):
_flags(flgs...)
{}
select_flag_list_data_t(const select_flag_list_data_t&) = default;
@ -167,36 +167,36 @@ namespace sqlpp
using _consistency_check = consistent_t;
template<typename... Flags>
auto flags(Flags... flags) const
auto flags(Flags... flgs) const
-> _new_statement_t<_check<Flags...>, select_flag_list_t<void, Flags...>>
{
static_assert(_check<Flags...>::value, "at least one argument is not a select flag in select flag list");
return _flags_impl<void>(_check<Flags...>{}, flags...);
return _flags_impl<void>(_check<Flags...>{}, flgs...);
}
template<typename... Flags>
auto dynamic_flags(Flags... flags) const
auto dynamic_flags(Flags... flgs) const
-> _new_statement_t<_check<Flags...>, select_flag_list_t<_database_t, Flags...>>
{
static_assert(not std::is_same<_database_t, void>::value, "dynamic_flags must not be called in a static statement");
static_assert(_check<Flags...>::value, "at least one argument is not a select flag in select flag list");
return _flags_impl<_database_t>(_check<Flags...>{}, flags...);
return _flags_impl<_database_t>(_check<Flags...>{}, flgs...);
}
private:
template<typename Database, typename... Flags>
auto _flags_impl(const std::false_type&, Flags... flags) const
auto _flags_impl(const std::false_type&, Flags... flgs) const
-> bad_statement;
template<typename Database, typename... Flags>
auto _flags_impl(const std::true_type&, Flags... flags) const
auto _flags_impl(const std::true_type&, Flags... flgs) const
-> _new_statement_t<std::true_type, select_flag_list_t<Database, Flags...>>
{
static_assert(not detail::has_duplicates<Flags...>::value, "at least one duplicate argument detected in select flag list");
return { static_cast<const derived_statement_t<Policies>&>(*this), select_flag_list_data_t<Database, Flags...>{flags...} };
return { static_cast<const derived_statement_t<Policies>&>(*this), select_flag_list_data_t<Database, Flags...>{flgs...} };
}
};

8
include/sqlpp11/text.h
View File

@ -59,14 +59,14 @@ namespace sqlpp
_is_null(true)
{}
parameter_value_t(const _cpp_value_type& value):
_value(value),
parameter_value_t(const _cpp_value_type& val):
_value(val),
_is_null(false)
{}
parameter_value_t& operator=(const _cpp_value_type& value)
parameter_value_t& operator=(const _cpp_value_type& val)
{
_value = value;
_value = val;
_is_null = false;
return *this;
}

2
tests/BooleanExpressionTest.cpp
View File

@ -28,10 +28,10 @@
#include "MockDb.h"
#include <sqlpp11/sqlpp11.h>
MockDb db = {};
int main()
{
MockDb db = {};
test::TabBar t;
auto x = boolean_expression(db, t.alpha == 7);

4
tests/CustomQueryTest.cpp
View File

@ -29,11 +29,11 @@
#include <sqlpp11/sqlpp11.h>
#include <sqlpp11/custom_query.h>
int main()
{
MockDb db = {};
MockDb::_serializer_context_t printer;
int main()
{
test::TabFoo f;
test::TabBar t;

2
tests/FunctionTest.cpp
View File

@ -32,11 +32,11 @@
#include <iostream>
MockDb db = {};
SQLPP_ALIAS_PROVIDER(kaesekuchen)
int main()
{
MockDb db = {};
test::TabFoo f;
test::TabBar t;

4
tests/InsertTest.cpp
View File

@ -30,11 +30,11 @@
#include <sqlpp11/functions.h>
#include <iostream>
MockDb db;
MockDb::_serializer_context_t printer;
int main()
{
MockDb db;
MockDb::_serializer_context_t printer;
test::TabBar t;
//test::TabFoo f;

4
tests/InterpretTest.cpp
View File

@ -29,11 +29,11 @@
#include <iostream>
int main()
{
MockDb db = {};
MockDb::_serializer_context_t printer;
int main()
{
test::TabFoo f;
test::TabBar t;

2
tests/PreparedTest.cpp
View File

@ -31,10 +31,10 @@
#include <iostream>
MockDb db = {};
int main()
{
MockDb db = {};
//test::TabFoo f;
test::TabBar t;

4
tests/RemoveTest.cpp
View File

@ -30,11 +30,11 @@
#include "is_regular.h"
int main()
{
MockDb db;
MockDb::_serializer_context_t printer;
int main()
{
test::TabBar t;
{

4
tests/ResultTest.cpp
View File

@ -32,11 +32,11 @@
static_assert(not sqlpp::enforce_null_result_treatment_t<MockDb>::value, "MockDb interprets NULL as trivial");
static_assert(sqlpp::enforce_null_result_treatment_t<EnforceDb>::value, "MockDb does not interpret NULL as trivial");
int main()
{
MockDb db = {};
EnforceDb edb {};
int main()
{
test::TabBar t;
static_assert(sqlpp::can_be_null_t<decltype(t.alpha)>::value, "t.alpha can be null");

12
tests/SelectTest.cpp
View File

@ -33,11 +33,8 @@
#include <sqlpp11/connection.h>
MockDb db = {};
MockDb::_serializer_context_t printer;
template<typename Column>
int64_t getColumn(const Column& column)
template<typename Db, typename Column>
int64_t getColumn(Db&& db, const Column& column)
{
auto result = db(select(column.as(sqlpp::alias::a)).from(column.table()).where(true));
if (not result.empty())
@ -48,10 +45,13 @@ int64_t getColumn(const Column& column)
int main()
{
MockDb db = {};
MockDb::_serializer_context_t printer;
test::TabFoo f;
test::TabBar t;
getColumn(t.alpha);
getColumn(db, t.alpha);
for (const auto& row : db(select(all_of(t)).from(t).where(true)))
{

6
tests/SelectTypeTest.cpp
View File

@ -33,9 +33,6 @@
#include <sqlpp11/connection.h>
MockDb db = {};
MockDb::_serializer_context_t printer;
namespace alias
{
SQLPP_ALIAS_PROVIDER(a)
@ -46,6 +43,9 @@ namespace alias
int main()
{
MockDb db = {};
MockDb::_serializer_context_t printer;
test::TabFoo f;
test::TabBar t;

4
tests/UnionTest.cpp
View File

@ -29,11 +29,11 @@
#include <sqlpp11/alias_provider.h>
#include <iostream>
int main()
{
MockDb db;
MockDb::_serializer_context_t printer;
int main()
{
test::TabBar t;
test::TabFoo f;

4
tests/UpdateTest.cpp
View File

@ -29,11 +29,11 @@
#include "MockDb.h"
#include "is_regular.h"
int main()
{
MockDb db;
MockDb::_serializer_context_t printer;
int main()
{
test::TabBar t;
//test::TabFoo f;

4
tests/WithTest.cpp
View File

@ -29,11 +29,11 @@
#include <sqlpp11/alias_provider.h>
#include <iostream>
int main()
{
MockDb db;
MockDb::_serializer_context_t printer;
int main()
{
const auto t = test::TabBar{};
auto x = sqlpp::cte(sqlpp::alias::x).as(select(all_of(t)).from(t));