0
0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00

Minor cleanup

This commit is contained in:
rbock 2014-08-27 20:26:01 +02:00
parent 3dfed5b85c
commit a514e6bf5e
3 changed files with 10 additions and 10 deletions

View File

@ -62,7 +62,7 @@ namespace sqlpp
using _column_t = Column; using _column_t = Column;
static constexpr bool _trivial_value_is_null = trivial_value_is_null_t<Column>::value; static constexpr bool _trivial_value_is_null = trivial_value_is_null_t<Column>::value;
using _pure_value_t = typename value_type_of<Column>::_cpp_value_type; using _pure_value_t = typename value_type_of<Column>::_cpp_value_type;
using _wrapped_value_t = typename wrap_operand<_pure_value_t>::type; using _wrapped_value_t = wrap_operand_t<_pure_value_t>;
using _tvin_t = tvin_t<_wrapped_value_t>; using _tvin_t = tvin_t<_wrapped_value_t>;
insert_value_t(rhs_wrap_t<_wrapped_value_t, _trivial_value_is_null> rhs): insert_value_t(rhs_wrap_t<_wrapped_value_t, _trivial_value_is_null> rhs):

View File

@ -105,7 +105,7 @@ namespace sqlpp
template<typename Limit> template<typename Limit>
dynamic_limit_data_t(Limit value): dynamic_limit_data_t(Limit value):
_initialized(true), _initialized(true),
_value(typename wrap_operand<Limit>::type(value)) _value(wrap_operand_t<Limit>(value))
{ {
} }
@ -137,7 +137,7 @@ namespace sqlpp
void set(Limit value) void set(Limit value)
{ {
// FIXME: Make sure that Limit does not require external tables? Need to read up on SQL // FIXME: Make sure that Limit does not require external tables? Need to read up on SQL
using arg_t = typename wrap_operand<Limit>::type; using arg_t = wrap_operand_t<Limit>;
_data._value = arg_t{value}; _data._value = arg_t{value};
_data._initialized = true; _data._initialized = true;
} }
@ -213,9 +213,9 @@ namespace sqlpp
template<typename Arg> template<typename Arg>
auto limit(Arg arg) const auto limit(Arg arg) const
-> _new_statement_t<limit_t<typename wrap_operand<Arg>::type>> -> _new_statement_t<limit_t<wrap_operand_t<Arg>>>
{ {
return { static_cast<const derived_statement_t<Policies>&>(*this), limit_data_t<typename wrap_operand<Arg>::type>{{arg}} }; return { static_cast<const derived_statement_t<Policies>&>(*this), limit_data_t<wrap_operand_t<Arg>>{{arg}} };
} }
auto dynamic_limit() const auto dynamic_limit() const

View File

@ -105,7 +105,7 @@ namespace sqlpp
template<typename Offset> template<typename Offset>
dynamic_offset_data_t(Offset value): dynamic_offset_data_t(Offset value):
_initialized(true), _initialized(true),
_value(typename wrap_operand<Offset>::type(value)) _value(wrap_operand_t<Offset>(value))
{ {
} }
@ -137,7 +137,7 @@ namespace sqlpp
void set(Offset value) void set(Offset value)
{ {
// FIXME: Make sure that Offset does not require external tables? Need to read up on SQL // FIXME: Make sure that Offset does not require external tables? Need to read up on SQL
using arg_t = typename wrap_operand<Offset>::type; using arg_t = wrap_operand_t<Offset>;
_data._value = arg_t{value}; _data._value = arg_t{value};
_data._initialized = true; _data._initialized = true;
} }
@ -171,7 +171,7 @@ namespace sqlpp
void set_offset(Offset value) void set_offset(Offset value)
{ {
// FIXME: Make sure that Offset does not require external tables? Need to read up on SQL // FIXME: Make sure that Offset does not require external tables? Need to read up on SQL
using arg_t = typename wrap_operand<Offset>::type; using arg_t = wrap_operand_t<Offset>;
static_cast<derived_statement_t<Policies>*>(this)->_offset()._value = arg_t{value}; static_cast<derived_statement_t<Policies>*>(this)->_offset()._value = arg_t{value};
static_cast<derived_statement_t<Policies>*>(this)->_offset()._initialized = true; static_cast<derived_statement_t<Policies>*>(this)->_offset()._initialized = true;
} }
@ -224,9 +224,9 @@ namespace sqlpp
template<typename Arg> template<typename Arg>
auto offset(Arg arg) const auto offset(Arg arg) const
-> _new_statement_t<offset_t<typename wrap_operand<Arg>::type>> -> _new_statement_t<offset_t<wrap_operand_t<Arg>>>
{ {
return { static_cast<const derived_statement_t<Policies>&>(*this), offset_data_t<typename wrap_operand<Arg>::type>{{arg}} }; return { static_cast<const derived_statement_t<Policies>&>(*this), offset_data_t<wrap_operand_t<Arg>>{{arg}} };
} }
auto dynamic_offset() const auto dynamic_offset() const