From ac765993aa704ab6455cce19275213fdea7f6f05 Mon Sep 17 00:00:00 2001 From: rbock Date: Sun, 10 Sep 2017 14:55:11 +0200 Subject: [PATCH] Use clang-format to streamline include guards --- include/sqlpp11/aggregate_functions.h | 4 ++-- include/sqlpp11/aggregate_functions/avg.h | 4 ++-- include/sqlpp11/aggregate_functions/count.h | 4 ++-- include/sqlpp11/aggregate_functions/max.h | 4 ++-- include/sqlpp11/aggregate_functions/min.h | 4 ++-- include/sqlpp11/aggregate_functions/sum.h | 4 ++-- include/sqlpp11/alias.h | 4 ++-- include/sqlpp11/alias_operators.h | 4 ++-- include/sqlpp11/alias_provider.h | 4 ++-- include/sqlpp11/all_of.h | 4 ++-- include/sqlpp11/any.h | 4 ++-- include/sqlpp11/assignment.h | 4 ++-- include/sqlpp11/auto_alias.h | 4 ++-- include/sqlpp11/bad_expression.h | 4 ++-- include/sqlpp11/basic_expression_operators.h | 4 ++-- include/sqlpp11/boolean_expression.h | 7 +++--- include/sqlpp11/case.h | 4 ++-- include/sqlpp11/char_sequence.h | 10 ++++---- include/sqlpp11/chrono.h | 4 ++-- include/sqlpp11/column.h | 4 ++-- include/sqlpp11/column_fwd.h | 4 ++-- include/sqlpp11/connection.h | 4 ++-- include/sqlpp11/consistent.h | 4 ++-- include/sqlpp11/cte.h | 4 ++-- include/sqlpp11/custom_query.h | 4 ++-- include/sqlpp11/data_types.h | 4 ++-- include/sqlpp11/data_types/boolean.h | 4 ++-- .../data_types/boolean/column_operators.h | 4 ++-- .../sqlpp11/data_types/boolean/data_type.h | 4 ++-- .../data_types/boolean/expression_operators.h | 4 ++-- include/sqlpp11/data_types/boolean/operand.h | 4 ++-- .../data_types/boolean/parameter_value.h | 4 ++-- .../sqlpp11/data_types/boolean/result_field.h | 4 ++-- .../sqlpp11/data_types/boolean/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/column_operators.h | 4 ++-- include/sqlpp11/data_types/day_point.h | 4 ++-- .../data_types/day_point/column_operators.h | 4 ++-- .../sqlpp11/data_types/day_point/data_type.h | 4 ++-- .../day_point/expression_operators.h | 4 ++-- .../sqlpp11/data_types/day_point/operand.h | 4 ++-- .../data_types/day_point/parameter_value.h | 4 ++-- .../data_types/day_point/result_field.h | 4 ++-- .../data_types/day_point/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/floating_point.h | 4 ++-- .../floating_point/column_operators.h | 4 ++-- .../data_types/floating_point/data_type.h | 4 ++-- .../floating_point/expression_operators.h | 4 ++-- .../data_types/floating_point/operand.h | 4 ++-- .../floating_point/parameter_value.h | 4 ++-- .../data_types/floating_point/result_field.h | 4 ++-- .../data_types/floating_point/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/integral.h | 4 ++-- .../data_types/integral/column_operators.h | 4 ++-- .../sqlpp11/data_types/integral/data_type.h | 4 ++-- .../integral/expression_operators.h | 4 ++-- include/sqlpp11/data_types/integral/operand.h | 4 ++-- .../data_types/integral/parameter_value.h | 4 ++-- .../data_types/integral/result_field.h | 4 ++-- .../data_types/integral/wrap_operand.h | 8 ++++--- include/sqlpp11/data_types/no_value.h | 4 ++-- .../data_types/no_value/column_operators.h | 4 ++-- .../sqlpp11/data_types/no_value/data_type.h | 4 ++-- .../no_value/expression_operators.h | 4 ++-- include/sqlpp11/data_types/no_value/operand.h | 4 ++-- .../data_types/no_value/parameter_value.h | 4 ++-- .../data_types/no_value/result_field.h | 4 ++-- .../data_types/no_value/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/parameter_value.h | 4 ++-- .../sqlpp11/data_types/parameter_value_base.h | 4 ++-- include/sqlpp11/data_types/text.h | 4 ++-- .../data_types/text/column_operators.h | 4 ++-- include/sqlpp11/data_types/text/concat.h | 4 ++-- include/sqlpp11/data_types/text/data_type.h | 4 ++-- .../data_types/text/expression_operators.h | 4 ++-- include/sqlpp11/data_types/text/like.h | 4 ++-- include/sqlpp11/data_types/text/operand.h | 4 ++-- .../sqlpp11/data_types/text/parameter_value.h | 4 ++-- .../sqlpp11/data_types/text/result_field.h | 4 ++-- .../sqlpp11/data_types/text/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/time_of_day.h | 4 ++-- .../data_types/time_of_day/column_operators.h | 4 ++-- .../data_types/time_of_day/data_type.h | 4 ++-- .../time_of_day/expression_operators.h | 4 ++-- .../sqlpp11/data_types/time_of_day/operand.h | 4 ++-- .../data_types/time_of_day/parameter_value.h | 4 ++-- .../data_types/time_of_day/result_field.h | 4 ++-- .../data_types/time_of_day/wrap_operand.h | 4 ++-- include/sqlpp11/data_types/time_point.h | 4 ++-- .../data_types/time_point/column_operators.h | 4 ++-- .../sqlpp11/data_types/time_point/data_type.h | 4 ++-- .../time_point/expression_operators.h | 4 ++-- .../sqlpp11/data_types/time_point/operand.h | 4 ++-- .../data_types/time_point/parameter_value.h | 4 ++-- .../data_types/time_point/result_field.h | 4 ++-- .../data_types/time_point/wrap_operand.h | 4 ++-- .../sqlpp11/data_types/unsigned_integral.h | 4 ++-- .../unsigned_integral/column_operators.h | 4 ++-- .../data_types/unsigned_integral/data_type.h | 4 ++-- .../unsigned_integral/expression_operators.h | 4 ++-- .../data_types/unsigned_integral/operand.h | 4 ++-- .../unsigned_integral/parameter_value.h | 4 ++-- .../unsigned_integral/result_field.h | 4 ++-- .../unsigned_integral/wrap_operand.h | 8 ++++--- include/sqlpp11/default_value.h | 4 ++-- include/sqlpp11/detail/copy_tuple_args.h | 4 ++-- include/sqlpp11/detail/enable_if.h | 4 ++-- include/sqlpp11/detail/field_index_sequence.h | 4 ++-- include/sqlpp11/detail/get_first.h | 4 ++-- include/sqlpp11/detail/get_last.h | 4 ++-- include/sqlpp11/detail/index_sequence.h | 4 ++-- include/sqlpp11/detail/pick_arg.h | 4 ++-- include/sqlpp11/detail/sum.h | 4 ++-- include/sqlpp11/detail/type_set.h | 4 ++-- include/sqlpp11/detail/type_vector.h | 4 ++-- include/sqlpp11/detail/void.h | 4 ++-- include/sqlpp11/dynamic_join.h | 4 ++-- include/sqlpp11/dynamic_pre_join.h | 4 ++-- include/sqlpp11/dynamic_select_column_list.h | 4 ++-- include/sqlpp11/eval.h | 4 ++-- include/sqlpp11/exception.h | 4 ++-- include/sqlpp11/exists.h | 4 ++-- include/sqlpp11/expression.h | 4 ++-- include/sqlpp11/expression_fwd.h | 4 ++-- include/sqlpp11/expression_operators.h | 4 ++-- include/sqlpp11/expression_return_types.h | 4 ++-- include/sqlpp11/field_spec.h | 4 ++-- include/sqlpp11/for_update.h | 4 ++-- include/sqlpp11/from.h | 4 ++-- include/sqlpp11/functions.h | 4 ++-- include/sqlpp11/group_by.h | 4 ++-- include/sqlpp11/having.h | 4 ++-- include/sqlpp11/hidden.h | 4 ++-- include/sqlpp11/in.h | 4 ++-- include/sqlpp11/in_fwd.h | 4 ++-- include/sqlpp11/inconsistent.h | 4 ++-- include/sqlpp11/insert.h | 4 ++-- include/sqlpp11/insert_value.h | 4 ++-- include/sqlpp11/insert_value_list.h | 11 ++++----- include/sqlpp11/interpret.h | 4 ++-- include/sqlpp11/interpret_tuple.h | 10 ++++---- include/sqlpp11/interpretable.h | 4 ++-- include/sqlpp11/interpretable_list.h | 4 ++-- include/sqlpp11/interpreter.h | 4 ++-- include/sqlpp11/into.h | 4 ++-- include/sqlpp11/is_not_null.h | 4 ++-- include/sqlpp11/is_null.h | 4 ++-- include/sqlpp11/is_null_fwd.h | 4 ++-- include/sqlpp11/join.h | 4 ++-- include/sqlpp11/join_types.h | 4 ++-- include/sqlpp11/limit.h | 4 ++-- include/sqlpp11/logic.h | 4 ++-- include/sqlpp11/multi_column.h | 4 ++-- include/sqlpp11/named_interpretable.h | 4 ++-- include/sqlpp11/no_data.h | 4 ++-- include/sqlpp11/no_name.h | 4 ++-- include/sqlpp11/noop.h | 4 ++-- include/sqlpp11/not_in.h | 4 ++-- include/sqlpp11/null.h | 4 ++-- include/sqlpp11/offset.h | 4 ++-- include/sqlpp11/on.h | 4 ++-- include/sqlpp11/operand_check.h | 4 ++-- include/sqlpp11/order_by.h | 4 ++-- include/sqlpp11/parameter.h | 4 ++-- include/sqlpp11/parameter_list.h | 4 ++-- include/sqlpp11/policy_update.h | 4 ++-- include/sqlpp11/portable_static_assert.h | 4 ++-- include/sqlpp11/pre_join.h | 4 ++-- include/sqlpp11/prepared_execute.h | 4 ++-- include/sqlpp11/prepared_insert.h | 4 ++-- include/sqlpp11/prepared_remove.h | 4 ++-- include/sqlpp11/prepared_select.h | 4 ++-- include/sqlpp11/prepared_update.h | 4 ++-- include/sqlpp11/remove.h | 4 ++-- include/sqlpp11/result.h | 4 ++-- include/sqlpp11/result_field.h | 4 ++-- include/sqlpp11/result_field_base.h | 4 ++-- include/sqlpp11/result_row.h | 4 ++-- include/sqlpp11/result_row_fwd.h | 4 ++-- include/sqlpp11/rhs_wrap.h | 4 ++-- include/sqlpp11/schema.h | 4 ++-- include/sqlpp11/schema_qualified_table.h | 4 ++-- include/sqlpp11/select.h | 4 ++-- include/sqlpp11/select_column_list.h | 4 ++-- include/sqlpp11/select_flag_list.h | 4 ++-- include/sqlpp11/select_flags.h | 4 ++-- include/sqlpp11/select_pseudo_table.h | 4 ++-- include/sqlpp11/serialize.h | 4 ++-- include/sqlpp11/serializer.h | 4 ++-- include/sqlpp11/serializer_context.h | 4 ++-- include/sqlpp11/simple_column.h | 4 ++-- include/sqlpp11/single_table.h | 4 ++-- include/sqlpp11/some.h | 4 ++-- include/sqlpp11/sort_order.h | 4 ++-- include/sqlpp11/sqlpp11.h | 4 ++-- include/sqlpp11/statement.h | 4 ++-- include/sqlpp11/statement_fwd.h | 4 ++-- include/sqlpp11/table.h | 4 ++-- include/sqlpp11/table_alias.h | 4 ++-- include/sqlpp11/table_ref.h | 4 ++-- include/sqlpp11/transaction.h | 23 +++++++++++-------- include/sqlpp11/tvin.h | 4 ++-- include/sqlpp11/type_traits.h | 4 ++-- include/sqlpp11/unconditional.h | 4 ++-- include/sqlpp11/union.h | 4 ++-- include/sqlpp11/union_data.h | 4 ++-- include/sqlpp11/union_flags.h | 4 ++-- include/sqlpp11/update.h | 4 ++-- include/sqlpp11/update_list.h | 11 ++++----- include/sqlpp11/using.h | 4 ++-- include/sqlpp11/value.h | 4 ++-- include/sqlpp11/value_or_null.h | 4 ++-- include/sqlpp11/value_type.h | 4 ++-- include/sqlpp11/value_type_fwd.h | 4 ++-- include/sqlpp11/verbatim.h | 4 ++-- include/sqlpp11/verbatim_table.h | 4 ++-- include/sqlpp11/where.h | 4 ++-- include/sqlpp11/with.h | 4 ++-- include/sqlpp11/without_table_check.h | 5 ++++ include/sqlpp11/wrap_operand.h | 4 ++-- include/sqlpp11/wrong.h | 4 ++-- 220 files changed, 473 insertions(+), 464 deletions(-) diff --git a/include/sqlpp11/aggregate_functions.h b/include/sqlpp11/aggregate_functions.h index 4d250a77..d2904b96 100644 --- a/include/sqlpp11/aggregate_functions.h +++ b/include/sqlpp11/aggregate_functions.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_AGGREGATE_FUNCTIONS_H -#define SQLPP_AGGREGATE_FUNCTIONS_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_H +#define SQLPP11_AGGREGATE_FUNCTIONS_H #include #include diff --git a/include/sqlpp11/aggregate_functions/avg.h b/include/sqlpp11/aggregate_functions/avg.h index f3c273b8..b7f75feb 100644 --- a/include/sqlpp11/aggregate_functions/avg.h +++ b/include/sqlpp11/aggregate_functions/avg.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_AVG_H -#define SQLPP_AVG_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_AVG_H +#define SQLPP11_AGGREGATE_FUNCTIONS_AVG_H #include #include diff --git a/include/sqlpp11/aggregate_functions/count.h b/include/sqlpp11/aggregate_functions/count.h index 225aa6a5..8ff040e0 100644 --- a/include/sqlpp11/aggregate_functions/count.h +++ b/include/sqlpp11/aggregate_functions/count.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_COUNT_H -#define SQLPP_COUNT_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_COUNT_H +#define SQLPP11_AGGREGATE_FUNCTIONS_COUNT_H #include #include diff --git a/include/sqlpp11/aggregate_functions/max.h b/include/sqlpp11/aggregate_functions/max.h index abe29d6a..563faf25 100644 --- a/include/sqlpp11/aggregate_functions/max.h +++ b/include/sqlpp11/aggregate_functions/max.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_MAX_H -#define SQLPP_MAX_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_MAX_H +#define SQLPP11_AGGREGATE_FUNCTIONS_MAX_H #include #include diff --git a/include/sqlpp11/aggregate_functions/min.h b/include/sqlpp11/aggregate_functions/min.h index a82bf9c7..5e7795bd 100644 --- a/include/sqlpp11/aggregate_functions/min.h +++ b/include/sqlpp11/aggregate_functions/min.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_MIN_H -#define SQLPP_MIN_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_MIN_H +#define SQLPP11_AGGREGATE_FUNCTIONS_MIN_H #include #include diff --git a/include/sqlpp11/aggregate_functions/sum.h b/include/sqlpp11/aggregate_functions/sum.h index cee32aed..fe019144 100644 --- a/include/sqlpp11/aggregate_functions/sum.h +++ b/include/sqlpp11/aggregate_functions/sum.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SUM_H -#define SQLPP_SUM_H +#ifndef SQLPP11_AGGREGATE_FUNCTIONS_SUM_H +#define SQLPP11_AGGREGATE_FUNCTIONS_SUM_H #include #include diff --git a/include/sqlpp11/alias.h b/include/sqlpp11/alias.h index 0a041a9e..7f2eb254 100644 --- a/include/sqlpp11/alias.h +++ b/include/sqlpp11/alias.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ALIAS_H -#define SQLPP_ALIAS_H +#ifndef SQLPP11_ALIAS_H +#define SQLPP11_ALIAS_H #include #include diff --git a/include/sqlpp11/alias_operators.h b/include/sqlpp11/alias_operators.h index 0a03eb3f..28fec0c0 100644 --- a/include/sqlpp11/alias_operators.h +++ b/include/sqlpp11/alias_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ALIAS_OPERATORS_H -#define SQLPP_ALIAS_OPERATORS_H +#ifndef SQLPP11_ALIAS_OPERATORS_H +#define SQLPP11_ALIAS_OPERATORS_H #include diff --git a/include/sqlpp11/alias_provider.h b/include/sqlpp11/alias_provider.h index 3c1abbd4..168af8ca 100644 --- a/include/sqlpp11/alias_provider.h +++ b/include/sqlpp11/alias_provider.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ALIAS_PROVIDER_H -#define SQLPP_ALIAS_PROVIDER_H +#ifndef SQLPP11_ALIAS_PROVIDER_H +#define SQLPP11_ALIAS_PROVIDER_H #include #include diff --git a/include/sqlpp11/all_of.h b/include/sqlpp11/all_of.h index b7a2ea85..47808d20 100644 --- a/include/sqlpp11/all_of.h +++ b/include/sqlpp11/all_of.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ALL_OF_H -#define SQLPP_ALL_OF_H +#ifndef SQLPP11_ALL_OF_H +#define SQLPP11_ALL_OF_H #include #include diff --git a/include/sqlpp11/any.h b/include/sqlpp11/any.h index d3f125c2..d232b19e 100644 --- a/include/sqlpp11/any.h +++ b/include/sqlpp11/any.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ANY_H -#define SQLPP_ANY_H +#ifndef SQLPP11_ANY_H +#define SQLPP11_ANY_H #include #include diff --git a/include/sqlpp11/assignment.h b/include/sqlpp11/assignment.h index 7517f8f5..37d8959d 100644 --- a/include/sqlpp11/assignment.h +++ b/include/sqlpp11/assignment.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ASSIGNMENT_H -#define SQLPP_ASSIGNMENT_H +#ifndef SQLPP11_ASSIGNMENT_H +#define SQLPP11_ASSIGNMENT_H #include #include diff --git a/include/sqlpp11/auto_alias.h b/include/sqlpp11/auto_alias.h index 43ce044c..43caeb4e 100644 --- a/include/sqlpp11/auto_alias.h +++ b/include/sqlpp11/auto_alias.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_AUTO_ALIAS_H -#define SQLPP_AUTO_ALIAS_H +#ifndef SQLPP11_AUTO_ALIAS_H +#define SQLPP11_AUTO_ALIAS_H #include diff --git a/include/sqlpp11/bad_expression.h b/include/sqlpp11/bad_expression.h index 3aa43f0c..289d4f01 100644 --- a/include/sqlpp11/bad_expression.h +++ b/include/sqlpp11/bad_expression.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BAD_EXPRESSION_H -#define SQLPP_BAD_EXPRESSION_H +#ifndef SQLPP11_BAD_EXPRESSION_H +#define SQLPP11_BAD_EXPRESSION_H #include #include diff --git a/include/sqlpp11/basic_expression_operators.h b/include/sqlpp11/basic_expression_operators.h index ffa56525..9798dba3 100644 --- a/include/sqlpp11/basic_expression_operators.h +++ b/include/sqlpp11/basic_expression_operators.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_BASIC_EXPRESSION_OPERATORS_H -#define SQLPP_DETAIL_BASIC_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_BASIC_EXPRESSION_OPERATORS_H +#define SQLPP11_BASIC_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/boolean_expression.h b/include/sqlpp11/boolean_expression.h index a0652103..db6ebab8 100644 --- a/include/sqlpp11/boolean_expression.h +++ b/include/sqlpp11/boolean_expression.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_EXPRESSION_H -#define SQLPP_BOOLEAN_EXPRESSION_H +#ifndef SQLPP11_BOOLEAN_EXPRESSION_H +#define SQLPP11_BOOLEAN_EXPRESSION_H #include #include @@ -39,8 +39,7 @@ namespace sqlpp using _nodes = detail::type_vector<>; template - boolean_expression_t(Expr expr) - : _expr(expr) + boolean_expression_t(Expr expr) : _expr(expr) { static_assert(is_expression_t::value, "boolean_expression requires a boolean expression argument"); static_assert(is_boolean_t::value, "boolean_expression requires a boolean expression argument"); diff --git a/include/sqlpp11/case.h b/include/sqlpp11/case.h index c59ff791..cad77291 100644 --- a/include/sqlpp11/case.h +++ b/include/sqlpp11/case.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CASE_H -#define SQLPP_CASE_H +#ifndef SQLPP11_CASE_H +#define SQLPP11_CASE_H #include #include diff --git a/include/sqlpp11/char_sequence.h b/include/sqlpp11/char_sequence.h index 88920c22..9b2a8796 100644 --- a/include/sqlpp11/char_sequence.h +++ b/include/sqlpp11/char_sequence.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CHAR_SEQUENCE_H -#define SQLPP_CHAR_SEQUENCE_H +#ifndef SQLPP11_CHAR_SEQUENCE_H +#define SQLPP11_CHAR_SEQUENCE_H #include @@ -41,16 +41,16 @@ namespace sqlpp }; }; - template + template struct make_char_sequence_impl; - template + template struct make_char_sequence_impl> { using type = char_sequence; }; - template + template using make_char_sequence = typename make_char_sequence_impl>::type; } diff --git a/include/sqlpp11/chrono.h b/include/sqlpp11/chrono.h index 49ae37d8..f6f8b4f0 100644 --- a/include/sqlpp11/chrono.h +++ b/include/sqlpp11/chrono.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CHRONO_H -#define SQLPP_CHRONO_H +#ifndef SQLPP11_CHRONO_H +#define SQLPP11_CHRONO_H #include diff --git a/include/sqlpp11/column.h b/include/sqlpp11/column.h index fe22efc4..95c3ddb2 100644 --- a/include/sqlpp11/column.h +++ b/include/sqlpp11/column.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_COLUMN_H -#define SQLPP_COLUMN_H +#ifndef SQLPP11_COLUMN_H +#define SQLPP11_COLUMN_H #include #include diff --git a/include/sqlpp11/column_fwd.h b/include/sqlpp11/column_fwd.h index 6eb4415f..46dd5b8a 100644 --- a/include/sqlpp11/column_fwd.h +++ b/include/sqlpp11/column_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_COLUMN_FWD_H -#define SQLPP_COLUMN_FWD_H +#ifndef SQLPP11_COLUMN_FWD_H +#define SQLPP11_COLUMN_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/connection.h b/include/sqlpp11/connection.h index 0b55fd52..7c30ad95 100644 --- a/include/sqlpp11/connection.h +++ b/include/sqlpp11/connection.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CONNECTION_H -#define SQLPP_CONNECTION_H +#ifndef SQLPP11_CONNECTION_H +#define SQLPP11_CONNECTION_H namespace sqlpp { diff --git a/include/sqlpp11/consistent.h b/include/sqlpp11/consistent.h index f60edd0e..a49a13a5 100644 --- a/include/sqlpp11/consistent.h +++ b/include/sqlpp11/consistent.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CONSISTENT_H -#define SQLPP_CONSISTENT_H +#ifndef SQLPP11_CONSISTENT_H +#define SQLPP11_CONSISTENT_H #include diff --git a/include/sqlpp11/cte.h b/include/sqlpp11/cte.h index cc7a8827..6ed4fd87 100644 --- a/include/sqlpp11/cte.h +++ b/include/sqlpp11/cte.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CTE_H -#define SQLPP_CTE_H +#ifndef SQLPP11_CTE_H +#define SQLPP11_CTE_H #include #include diff --git a/include/sqlpp11/custom_query.h b/include/sqlpp11/custom_query.h index abaf0df9..97cdcbd6 100644 --- a/include/sqlpp11/custom_query.h +++ b/include/sqlpp11/custom_query.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CUSTOM_QUERY_H -#define SQLPP_CUSTOM_QUERY_H +#ifndef SQLPP11_CUSTOM_QUERY_H +#define SQLPP11_CUSTOM_QUERY_H #include #include diff --git a/include/sqlpp11/data_types.h b/include/sqlpp11/data_types.h index 92a9c9ae..c9776077 100644 --- a/include/sqlpp11/data_types.h +++ b/include/sqlpp11/data_types.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DATA_TYPES_H -#define SQLPP_DATA_TYPES_H +#ifndef SQLPP11_DATA_TYPES_H +#define SQLPP11_DATA_TYPES_H #include #include diff --git a/include/sqlpp11/data_types/boolean.h b/include/sqlpp11/data_types/boolean.h index cd865481..67b5aa2e 100644 --- a/include/sqlpp11/data_types/boolean.h +++ b/include/sqlpp11/data_types/boolean.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_H -#define SQLPP_BOOLEAN_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_H +#define SQLPP11_DATA_TYPES_BOOLEAN_H #include #include diff --git a/include/sqlpp11/data_types/boolean/column_operators.h b/include/sqlpp11/data_types/boolean/column_operators.h index 7ae416be..7a09d04e 100644 --- a/include/sqlpp11/data_types/boolean/column_operators.h +++ b/include/sqlpp11/data_types/boolean/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_COLUMN_OPERATORS_H -#define SQLPP_BOOLEAN_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_BOOLEAN_COLUMN_OPERATORS_H #include diff --git a/include/sqlpp11/data_types/boolean/data_type.h b/include/sqlpp11/data_types/boolean/data_type.h index 7589d829..4b445d27 100644 --- a/include/sqlpp11/data_types/boolean/data_type.h +++ b/include/sqlpp11/data_types/boolean/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_DATA_TYPE_H -#define SQLPP_BOOLEAN_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_BOOLEAN_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/boolean/expression_operators.h b/include/sqlpp11/data_types/boolean/expression_operators.h index d9de12eb..01bff9e0 100644 --- a/include/sqlpp11/data_types/boolean/expression_operators.h +++ b/include/sqlpp11/data_types/boolean/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_EXPRESSION_OPERATORS_H -#define SQLPP_BOOLEAN_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_BOOLEAN_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/boolean/operand.h b/include/sqlpp11/data_types/boolean/operand.h index 68301c6b..c5e68c01 100644 --- a/include/sqlpp11/data_types/boolean/operand.h +++ b/include/sqlpp11/data_types/boolean/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_OPERAND_H -#define SQLPP_BOOLEAN_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_OPERAND_H +#define SQLPP11_DATA_TYPES_BOOLEAN_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/boolean/parameter_value.h b/include/sqlpp11/data_types/boolean/parameter_value.h index 796ef207..c233ec25 100644 --- a/include/sqlpp11/data_types/boolean/parameter_value.h +++ b/include/sqlpp11/data_types/boolean/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_PARAMETER_VALUE_H -#define SQLPP_BOOLEAN_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_BOOLEAN_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/boolean/result_field.h b/include/sqlpp11/data_types/boolean/result_field.h index 76544e29..505ee062 100644 --- a/include/sqlpp11/data_types/boolean/result_field.h +++ b/include/sqlpp11/data_types/boolean/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_RESULT_FIELD_H -#define SQLPP_BOOLEAN_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_BOOLEAN_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/boolean/wrap_operand.h b/include/sqlpp11/data_types/boolean/wrap_operand.h index ba0ec29e..70bb44ed 100644 --- a/include/sqlpp11/data_types/boolean/wrap_operand.h +++ b/include/sqlpp11/data_types/boolean/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_BOOLEAN_WRAP_OPERAND_H -#define SQLPP_BOOLEAN_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_BOOLEAN_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_BOOLEAN_WRAP_OPERAND_H #include diff --git a/include/sqlpp11/data_types/column_operators.h b/include/sqlpp11/data_types/column_operators.h index f57511ae..cfb77dde 100644 --- a/include/sqlpp11/data_types/column_operators.h +++ b/include/sqlpp11/data_types/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_COLUMN_OPERATORS_H -#define SQLPP_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_COLUMN_OPERATORS_H #include diff --git a/include/sqlpp11/data_types/day_point.h b/include/sqlpp11/data_types/day_point.h index 5c43f96c..7818e2c6 100644 --- a/include/sqlpp11/data_types/day_point.h +++ b/include/sqlpp11/data_types/day_point.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_H -#define SQLPP_DAY_POINT_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_H +#define SQLPP11_DATA_TYPES_DAY_POINT_H #include #include diff --git a/include/sqlpp11/data_types/day_point/column_operators.h b/include/sqlpp11/data_types/day_point/column_operators.h index 540264af..42c11b2e 100644 --- a/include/sqlpp11/data_types/day_point/column_operators.h +++ b/include/sqlpp11/data_types/day_point/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_COLUMN_OPERATORS_H -#define SQLPP_DAY_POINT_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_DAY_POINT_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/day_point/data_type.h b/include/sqlpp11/data_types/day_point/data_type.h index 9be108a0..e0842bc0 100644 --- a/include/sqlpp11/data_types/day_point/data_type.h +++ b/include/sqlpp11/data_types/day_point/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_DATA_TYPE_H -#define SQLPP_DAY_POINT_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_DAY_POINT_DATA_TYPE_H #include #include diff --git a/include/sqlpp11/data_types/day_point/expression_operators.h b/include/sqlpp11/data_types/day_point/expression_operators.h index efe7adf7..4abaec98 100644 --- a/include/sqlpp11/data_types/day_point/expression_operators.h +++ b/include/sqlpp11/data_types/day_point/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_EXPRESSION_OPERATORS_H -#define SQLPP_DAY_POINT_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_DAY_POINT_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/day_point/operand.h b/include/sqlpp11/data_types/day_point/operand.h index fc8599cb..58dd86a0 100644 --- a/include/sqlpp11/data_types/day_point/operand.h +++ b/include/sqlpp11/data_types/day_point/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_OPERAND_H -#define SQLPP_DAY_POINT_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_OPERAND_H +#define SQLPP11_DATA_TYPES_DAY_POINT_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/day_point/parameter_value.h b/include/sqlpp11/data_types/day_point/parameter_value.h index 12738827..e60013c5 100644 --- a/include/sqlpp11/data_types/day_point/parameter_value.h +++ b/include/sqlpp11/data_types/day_point/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_PARAMETER_VALUE_H -#define SQLPP_DAY_POINT_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_DAY_POINT_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/day_point/result_field.h b/include/sqlpp11/data_types/day_point/result_field.h index 23f572b0..219a0844 100644 --- a/include/sqlpp11/data_types/day_point/result_field.h +++ b/include/sqlpp11/data_types/day_point/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_RESULT_FIELD_H -#define SQLPP_DAY_POINT_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_DAY_POINT_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/day_point/wrap_operand.h b/include/sqlpp11/data_types/day_point/wrap_operand.h index a695cb24..f083cde9 100644 --- a/include/sqlpp11/data_types/day_point/wrap_operand.h +++ b/include/sqlpp11/data_types/day_point/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DAY_POINT_WRAP_OPERAND_H -#define SQLPP_DAY_POINT_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_DAY_POINT_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_DAY_POINT_WRAP_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/floating_point.h b/include/sqlpp11/data_types/floating_point.h index ff9a6179..07ea8ae5 100644 --- a/include/sqlpp11/data_types/floating_point.h +++ b/include/sqlpp11/data_types/floating_point.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_H -#define SQLPP_FLOATING_POINT_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/column_operators.h b/include/sqlpp11/data_types/floating_point/column_operators.h index 6daf5131..bac7af5b 100644 --- a/include/sqlpp11/data_types/floating_point/column_operators.h +++ b/include/sqlpp11/data_types/floating_point/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_COLUMN_OPERATORS_H -#define SQLPP_FLOATING_POINT_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/data_type.h b/include/sqlpp11/data_types/floating_point/data_type.h index 6c7e6a2f..c99c4a0a 100644 --- a/include/sqlpp11/data_types/floating_point/data_type.h +++ b/include/sqlpp11/data_types/floating_point/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_DATA_TYPE_H -#define SQLPP_FLOATING_POINT_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/floating_point/expression_operators.h b/include/sqlpp11/data_types/floating_point/expression_operators.h index 371a9527..bb672cdd 100644 --- a/include/sqlpp11/data_types/floating_point/expression_operators.h +++ b/include/sqlpp11/data_types/floating_point/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_EXPRESSION_OPERATORS_H -#define SQLPP_FLOATING_POINT_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/operand.h b/include/sqlpp11/data_types/floating_point/operand.h index ed53764c..e90b13ae 100644 --- a/include/sqlpp11/data_types/floating_point/operand.h +++ b/include/sqlpp11/data_types/floating_point/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_OPERAND_H -#define SQLPP_FLOATING_POINT_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_OPERAND_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/parameter_value.h b/include/sqlpp11/data_types/floating_point/parameter_value.h index 88c2cd02..86fa39c0 100644 --- a/include/sqlpp11/data_types/floating_point/parameter_value.h +++ b/include/sqlpp11/data_types/floating_point/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_PARAMETER_VALUE_H -#define SQLPP_FLOATING_POINT_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/result_field.h b/include/sqlpp11/data_types/floating_point/result_field.h index a644b80b..0c413539 100644 --- a/include/sqlpp11/data_types/floating_point/result_field.h +++ b/include/sqlpp11/data_types/floating_point/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_RESULT_FIELD_H -#define SQLPP_FLOATING_POINT_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/floating_point/wrap_operand.h b/include/sqlpp11/data_types/floating_point/wrap_operand.h index 2c38b8ea..f8b53e40 100644 --- a/include/sqlpp11/data_types/floating_point/wrap_operand.h +++ b/include/sqlpp11/data_types/floating_point/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FLOATING_POINT_WRAP_OPERAND_H -#define SQLPP_FLOATING_POINT_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_FLOATING_POINT_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_FLOATING_POINT_WRAP_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/integral.h b/include/sqlpp11/data_types/integral.h index 3b420ff2..848df2b0 100644 --- a/include/sqlpp11/data_types/integral.h +++ b/include/sqlpp11/data_types/integral.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_H -#define SQLPP_INTEGRAL_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_H +#define SQLPP11_DATA_TYPES_INTEGRAL_H #include #include diff --git a/include/sqlpp11/data_types/integral/column_operators.h b/include/sqlpp11/data_types/integral/column_operators.h index ee271fd7..2512c925 100644 --- a/include/sqlpp11/data_types/integral/column_operators.h +++ b/include/sqlpp11/data_types/integral/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_COLUMN_OPERATORS_H -#define SQLPP_INTEGRAL_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_INTEGRAL_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/integral/data_type.h b/include/sqlpp11/data_types/integral/data_type.h index cc60e273..59993fc7 100644 --- a/include/sqlpp11/data_types/integral/data_type.h +++ b/include/sqlpp11/data_types/integral/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_DATA_TYPE_H -#define SQLPP_INTEGRAL_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_INTEGRAL_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/integral/expression_operators.h b/include/sqlpp11/data_types/integral/expression_operators.h index 71e7a876..a984447e 100644 --- a/include/sqlpp11/data_types/integral/expression_operators.h +++ b/include/sqlpp11/data_types/integral/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_EXPRESSION_OPERATORS_H -#define SQLPP_INTEGRAL_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_INTEGRAL_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/integral/operand.h b/include/sqlpp11/data_types/integral/operand.h index 4625f06b..5e8e11b3 100644 --- a/include/sqlpp11/data_types/integral/operand.h +++ b/include/sqlpp11/data_types/integral/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_OPERAND_H -#define SQLPP_INTEGRAL_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_OPERAND_H +#define SQLPP11_DATA_TYPES_INTEGRAL_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/integral/parameter_value.h b/include/sqlpp11/data_types/integral/parameter_value.h index 8c29b9fc..1f00cc40 100644 --- a/include/sqlpp11/data_types/integral/parameter_value.h +++ b/include/sqlpp11/data_types/integral/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_PARAMETER_VALUE_H -#define SQLPP_INTEGRAL_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_INTEGRAL_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/integral/result_field.h b/include/sqlpp11/data_types/integral/result_field.h index d703bb55..a9d52fb1 100644 --- a/include/sqlpp11/data_types/integral/result_field.h +++ b/include/sqlpp11/data_types/integral/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_RESULT_FIELD_H -#define SQLPP_INTEGRAL_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_INTEGRAL_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/integral/wrap_operand.h b/include/sqlpp11/data_types/integral/wrap_operand.h index d6381b67..97148087 100644 --- a/include/sqlpp11/data_types/integral/wrap_operand.h +++ b/include/sqlpp11/data_types/integral/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTEGRAL_WRAP_OPERAND_H -#define SQLPP_INTEGRAL_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_INTEGRAL_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_INTEGRAL_WRAP_OPERAND_H #include #include @@ -35,7 +35,9 @@ namespace sqlpp struct integral_operand; template - struct wrap_operand::value and not std::is_same::value and not std::is_unsigned::value>::type> + struct wrap_operand::value and not std::is_same::value and + not std::is_unsigned::value>::type> { using type = integral_operand; }; diff --git a/include/sqlpp11/data_types/no_value.h b/include/sqlpp11/data_types/no_value.h index 312cab93..55f454e0 100644 --- a/include/sqlpp11/data_types/no_value.h +++ b/include/sqlpp11/data_types/no_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_H -#define SQLPP_NO_VALUE_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_H +#define SQLPP11_DATA_TYPES_NO_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/no_value/column_operators.h b/include/sqlpp11/data_types/no_value/column_operators.h index 3417f2ae..d9a0dad1 100644 --- a/include/sqlpp11/data_types/no_value/column_operators.h +++ b/include/sqlpp11/data_types/no_value/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_COLUMN_OPERATORS_H -#define SQLPP_NO_VALUE_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_NO_VALUE_COLUMN_OPERATORS_H #include diff --git a/include/sqlpp11/data_types/no_value/data_type.h b/include/sqlpp11/data_types/no_value/data_type.h index df98a11f..582c6063 100644 --- a/include/sqlpp11/data_types/no_value/data_type.h +++ b/include/sqlpp11/data_types/no_value/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_DATA_TYPE_H -#define SQLPP_NO_VALUE_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_NO_VALUE_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/no_value/expression_operators.h b/include/sqlpp11/data_types/no_value/expression_operators.h index cd8f7175..09cb55fe 100644 --- a/include/sqlpp11/data_types/no_value/expression_operators.h +++ b/include/sqlpp11/data_types/no_value/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_EXPRESSION_OPERATORS_H -#define SQLPP_NO_VALUE_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_NO_VALUE_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/no_value/operand.h b/include/sqlpp11/data_types/no_value/operand.h index cbda37f3..a74c105d 100644 --- a/include/sqlpp11/data_types/no_value/operand.h +++ b/include/sqlpp11/data_types/no_value/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_OPERAND_H -#define SQLPP_NO_VALUE_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_OPERAND_H +#define SQLPP11_DATA_TYPES_NO_VALUE_OPERAND_H namespace sqlpp { diff --git a/include/sqlpp11/data_types/no_value/parameter_value.h b/include/sqlpp11/data_types/no_value/parameter_value.h index 0a822237..3c6c2129 100644 --- a/include/sqlpp11/data_types/no_value/parameter_value.h +++ b/include/sqlpp11/data_types/no_value/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_PARAMETER_VALUE_H -#define SQLPP_NO_VALUE_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_NO_VALUE_PARAMETER_VALUE_H namespace sqlpp { diff --git a/include/sqlpp11/data_types/no_value/result_field.h b/include/sqlpp11/data_types/no_value/result_field.h index 647b6c0a..45b59dc4 100644 --- a/include/sqlpp11/data_types/no_value/result_field.h +++ b/include/sqlpp11/data_types/no_value/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_RESULT_FIELD_H -#define SQLPP_NO_VALUE_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_NO_VALUE_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/no_value/wrap_operand.h b/include/sqlpp11/data_types/no_value/wrap_operand.h index 545eb09c..e372f302 100644 --- a/include/sqlpp11/data_types/no_value/wrap_operand.h +++ b/include/sqlpp11/data_types/no_value/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_VALUE_WRAP_OPERAND_H -#define SQLPP_NO_VALUE_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_NO_VALUE_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_NO_VALUE_WRAP_OPERAND_H namespace sqlpp { diff --git a/include/sqlpp11/data_types/parameter_value.h b/include/sqlpp11/data_types/parameter_value.h index 1fbcc5a7..a2cffacc 100644 --- a/include/sqlpp11/data_types/parameter_value.h +++ b/include/sqlpp11/data_types/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PARAMETER_VALUE_H -#define SQLPP_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_PARAMETER_VALUE_H #include diff --git a/include/sqlpp11/data_types/parameter_value_base.h b/include/sqlpp11/data_types/parameter_value_base.h index 491666d4..239a46f1 100644 --- a/include/sqlpp11/data_types/parameter_value_base.h +++ b/include/sqlpp11/data_types/parameter_value_base.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PARAMETER_VALUE_BASE_H -#define SQLPP_PARAMETER_VALUE_BASE_H +#ifndef SQLPP11_DATA_TYPES_PARAMETER_VALUE_BASE_H +#define SQLPP11_DATA_TYPES_PARAMETER_VALUE_BASE_H #include #include diff --git a/include/sqlpp11/data_types/text.h b/include/sqlpp11/data_types/text.h index 2c9327c7..1d3d0df6 100644 --- a/include/sqlpp11/data_types/text.h +++ b/include/sqlpp11/data_types/text.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_H -#define SQLPP_TEXT_H +#ifndef SQLPP11_DATA_TYPES_TEXT_H +#define SQLPP11_DATA_TYPES_TEXT_H #include #include diff --git a/include/sqlpp11/data_types/text/column_operators.h b/include/sqlpp11/data_types/text/column_operators.h index fdafacb3..b54ec011 100644 --- a/include/sqlpp11/data_types/text/column_operators.h +++ b/include/sqlpp11/data_types/text/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_COLUMN_OPERATORS_H -#define SQLPP_TEXT_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_TEXT_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_TEXT_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/text/concat.h b/include/sqlpp11/data_types/text/concat.h index 25164882..5b0fc86d 100644 --- a/include/sqlpp11/data_types/text/concat.h +++ b/include/sqlpp11/data_types/text/concat.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_CONCAT_H -#define SQLPP_CONCAT_H +#ifndef SQLPP11_DATA_TYPES_TEXT_CONCAT_H +#define SQLPP11_DATA_TYPES_TEXT_CONCAT_H #include #include diff --git a/include/sqlpp11/data_types/text/data_type.h b/include/sqlpp11/data_types/text/data_type.h index 6215dacb..7ced686c 100644 --- a/include/sqlpp11/data_types/text/data_type.h +++ b/include/sqlpp11/data_types/text/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_DATA_TYPE_H -#define SQLPP_TEXT_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_TEXT_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_TEXT_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/text/expression_operators.h b/include/sqlpp11/data_types/text/expression_operators.h index 065b6965..4fac75d1 100644 --- a/include/sqlpp11/data_types/text/expression_operators.h +++ b/include/sqlpp11/data_types/text/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_EXPRESSION_OPERATORS_H -#define SQLPP_TEXT_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_TEXT_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_TEXT_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/text/like.h b/include/sqlpp11/data_types/text/like.h index 9eae60b6..35d1b2ad 100644 --- a/include/sqlpp11/data_types/text/like.h +++ b/include/sqlpp11/data_types/text/like.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_LIKE_H -#define SQLPP_LIKE_H +#ifndef SQLPP11_DATA_TYPES_TEXT_LIKE_H +#define SQLPP11_DATA_TYPES_TEXT_LIKE_H #include #include diff --git a/include/sqlpp11/data_types/text/operand.h b/include/sqlpp11/data_types/text/operand.h index d67a938e..f78fde2b 100644 --- a/include/sqlpp11/data_types/text/operand.h +++ b/include/sqlpp11/data_types/text/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_OPERAND_H -#define SQLPP_TEXT_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TEXT_OPERAND_H +#define SQLPP11_DATA_TYPES_TEXT_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/text/parameter_value.h b/include/sqlpp11/data_types/text/parameter_value.h index 10d69d06..4a17c17a 100644 --- a/include/sqlpp11/data_types/text/parameter_value.h +++ b/include/sqlpp11/data_types/text/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_PARAMETER_VALUE_H -#define SQLPP_TEXT_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_TEXT_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_TEXT_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/text/result_field.h b/include/sqlpp11/data_types/text/result_field.h index a4d6f97c..a3841a86 100644 --- a/include/sqlpp11/data_types/text/result_field.h +++ b/include/sqlpp11/data_types/text/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_RESULT_FIELD_H -#define SQLPP_TEXT_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_TEXT_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_TEXT_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/text/wrap_operand.h b/include/sqlpp11/data_types/text/wrap_operand.h index f80e26d8..abc048c6 100644 --- a/include/sqlpp11/data_types/text/wrap_operand.h +++ b/include/sqlpp11/data_types/text/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TEXT_WRAP_OPERAND_H -#define SQLPP_TEXT_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TEXT_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_TEXT_WRAP_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day.h b/include/sqlpp11/data_types/time_of_day.h index 5eb1a630..62d7d2cd 100644 --- a/include/sqlpp11/data_types/time_of_day.h +++ b/include/sqlpp11/data_types/time_of_day.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_H -#define SQLPP_TIME_OF_DAY_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/column_operators.h b/include/sqlpp11/data_types/time_of_day/column_operators.h index cbe989a8..4c6e9bd7 100644 --- a/include/sqlpp11/data_types/time_of_day/column_operators.h +++ b/include/sqlpp11/data_types/time_of_day/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_COLUMN_OPERATOR_H -#define SQLPP_TIME_OF_DAY_COLUMN_OPERATOR_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/data_type.h b/include/sqlpp11/data_types/time_of_day/data_type.h index d58dcc10..8a951c93 100644 --- a/include/sqlpp11/data_types/time_of_day/data_type.h +++ b/include/sqlpp11/data_types/time_of_day/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_DATA_TYPE_H -#define SQLPP_TIME_OF_DAY_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_DATA_TYPE_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/expression_operators.h b/include/sqlpp11/data_types/time_of_day/expression_operators.h index 1c75de8f..6c089450 100644 --- a/include/sqlpp11/data_types/time_of_day/expression_operators.h +++ b/include/sqlpp11/data_types/time_of_day/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_EXPRESSION_OPERATORS_H -#define SQLPP_TIME_OF_DAY_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/operand.h b/include/sqlpp11/data_types/time_of_day/operand.h index bcac1e49..bf5f2c74 100644 --- a/include/sqlpp11/data_types/time_of_day/operand.h +++ b/include/sqlpp11/data_types/time_of_day/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_OPERAND_H -#define SQLPP_TIME_OF_DAY_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_OPERAND_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/parameter_value.h b/include/sqlpp11/data_types/time_of_day/parameter_value.h index 79075b34..e694edf8 100644 --- a/include/sqlpp11/data_types/time_of_day/parameter_value.h +++ b/include/sqlpp11/data_types/time_of_day/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_PARAMETER_VALUE_H -#define SQLPP_TIME_OF_DAY_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/result_field.h b/include/sqlpp11/data_types/time_of_day/result_field.h index 511fe8d6..6570a607 100644 --- a/include/sqlpp11/data_types/time_of_day/result_field.h +++ b/include/sqlpp11/data_types/time_of_day/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_RESULT_FIELD_H -#define SQLPP_TIME_OF_DAY_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/time_of_day/wrap_operand.h b/include/sqlpp11/data_types/time_of_day/wrap_operand.h index ba53fe5c..902e970d 100644 --- a/include/sqlpp11/data_types/time_of_day/wrap_operand.h +++ b/include/sqlpp11/data_types/time_of_day/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_OF_DAY_WRAP_OPERAND_H -#define SQLPP_TIME_OF_DAY_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TIME_OF_DAY_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_TIME_OF_DAY_WRAP_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/time_point.h b/include/sqlpp11/data_types/time_point.h index 83e481b7..85332cd0 100644 --- a/include/sqlpp11/data_types/time_point.h +++ b/include/sqlpp11/data_types/time_point.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_H -#define SQLPP_TIME_POINT_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_H +#define SQLPP11_DATA_TYPES_TIME_POINT_H #include #include diff --git a/include/sqlpp11/data_types/time_point/column_operators.h b/include/sqlpp11/data_types/time_point/column_operators.h index c59d7869..d95c3e14 100644 --- a/include/sqlpp11/data_types/time_point/column_operators.h +++ b/include/sqlpp11/data_types/time_point/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_COLUMN_OPERATOR_H -#define SQLPP_TIME_POINT_COLUMN_OPERATOR_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_TIME_POINT_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/time_point/data_type.h b/include/sqlpp11/data_types/time_point/data_type.h index ad3f727e..01cdb574 100644 --- a/include/sqlpp11/data_types/time_point/data_type.h +++ b/include/sqlpp11/data_types/time_point/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_DATA_TYPE_H -#define SQLPP_TIME_POINT_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_TIME_POINT_DATA_TYPE_H #include #include diff --git a/include/sqlpp11/data_types/time_point/expression_operators.h b/include/sqlpp11/data_types/time_point/expression_operators.h index 743ec5af..6c481cd1 100644 --- a/include/sqlpp11/data_types/time_point/expression_operators.h +++ b/include/sqlpp11/data_types/time_point/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_EXPRESSION_OPERATORS_H -#define SQLPP_TIME_POINT_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_TIME_POINT_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/time_point/operand.h b/include/sqlpp11/data_types/time_point/operand.h index eb82f545..ff63f712 100644 --- a/include/sqlpp11/data_types/time_point/operand.h +++ b/include/sqlpp11/data_types/time_point/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_OPERAND_H -#define SQLPP_TIME_POINT_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_OPERAND_H +#define SQLPP11_DATA_TYPES_TIME_POINT_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/time_point/parameter_value.h b/include/sqlpp11/data_types/time_point/parameter_value.h index 276c6942..b3ffa847 100644 --- a/include/sqlpp11/data_types/time_point/parameter_value.h +++ b/include/sqlpp11/data_types/time_point/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_PARAMETER_VALUE_H -#define SQLPP_TIME_POINT_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_TIME_POINT_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/time_point/result_field.h b/include/sqlpp11/data_types/time_point/result_field.h index 4310de86..806e5d61 100644 --- a/include/sqlpp11/data_types/time_point/result_field.h +++ b/include/sqlpp11/data_types/time_point/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_RESULT_FIELD_H -#define SQLPP_TIME_POINT_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_TIME_POINT_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/time_point/wrap_operand.h b/include/sqlpp11/data_types/time_point/wrap_operand.h index 0e52d46c..9cb79824 100644 --- a/include/sqlpp11/data_types/time_point/wrap_operand.h +++ b/include/sqlpp11/data_types/time_point/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TIME_POINT_WRAP_OPERAND_H -#define SQLPP_TIME_POINT_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_TIME_POINT_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_TIME_POINT_WRAP_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral.h b/include/sqlpp11/data_types/unsigned_integral.h index b37cdbaa..35ebddd9 100644 --- a/include/sqlpp11/data_types/unsigned_integral.h +++ b/include/sqlpp11/data_types/unsigned_integral.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_H -#define SQLPP_UNSIGNED_INTEGRAL_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/column_operators.h b/include/sqlpp11/data_types/unsigned_integral/column_operators.h index ea98038b..ca5ee932 100644 --- a/include/sqlpp11/data_types/unsigned_integral/column_operators.h +++ b/include/sqlpp11/data_types/unsigned_integral/column_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_COLUMN_OPERATORS_H -#define SQLPP_UNSIGNED_INTEGRAL_COLUMN_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_COLUMN_OPERATORS_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_COLUMN_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/data_type.h b/include/sqlpp11/data_types/unsigned_integral/data_type.h index 9a4d4269..11e3f234 100644 --- a/include/sqlpp11/data_types/unsigned_integral/data_type.h +++ b/include/sqlpp11/data_types/unsigned_integral/data_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_DATA_TYPE_H -#define SQLPP_UNSIGNED_INTEGRAL_DATA_TYPE_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_DATA_TYPE_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_DATA_TYPE_H #include diff --git a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h index bb5730b7..1079ede5 100644 --- a/include/sqlpp11/data_types/unsigned_integral/expression_operators.h +++ b/include/sqlpp11/data_types/unsigned_integral/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_EXPRESSION_OPERATORS_H -#define SQLPP_UNSIGNED_INTEGRAL_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_EXPRESSION_OPERATORS_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_EXPRESSION_OPERATORS_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/operand.h b/include/sqlpp11/data_types/unsigned_integral/operand.h index 2fa70619..d6cbfaa5 100644 --- a/include/sqlpp11/data_types/unsigned_integral/operand.h +++ b/include/sqlpp11/data_types/unsigned_integral/operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_OPERAND_H -#define SQLPP_UNSIGNED_INTEGRAL_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_OPERAND_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_OPERAND_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/parameter_value.h b/include/sqlpp11/data_types/unsigned_integral/parameter_value.h index c7ed7548..d12d0a9e 100644 --- a/include/sqlpp11/data_types/unsigned_integral/parameter_value.h +++ b/include/sqlpp11/data_types/unsigned_integral/parameter_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_PARAMETER_VALUE_H -#define SQLPP_UNSIGNED_INTEGRAL_PARAMETER_VALUE_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_PARAMETER_VALUE_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_PARAMETER_VALUE_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/result_field.h b/include/sqlpp11/data_types/unsigned_integral/result_field.h index 1a54eaa9..712d7092 100644 --- a/include/sqlpp11/data_types/unsigned_integral/result_field.h +++ b/include/sqlpp11/data_types/unsigned_integral/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_RESULT_FIELD_H -#define SQLPP_UNSIGNED_INTEGRAL_RESULT_FIELD_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_RESULT_FIELD_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h b/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h index 501d4a55..d97ccba2 100644 --- a/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h +++ b/include/sqlpp11/data_types/unsigned_integral/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNSIGNED_INTEGRAL_WRAP_OPERAND_H -#define SQLPP_UNSIGNED_INTEGRAL_WRAP_OPERAND_H +#ifndef SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_WRAP_OPERAND_H +#define SQLPP11_DATA_TYPES_UNSIGNED_INTEGRAL_WRAP_OPERAND_H #include #include @@ -35,7 +35,9 @@ namespace sqlpp struct unsigned_integral_operand; template - struct wrap_operand::value and not std::is_same::value and std::is_unsigned::value>::type> + struct wrap_operand::value and not std::is_same::value and + std::is_unsigned::value>::type> { using type = unsigned_integral_operand; }; diff --git a/include/sqlpp11/default_value.h b/include/sqlpp11/default_value.h index 83d9dc00..d9f96b22 100644 --- a/include/sqlpp11/default_value.h +++ b/include/sqlpp11/default_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DEFAULT_VALUE_H -#define SQLPP_DEFAULT_VALUE_H +#ifndef SQLPP11_DEFAULT_VALUE_H +#define SQLPP11_DEFAULT_VALUE_H #include diff --git a/include/sqlpp11/detail/copy_tuple_args.h b/include/sqlpp11/detail/copy_tuple_args.h index 9126ebbc..560ce341 100644 --- a/include/sqlpp11/detail/copy_tuple_args.h +++ b/include/sqlpp11/detail/copy_tuple_args.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_COPY_TUPLE_ARGS_H -#define SQLPP_DETAIL_COPY_TUPLE_ARGS_H +#ifndef SQLPP11_DETAIL_COPY_TUPLE_ARGS_H +#define SQLPP11_DETAIL_COPY_TUPLE_ARGS_H #include #include diff --git a/include/sqlpp11/detail/enable_if.h b/include/sqlpp11/detail/enable_if.h index 4f4cead7..4c6224fb 100644 --- a/include/sqlpp11/detail/enable_if.h +++ b/include/sqlpp11/detail/enable_if.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_ENABLE_IF_H -#define SQLPP_DETAIL_ENABLE_IF_H +#ifndef SQLPP11_DETAIL_ENABLE_IF_H +#define SQLPP11_DETAIL_ENABLE_IF_H #include diff --git a/include/sqlpp11/detail/field_index_sequence.h b/include/sqlpp11/detail/field_index_sequence.h index b932ed5c..e62c19bb 100644 --- a/include/sqlpp11/detail/field_index_sequence.h +++ b/include/sqlpp11/detail/field_index_sequence.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_FIELD_INDEX_SEQUENCE_H -#define SQLPP_DETAIL_FIELD_INDEX_SEQUENCE_H +#ifndef SQLPP11_DETAIL_FIELD_INDEX_SEQUENCE_H +#define SQLPP11_DETAIL_FIELD_INDEX_SEQUENCE_H #include #include diff --git a/include/sqlpp11/detail/get_first.h b/include/sqlpp11/detail/get_first.h index 927fde9f..8d19e189 100644 --- a/include/sqlpp11/detail/get_first.h +++ b/include/sqlpp11/detail/get_first.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_GET_FIRST_H -#define SQLPP_DETAIL_GET_FIRST_H +#ifndef SQLPP11_DETAIL_GET_FIRST_H +#define SQLPP11_DETAIL_GET_FIRST_H #include diff --git a/include/sqlpp11/detail/get_last.h b/include/sqlpp11/detail/get_last.h index 04cb16ce..4cf280ca 100644 --- a/include/sqlpp11/detail/get_last.h +++ b/include/sqlpp11/detail/get_last.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_GET_LAST_H -#define SQLPP_DETAIL_GET_LAST_H +#ifndef SQLPP11_DETAIL_GET_LAST_H +#define SQLPP11_DETAIL_GET_LAST_H #include diff --git a/include/sqlpp11/detail/index_sequence.h b/include/sqlpp11/detail/index_sequence.h index 41e1b2f6..ae014e74 100644 --- a/include/sqlpp11/detail/index_sequence.h +++ b/include/sqlpp11/detail/index_sequence.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_INDEX_SEQUENCE_H -#define SQLPP_DETAIL_INDEX_SEQUENCE_H +#ifndef SQLPP11_DETAIL_INDEX_SEQUENCE_H +#define SQLPP11_DETAIL_INDEX_SEQUENCE_H #include diff --git a/include/sqlpp11/detail/pick_arg.h b/include/sqlpp11/detail/pick_arg.h index c70f6da1..3d7abfec 100644 --- a/include/sqlpp11/detail/pick_arg.h +++ b/include/sqlpp11/detail/pick_arg.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_PICK_ARG_H -#define SQLPP_DETAIL_PICK_ARG_H +#ifndef SQLPP11_DETAIL_PICK_ARG_H +#define SQLPP11_DETAIL_PICK_ARG_H #include diff --git a/include/sqlpp11/detail/sum.h b/include/sqlpp11/detail/sum.h index 443d4616..b2c74001 100644 --- a/include/sqlpp11/detail/sum.h +++ b/include/sqlpp11/detail/sum.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_SUM_H -#define SQLPP_DETAIL_SUM_H +#ifndef SQLPP11_DETAIL_SUM_H +#define SQLPP11_DETAIL_SUM_H namespace sqlpp { diff --git a/include/sqlpp11/detail/type_set.h b/include/sqlpp11/detail/type_set.h index a3981743..54d46ee7 100644 --- a/include/sqlpp11/detail/type_set.h +++ b/include/sqlpp11/detail/type_set.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_TYPE_SET_H -#define SQLPP_DETAIL_TYPE_SET_H +#ifndef SQLPP11_DETAIL_TYPE_SET_H +#define SQLPP11_DETAIL_TYPE_SET_H #include #include diff --git a/include/sqlpp11/detail/type_vector.h b/include/sqlpp11/detail/type_vector.h index 6d89aab3..b3c8c9fe 100644 --- a/include/sqlpp11/detail/type_vector.h +++ b/include/sqlpp11/detail/type_vector.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_TYPE_VECTOR_H -#define SQLPP_DETAIL_TYPE_VECTOR_H +#ifndef SQLPP11_DETAIL_TYPE_VECTOR_H +#define SQLPP11_DETAIL_TYPE_VECTOR_H #include diff --git a/include/sqlpp11/detail/void.h b/include/sqlpp11/detail/void.h index 10d48199..4342f106 100644 --- a/include/sqlpp11/detail/void.h +++ b/include/sqlpp11/detail/void.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_VOID_H -#define SQLPP_DETAIL_VOID_H +#ifndef SQLPP11_DETAIL_VOID_H +#define SQLPP11_DETAIL_VOID_H namespace sqlpp { diff --git a/include/sqlpp11/dynamic_join.h b/include/sqlpp11/dynamic_join.h index fc7e742d..368a3192 100644 --- a/include/sqlpp11/dynamic_join.h +++ b/include/sqlpp11/dynamic_join.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DYNAMIC_JOIN_H -#define SQLPP_DYNAMIC_JOIN_H +#ifndef SQLPP11_DYNAMIC_JOIN_H +#define SQLPP11_DYNAMIC_JOIN_H #include diff --git a/include/sqlpp11/dynamic_pre_join.h b/include/sqlpp11/dynamic_pre_join.h index ed3dab9a..fd02867f 100644 --- a/include/sqlpp11/dynamic_pre_join.h +++ b/include/sqlpp11/dynamic_pre_join.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DYNAMIC_PRE_JOIN_H -#define SQLPP_DYNAMIC_PRE_JOIN_H +#ifndef SQLPP11_DYNAMIC_PRE_JOIN_H +#define SQLPP11_DYNAMIC_PRE_JOIN_H #include #include diff --git a/include/sqlpp11/dynamic_select_column_list.h b/include/sqlpp11/dynamic_select_column_list.h index 30beffbc..63d0c21e 100644 --- a/include/sqlpp11/dynamic_select_column_list.h +++ b/include/sqlpp11/dynamic_select_column_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_COLUMN_LIST_FWD_H -#define SQLPP_SELECT_COLUMN_LIST_FWD_H +#ifndef SQLPP11_DYNAMIC_SELECT_COLUMN_LIST_H +#define SQLPP11_DYNAMIC_SELECT_COLUMN_LIST_H #include #include diff --git a/include/sqlpp11/eval.h b/include/sqlpp11/eval.h index 26760bf5..426189c4 100644 --- a/include/sqlpp11/eval.h +++ b/include/sqlpp11/eval.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EVAL_H -#define SQLPP_EVAL_H +#ifndef SQLPP11_EVAL_H +#define SQLPP11_EVAL_H #include #include diff --git a/include/sqlpp11/exception.h b/include/sqlpp11/exception.h index c531c2b1..154ee777 100644 --- a/include/sqlpp11/exception.h +++ b/include/sqlpp11/exception.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXCEPTION_H -#define SQLPP_EXCEPTION_H +#ifndef SQLPP11_EXCEPTION_H +#define SQLPP11_EXCEPTION_H #include diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h index 5cab7395..84d95fc4 100644 --- a/include/sqlpp11/exists.h +++ b/include/sqlpp11/exists.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXISTS_H -#define SQLPP_EXISTS_H +#ifndef SQLPP11_EXISTS_H +#define SQLPP11_EXISTS_H #include #include diff --git a/include/sqlpp11/expression.h b/include/sqlpp11/expression.h index 68b99aaa..ba8204fd 100644 --- a/include/sqlpp11/expression.h +++ b/include/sqlpp11/expression.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXPRESSION_H -#define SQLPP_EXPRESSION_H +#ifndef SQLPP11_EXPRESSION_H +#define SQLPP11_EXPRESSION_H #include #include diff --git a/include/sqlpp11/expression_fwd.h b/include/sqlpp11/expression_fwd.h index 1ae8355f..52b42687 100644 --- a/include/sqlpp11/expression_fwd.h +++ b/include/sqlpp11/expression_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXPRESSION_FWD_H -#define SQLPP_EXPRESSION_FWD_H +#ifndef SQLPP11_EXPRESSION_FWD_H +#define SQLPP11_EXPRESSION_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/expression_operators.h b/include/sqlpp11/expression_operators.h index 2ead994a..e3a44cb7 100644 --- a/include/sqlpp11/expression_operators.h +++ b/include/sqlpp11/expression_operators.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXPRESSION_OPERATORS_H -#define SQLPP_EXPRESSION_OPERATORS_H +#ifndef SQLPP11_EXPRESSION_OPERATORS_H +#define SQLPP11_EXPRESSION_OPERATORS_H #include diff --git a/include/sqlpp11/expression_return_types.h b/include/sqlpp11/expression_return_types.h index bbec6f6f..375e5103 100644 --- a/include/sqlpp11/expression_return_types.h +++ b/include/sqlpp11/expression_return_types.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_EXPRESSION_RETURN_TYPES_H -#define SQLPP_EXPRESSION_RETURN_TYPES_H +#ifndef SQLPP11_EXPRESSION_RETURN_TYPES_H +#define SQLPP11_EXPRESSION_RETURN_TYPES_H #include diff --git a/include/sqlpp11/field_spec.h b/include/sqlpp11/field_spec.h index 53d6189f..43ae2d0b 100644 --- a/include/sqlpp11/field_spec.h +++ b/include/sqlpp11/field_spec.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FIELD_SPEC_H -#define SQLPP_FIELD_SPEC_H +#ifndef SQLPP11_FIELD_SPEC_H +#define SQLPP11_FIELD_SPEC_H #include diff --git a/include/sqlpp11/for_update.h b/include/sqlpp11/for_update.h index 0ee3471a..cb201d4c 100644 --- a/include/sqlpp11/for_update.h +++ b/include/sqlpp11/for_update.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FOR_UPDATE_H -#define SQLPP_FOR_UPDATE_H +#ifndef SQLPP11_FOR_UPDATE_H +#define SQLPP11_FOR_UPDATE_H #include #include diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h index afdc810f..48f81408 100644 --- a/include/sqlpp11/from.h +++ b/include/sqlpp11/from.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FROM_H -#define SQLPP_FROM_H +#ifndef SQLPP11_FROM_H +#define SQLPP11_FROM_H #include #include diff --git a/include/sqlpp11/functions.h b/include/sqlpp11/functions.h index bb208eb3..27fc6d4d 100644 --- a/include/sqlpp11/functions.h +++ b/include/sqlpp11/functions.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_FUNCTIONS_H -#define SQLPP_FUNCTIONS_H +#ifndef SQLPP11_FUNCTIONS_H +#define SQLPP11_FUNCTIONS_H #include #include diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h index 5a8c420b..43825788 100644 --- a/include/sqlpp11/group_by.h +++ b/include/sqlpp11/group_by.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_GROUP_BY_H -#define SQLPP_GROUP_BY_H +#ifndef SQLPP11_GROUP_BY_H +#define SQLPP11_GROUP_BY_H #include #include diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h index d2cd2e8b..862e5c6e 100644 --- a/include/sqlpp11/having.h +++ b/include/sqlpp11/having.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_HAVING_H -#define SQLPP_HAVING_H +#ifndef SQLPP11_HAVING_H +#define SQLPP11_HAVING_H #include #include diff --git a/include/sqlpp11/hidden.h b/include/sqlpp11/hidden.h index 76861ee2..21991bc7 100644 --- a/include/sqlpp11/hidden.h +++ b/include/sqlpp11/hidden.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_HIDDEN_H -#define SQLPP_HIDDEN_H +#ifndef SQLPP11_HIDDEN_H +#define SQLPP11_HIDDEN_H #include diff --git a/include/sqlpp11/in.h b/include/sqlpp11/in.h index 1ad51217..243fa1b9 100644 --- a/include/sqlpp11/in.h +++ b/include/sqlpp11/in.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_IN_H -#define SQLPP_IN_H +#ifndef SQLPP11_IN_H +#define SQLPP11_IN_H #include #include diff --git a/include/sqlpp11/in_fwd.h b/include/sqlpp11/in_fwd.h index 281137d8..0c2fa7a7 100644 --- a/include/sqlpp11/in_fwd.h +++ b/include/sqlpp11/in_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_IN_FWD_H -#define SQLPP_IN_FWD_H +#ifndef SQLPP11_IN_FWD_H +#define SQLPP11_IN_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/inconsistent.h b/include/sqlpp11/inconsistent.h index 0a46c929..8eb8777b 100644 --- a/include/sqlpp11/inconsistent.h +++ b/include/sqlpp11/inconsistent.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INCONSISTENT_H -#define SQLPP_INCONSISTENT_H +#ifndef SQLPP11_INCONSISTENT_H +#define SQLPP11_INCONSISTENT_H #include diff --git a/include/sqlpp11/insert.h b/include/sqlpp11/insert.h index 5b635977..e14c386c 100644 --- a/include/sqlpp11/insert.h +++ b/include/sqlpp11/insert.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INSERT_H -#define SQLPP_INSERT_H +#ifndef SQLPP11_INSERT_H +#define SQLPP11_INSERT_H #include #include diff --git a/include/sqlpp11/insert_value.h b/include/sqlpp11/insert_value.h index ba6f7223..5354fc65 100644 --- a/include/sqlpp11/insert_value.h +++ b/include/sqlpp11/insert_value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INSERT_VALUE_H -#define SQLPP_INSERT_VALUE_H +#ifndef SQLPP11_INSERT_VALUE_H +#define SQLPP11_INSERT_VALUE_H #include #include diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h index 2eed4b1b..995d454d 100644 --- a/include/sqlpp11/insert_value_list.h +++ b/include/sqlpp11/insert_value_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INSERT_VALUE_LIST_H -#define SQLPP_INSERT_VALUE_LIST_H +#ifndef SQLPP11_INSERT_VALUE_LIST_H +#define SQLPP11_INSERT_VALUE_LIST_H #include #include @@ -180,10 +180,9 @@ namespace sqlpp static_check_t::type...>::value, assert_insert_set_no_duplicates_t>, static_check_t::value...>::value, assert_insert_set_allowed_t>, - static_check_t< - sizeof...(Assignments) == 0 or - detail::make_joined_set_t::type>...>::size::value == 1, - assert_insert_set_single_table_t>>; + static_check_t::type>...>::size::value == 1, + assert_insert_set_single_table_t>>; // workaround for msvc bug https://connect.microsoft.com/VisualStudio/Feedback/Details/2173269 // template diff --git a/include/sqlpp11/interpret.h b/include/sqlpp11/interpret.h index 4d376451..c5793baf 100644 --- a/include/sqlpp11/interpret.h +++ b/include/sqlpp11/interpret.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTERPRET_H -#define SQLPP_INTERPRET_H +#ifndef SQLPP11_INTERPRET_H +#define SQLPP11_INTERPRET_H #include diff --git a/include/sqlpp11/interpret_tuple.h b/include/sqlpp11/interpret_tuple.h index 13b46ca9..a95133bd 100644 --- a/include/sqlpp11/interpret_tuple.h +++ b/include/sqlpp11/interpret_tuple.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTERPRET_TUPLE_H -#define SQLPP_INTERPRET_TUPLE_H +#ifndef SQLPP11_INTERPRET_TUPLE_H +#define SQLPP11_INTERPRET_TUPLE_H #include #include @@ -51,7 +51,7 @@ namespace sqlpp const Separator& separator, Context& context, const UseBraces& useBraces, - const detail::index_sequence&) -> Context & + const detail::index_sequence&) -> Context& { // Note: A braced-init-list does guarantee the order of evaluation according to 12.6.1 [class.explicit.init] // paragraph 2 and 8.5.4 [dcl.init.list] paragraph 4. @@ -66,14 +66,14 @@ namespace sqlpp } template - auto interpret_tuple(const Tuple& t, const Separator& separator, Context& context) -> Context & + auto interpret_tuple(const Tuple& t, const Separator& separator, Context& context) -> Context& { return interpret_tuple_impl(t, separator, context, std::true_type{}, detail::make_index_sequence::value>{}); } template - auto interpret_tuple_without_braces(const Tuple& t, const Separator& separator, Context& context) -> Context & + auto interpret_tuple_without_braces(const Tuple& t, const Separator& separator, Context& context) -> Context& { return interpret_tuple_impl(t, separator, context, std::false_type{}, detail::make_index_sequence::value>{}); diff --git a/include/sqlpp11/interpretable.h b/include/sqlpp11/interpretable.h index b93a897a..d18f2612 100644 --- a/include/sqlpp11/interpretable.h +++ b/include/sqlpp11/interpretable.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTERPRETABLE_H -#define SQLPP_INTERPRETABLE_H +#ifndef SQLPP11_INTERPRETABLE_H +#define SQLPP11_INTERPRETABLE_H #include #include diff --git a/include/sqlpp11/interpretable_list.h b/include/sqlpp11/interpretable_list.h index dc11d0ae..b36f4132 100644 --- a/include/sqlpp11/interpretable_list.h +++ b/include/sqlpp11/interpretable_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTERPRETABLE_LIST_H -#define SQLPP_INTERPRETABLE_LIST_H +#ifndef SQLPP11_INTERPRETABLE_LIST_H +#define SQLPP11_INTERPRETABLE_LIST_H #include #include diff --git a/include/sqlpp11/interpreter.h b/include/sqlpp11/interpreter.h index 0605c5a7..71bc17c0 100644 --- a/include/sqlpp11/interpreter.h +++ b/include/sqlpp11/interpreter.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTERPRETER_H -#define SQLPP_INTERPRETER_H +#ifndef SQLPP11_INTERPRETER_H +#define SQLPP11_INTERPRETER_H #include diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h index 4f6ea14b..6d5b6204 100644 --- a/include/sqlpp11/into.h +++ b/include/sqlpp11/into.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_INTO_H -#define SQLPP_INTO_H +#ifndef SQLPP11_INTO_H +#define SQLPP11_INTO_H #include #include diff --git a/include/sqlpp11/is_not_null.h b/include/sqlpp11/is_not_null.h index 1f4b9c33..f5d6ac3e 100644 --- a/include/sqlpp11/is_not_null.h +++ b/include/sqlpp11/is_not_null.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_IS_NOT_NULL_H -#define SQLPP_IS_NOT_NULL_H +#ifndef SQLPP11_IS_NOT_NULL_H +#define SQLPP11_IS_NOT_NULL_H #include #include diff --git a/include/sqlpp11/is_null.h b/include/sqlpp11/is_null.h index 97fdc047..df3f86de 100644 --- a/include/sqlpp11/is_null.h +++ b/include/sqlpp11/is_null.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_IS_NULL_H -#define SQLPP_IS_NULL_H +#ifndef SQLPP11_IS_NULL_H +#define SQLPP11_IS_NULL_H #include #include diff --git a/include/sqlpp11/is_null_fwd.h b/include/sqlpp11/is_null_fwd.h index 78b5bf91..d57e41b6 100644 --- a/include/sqlpp11/is_null_fwd.h +++ b/include/sqlpp11/is_null_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_IS_NULL_FWD_H -#define SQLPP_IS_NULL_FWD_H +#ifndef SQLPP11_IS_NULL_FWD_H +#define SQLPP11_IS_NULL_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/join.h b/include/sqlpp11/join.h index 09ecb8fa..40c942e9 100644 --- a/include/sqlpp11/join.h +++ b/include/sqlpp11/join.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_JOIN_H -#define SQLPP_JOIN_H +#ifndef SQLPP11_JOIN_H +#define SQLPP11_JOIN_H #include #include diff --git a/include/sqlpp11/join_types.h b/include/sqlpp11/join_types.h index 50b01ed8..fbc45182 100644 --- a/include/sqlpp11/join_types.h +++ b/include/sqlpp11/join_types.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_JOIN_TYPES_H -#define SQLPP_JOIN_TYPES_H +#ifndef SQLPP11_JOIN_TYPES_H +#define SQLPP11_JOIN_TYPES_H #include diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h index 0b35d50f..1623775b 100644 --- a/include/sqlpp11/limit.h +++ b/include/sqlpp11/limit.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_LIMIT_H -#define SQLPP_LIMIT_H +#ifndef SQLPP11_LIMIT_H +#define SQLPP11_LIMIT_H #include #include diff --git a/include/sqlpp11/logic.h b/include/sqlpp11/logic.h index 543cbf05..9ec11a46 100644 --- a/include/sqlpp11/logic.h +++ b/include/sqlpp11/logic.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_LOGIC_H -#define SQLPP_DETAIL_LOGIC_H +#ifndef SQLPP11_LOGIC_H +#define SQLPP11_LOGIC_H #include // Required for some compilers to use aliases for boolean operators #include diff --git a/include/sqlpp11/multi_column.h b/include/sqlpp11/multi_column.h index a8bd1377..ad1a6e63 100644 --- a/include/sqlpp11/multi_column.h +++ b/include/sqlpp11/multi_column.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_MULTI_COLUMN_H -#define SQLPP_MULTI_COLUMN_H +#ifndef SQLPP11_MULTI_COLUMN_H +#define SQLPP11_MULTI_COLUMN_H #include #include diff --git a/include/sqlpp11/named_interpretable.h b/include/sqlpp11/named_interpretable.h index 75f798d7..16ce28b6 100644 --- a/include/sqlpp11/named_interpretable.h +++ b/include/sqlpp11/named_interpretable.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NAMED_SERIALIZABLE_H -#define SQLPP_NAMED_SERIALIZABLE_H +#ifndef SQLPP11_NAMED_INTERPRETABLE_H +#define SQLPP11_NAMED_INTERPRETABLE_H #include #include diff --git a/include/sqlpp11/no_data.h b/include/sqlpp11/no_data.h index f823747b..8b7bbe87 100644 --- a/include/sqlpp11/no_data.h +++ b/include/sqlpp11/no_data.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_DATA_H -#define SQLPP_NO_DATA_H +#ifndef SQLPP11_NO_DATA_H +#define SQLPP11_NO_DATA_H #include #include diff --git a/include/sqlpp11/no_name.h b/include/sqlpp11/no_name.h index 2ba2e9e2..cacaea30 100644 --- a/include/sqlpp11/no_name.h +++ b/include/sqlpp11/no_name.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NO_NAME_H -#define SQLPP_NO_NAME_H +#ifndef SQLPP11_NO_NAME_H +#define SQLPP11_NO_NAME_H namespace sqlpp { diff --git a/include/sqlpp11/noop.h b/include/sqlpp11/noop.h index 3236e226..cdca0941 100644 --- a/include/sqlpp11/noop.h +++ b/include/sqlpp11/noop.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NOOP_H -#define SQLPP_NOOP_H +#ifndef SQLPP11_NOOP_H +#define SQLPP11_NOOP_H #include #include diff --git a/include/sqlpp11/not_in.h b/include/sqlpp11/not_in.h index eae91869..a9ac1fff 100644 --- a/include/sqlpp11/not_in.h +++ b/include/sqlpp11/not_in.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NOT_IN_H -#define SQLPP_NOT_IN_H +#ifndef SQLPP11_NOT_IN_H +#define SQLPP11_NOT_IN_H #include #include diff --git a/include/sqlpp11/null.h b/include/sqlpp11/null.h index cde00e65..18b89ba0 100644 --- a/include/sqlpp11/null.h +++ b/include/sqlpp11/null.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_NULL_H -#define SQLPP_NULL_H +#ifndef SQLPP11_NULL_H +#define SQLPP11_NULL_H #include diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h index fa2f9e1c..b77cd500 100644 --- a/include/sqlpp11/offset.h +++ b/include/sqlpp11/offset.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_OFFSET_H -#define SQLPP_OFFSET_H +#ifndef SQLPP11_OFFSET_H +#define SQLPP11_OFFSET_H #include #include diff --git a/include/sqlpp11/on.h b/include/sqlpp11/on.h index 9a66b784..3ac8733a 100644 --- a/include/sqlpp11/on.h +++ b/include/sqlpp11/on.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ON_H -#define SQLPP_ON_H +#ifndef SQLPP11_ON_H +#define SQLPP11_ON_H #include #include diff --git a/include/sqlpp11/operand_check.h b/include/sqlpp11/operand_check.h index 4060d7dc..d4f5803f 100644 --- a/include/sqlpp11/operand_check.h +++ b/include/sqlpp11/operand_check.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_OPERAND_CHECK_H -#define SQLPP_OPERAND_CHECK_H +#ifndef SQLPP11_OPERAND_CHECK_H +#define SQLPP11_OPERAND_CHECK_H #include #include diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h index 16d564cd..6420155c 100644 --- a/include/sqlpp11/order_by.h +++ b/include/sqlpp11/order_by.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_ORDER_BY_H -#define SQLPP_ORDER_BY_H +#ifndef SQLPP11_ORDER_BY_H +#define SQLPP11_ORDER_BY_H #include #include diff --git a/include/sqlpp11/parameter.h b/include/sqlpp11/parameter.h index e3722d50..1dcc5c2f 100644 --- a/include/sqlpp11/parameter.h +++ b/include/sqlpp11/parameter.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PARAMETER_H -#define SQLPP_PARAMETER_H +#ifndef SQLPP11_PARAMETER_H +#define SQLPP11_PARAMETER_H #include #include diff --git a/include/sqlpp11/parameter_list.h b/include/sqlpp11/parameter_list.h index 4052a61d..9c05fb08 100644 --- a/include/sqlpp11/parameter_list.h +++ b/include/sqlpp11/parameter_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PARAMETER_LIST_H -#define SQLPP_PARAMETER_LIST_H +#ifndef SQLPP11_PARAMETER_LIST_H +#define SQLPP11_PARAMETER_LIST_H #include #include diff --git a/include/sqlpp11/policy_update.h b/include/sqlpp11/policy_update.h index 70070e13..9832880b 100644 --- a/include/sqlpp11/policy_update.h +++ b/include/sqlpp11/policy_update.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_POLICY_UPDATE_H -#define SQLPP_POLICY_UPDATE_H +#ifndef SQLPP11_POLICY_UPDATE_H +#define SQLPP11_POLICY_UPDATE_H #include diff --git a/include/sqlpp11/portable_static_assert.h b/include/sqlpp11/portable_static_assert.h index c7cbdcfb..936b3ab9 100644 --- a/include/sqlpp11/portable_static_assert.h +++ b/include/sqlpp11/portable_static_assert.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PORTABLE_STATIC_ASSERT_H -#define SQLPP_PORTABLE_STATIC_ASSERT_H +#ifndef SQLPP11_PORTABLE_STATIC_ASSERT_H +#define SQLPP11_PORTABLE_STATIC_ASSERT_H #include #include diff --git a/include/sqlpp11/pre_join.h b/include/sqlpp11/pre_join.h index d8ef6d69..28e5f67f 100644 --- a/include/sqlpp11/pre_join.h +++ b/include/sqlpp11/pre_join.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PRE_JOIN_H -#define SQLPP_PRE_JOIN_H +#ifndef SQLPP11_PRE_JOIN_H +#define SQLPP11_PRE_JOIN_H #include #include diff --git a/include/sqlpp11/prepared_execute.h b/include/sqlpp11/prepared_execute.h index 0080b6ee..ef004b1d 100644 --- a/include/sqlpp11/prepared_execute.h +++ b/include/sqlpp11/prepared_execute.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PREPARED_EXECUTE_H -#define SQLPP_PREPARED_EXECUTE_H +#ifndef SQLPP11_PREPARED_EXECUTE_H +#define SQLPP11_PREPARED_EXECUTE_H #include #include diff --git a/include/sqlpp11/prepared_insert.h b/include/sqlpp11/prepared_insert.h index 5e7ec2cf..df53d8ee 100644 --- a/include/sqlpp11/prepared_insert.h +++ b/include/sqlpp11/prepared_insert.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PREPARED_INSERT_H -#define SQLPP_PREPARED_INSERT_H +#ifndef SQLPP11_PREPARED_INSERT_H +#define SQLPP11_PREPARED_INSERT_H #include #include diff --git a/include/sqlpp11/prepared_remove.h b/include/sqlpp11/prepared_remove.h index b3b4e416..4815a8c7 100644 --- a/include/sqlpp11/prepared_remove.h +++ b/include/sqlpp11/prepared_remove.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PREPARED_REMOVE_H -#define SQLPP_PREPARED_REMOVE_H +#ifndef SQLPP11_PREPARED_REMOVE_H +#define SQLPP11_PREPARED_REMOVE_H #include #include diff --git a/include/sqlpp11/prepared_select.h b/include/sqlpp11/prepared_select.h index 57454a37..c91fc330 100644 --- a/include/sqlpp11/prepared_select.h +++ b/include/sqlpp11/prepared_select.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PREPARED_SELECT_H -#define SQLPP_PREPARED_SELECT_H +#ifndef SQLPP11_PREPARED_SELECT_H +#define SQLPP11_PREPARED_SELECT_H #include #include diff --git a/include/sqlpp11/prepared_update.h b/include/sqlpp11/prepared_update.h index a5855d1b..cc238fe7 100644 --- a/include/sqlpp11/prepared_update.h +++ b/include/sqlpp11/prepared_update.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_PREPARED_UPDATE_H -#define SQLPP_PREPARED_UPDATE_H +#ifndef SQLPP11_PREPARED_UPDATE_H +#define SQLPP11_PREPARED_UPDATE_H #include #include diff --git a/include/sqlpp11/remove.h b/include/sqlpp11/remove.h index fe63205e..ca9ec6b2 100644 --- a/include/sqlpp11/remove.h +++ b/include/sqlpp11/remove.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_REMOVE_H -#define SQLPP_REMOVE_H +#ifndef SQLPP11_REMOVE_H +#define SQLPP11_REMOVE_H #include #include diff --git a/include/sqlpp11/result.h b/include/sqlpp11/result.h index b93cd84c..88c65336 100644 --- a/include/sqlpp11/result.h +++ b/include/sqlpp11/result.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RESULT_H -#define SQLPP_RESULT_H +#ifndef SQLPP11_RESULT_H +#define SQLPP11_RESULT_H #include #include diff --git a/include/sqlpp11/result_field.h b/include/sqlpp11/result_field.h index f7ad360b..53344f5e 100644 --- a/include/sqlpp11/result_field.h +++ b/include/sqlpp11/result_field.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RESULT_FIELD_H -#define SQLPP_RESULT_FIELD_H +#ifndef SQLPP11_RESULT_FIELD_H +#define SQLPP11_RESULT_FIELD_H #include #include diff --git a/include/sqlpp11/result_field_base.h b/include/sqlpp11/result_field_base.h index 3f6d3992..9776910c 100644 --- a/include/sqlpp11/result_field_base.h +++ b/include/sqlpp11/result_field_base.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RESULT_FIELD_BASE_H -#define SQLPP_RESULT_FIELD_BASE_H +#ifndef SQLPP11_RESULT_FIELD_BASE_H +#define SQLPP11_RESULT_FIELD_BASE_H #include #include diff --git a/include/sqlpp11/result_row.h b/include/sqlpp11/result_row.h index 8c620322..a388efa5 100644 --- a/include/sqlpp11/result_row.h +++ b/include/sqlpp11/result_row.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RESULT_ROW_H -#define SQLPP_RESULT_ROW_H +#ifndef SQLPP11_RESULT_ROW_H +#define SQLPP11_RESULT_ROW_H #include #include diff --git a/include/sqlpp11/result_row_fwd.h b/include/sqlpp11/result_row_fwd.h index 6bd38e2c..668bec5e 100644 --- a/include/sqlpp11/result_row_fwd.h +++ b/include/sqlpp11/result_row_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RESULT_ROW_FWD_H -#define SQLPP_RESULT_ROW_FWD_H +#ifndef SQLPP11_RESULT_ROW_FWD_H +#define SQLPP11_RESULT_ROW_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/rhs_wrap.h b/include/sqlpp11/rhs_wrap.h index 4e136afe..fd055547 100644 --- a/include/sqlpp11/rhs_wrap.h +++ b/include/sqlpp11/rhs_wrap.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_RHS_WRAP_H -#define SQLPP_RHS_WRAP_H +#ifndef SQLPP11_RHS_WRAP_H +#define SQLPP11_RHS_WRAP_H #include #include diff --git a/include/sqlpp11/schema.h b/include/sqlpp11/schema.h index 4730817b..77f825cf 100644 --- a/include/sqlpp11/schema.h +++ b/include/sqlpp11/schema.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SCHEMA_H -#define SQLPP_SCHEMA_H +#ifndef SQLPP11_SCHEMA_H +#define SQLPP11_SCHEMA_H #include diff --git a/include/sqlpp11/schema_qualified_table.h b/include/sqlpp11/schema_qualified_table.h index 15563113..bc3f109a 100644 --- a/include/sqlpp11/schema_qualified_table.h +++ b/include/sqlpp11/schema_qualified_table.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SCHEMA_QUALIFIED_TABLE_H -#define SQLPP_SCHEMA_QUALIFIED_TABLE_H +#ifndef SQLPP11_SCHEMA_QUALIFIED_TABLE_H +#define SQLPP11_SCHEMA_QUALIFIED_TABLE_H #include #include diff --git a/include/sqlpp11/select.h b/include/sqlpp11/select.h index 0a1b301f..149b6d42 100644 --- a/include/sqlpp11/select.h +++ b/include/sqlpp11/select.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_H -#define SQLPP_SELECT_H +#ifndef SQLPP11_SELECT_H +#define SQLPP11_SELECT_H #include diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h index ae29d52f..d1086d54 100644 --- a/include/sqlpp11/select_column_list.h +++ b/include/sqlpp11/select_column_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_COLUMN_LIST_H -#define SQLPP_SELECT_COLUMN_LIST_H +#ifndef SQLPP11_SELECT_COLUMN_LIST_H +#define SQLPP11_SELECT_COLUMN_LIST_H #include #include diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h index a1caa8df..10ff7f39 100644 --- a/include/sqlpp11/select_flag_list.h +++ b/include/sqlpp11/select_flag_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_FLAG_LIST_H -#define SQLPP_SELECT_FLAG_LIST_H +#ifndef SQLPP11_SELECT_FLAG_LIST_H +#define SQLPP11_SELECT_FLAG_LIST_H #include #include diff --git a/include/sqlpp11/select_flags.h b/include/sqlpp11/select_flags.h index b3606e00..2486a943 100644 --- a/include/sqlpp11/select_flags.h +++ b/include/sqlpp11/select_flags.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_FLAGS_H -#define SQLPP_SELECT_FLAGS_H +#ifndef SQLPP11_SELECT_FLAGS_H +#define SQLPP11_SELECT_FLAGS_H #include #include diff --git a/include/sqlpp11/select_pseudo_table.h b/include/sqlpp11/select_pseudo_table.h index 321df845..d396c4be 100644 --- a/include/sqlpp11/select_pseudo_table.h +++ b/include/sqlpp11/select_pseudo_table.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SELECT_PSEUDO_TABLE_H -#define SQLPP_SELECT_PSEUDO_TABLE_H +#ifndef SQLPP11_SELECT_PSEUDO_TABLE_H +#define SQLPP11_SELECT_PSEUDO_TABLE_H #include #include diff --git a/include/sqlpp11/serialize.h b/include/sqlpp11/serialize.h index e572eeeb..9d672f82 100644 --- a/include/sqlpp11/serialize.h +++ b/include/sqlpp11/serialize.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SERIALIZE_H -#define SQLPP_SERIALIZE_H +#ifndef SQLPP11_SERIALIZE_H +#define SQLPP11_SERIALIZE_H #include #include diff --git a/include/sqlpp11/serializer.h b/include/sqlpp11/serializer.h index 301d95af..66fbd8fe 100644 --- a/include/sqlpp11/serializer.h +++ b/include/sqlpp11/serializer.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SERIALIZER_H -#define SQLPP_SERIALIZER_H +#ifndef SQLPP11_SERIALIZER_H +#define SQLPP11_SERIALIZER_H #include #include diff --git a/include/sqlpp11/serializer_context.h b/include/sqlpp11/serializer_context.h index fa646553..89966bff 100644 --- a/include/sqlpp11/serializer_context.h +++ b/include/sqlpp11/serializer_context.h @@ -23,8 +23,8 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SERIALIZER_CONTEXT_H -#define SQLPP_SERIALIZER_CONTEXT_H +#ifndef SQLPP11_SERIALIZER_CONTEXT_H +#define SQLPP11_SERIALIZER_CONTEXT_H #include diff --git a/include/sqlpp11/simple_column.h b/include/sqlpp11/simple_column.h index 33cfdd6a..ae8951f7 100644 --- a/include/sqlpp11/simple_column.h +++ b/include/sqlpp11/simple_column.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SIMPLE_COLUMN_H -#define SQLPP_SIMPLE_COLUMN_H +#ifndef SQLPP11_SIMPLE_COLUMN_H +#define SQLPP11_SIMPLE_COLUMN_H #include #include diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h index 93881f88..e277b944 100644 --- a/include/sqlpp11/single_table.h +++ b/include/sqlpp11/single_table.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SINGLE_TABLE_H -#define SQLPP_SINGLE_TABLE_H +#ifndef SQLPP11_SINGLE_TABLE_H +#define SQLPP11_SINGLE_TABLE_H #include #include diff --git a/include/sqlpp11/some.h b/include/sqlpp11/some.h index d33a2f20..9947a599 100644 --- a/include/sqlpp11/some.h +++ b/include/sqlpp11/some.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SOME_H -#define SQLPP_SOME_H +#ifndef SQLPP11_SOME_H +#define SQLPP11_SOME_H #include #include diff --git a/include/sqlpp11/sort_order.h b/include/sqlpp11/sort_order.h index 4ef59e5e..65faba33 100644 --- a/include/sqlpp11/sort_order.h +++ b/include/sqlpp11/sort_order.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_SORT_ORDER_H -#define SQLPP_SORT_ORDER_H +#ifndef SQLPP11_SORT_ORDER_H +#define SQLPP11_SORT_ORDER_H #include diff --git a/include/sqlpp11/sqlpp11.h b/include/sqlpp11/sqlpp11.h index 722a1bcc..19fe7244 100644 --- a/include/sqlpp11/sqlpp11.h +++ b/include/sqlpp11/sqlpp11.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_H -#define SQLPP_H +#ifndef SQLPP11_SQLPP11_H +#define SQLPP11_SQLPP11_H #include #include diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h index f3fccf49..cb050de9 100644 --- a/include/sqlpp11/statement.h +++ b/include/sqlpp11/statement.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_STATEMENT_H -#define SQLPP_STATEMENT_H +#ifndef SQLPP11_STATEMENT_H +#define SQLPP11_STATEMENT_H #include #include diff --git a/include/sqlpp11/statement_fwd.h b/include/sqlpp11/statement_fwd.h index f6a3341d..48895e86 100644 --- a/include/sqlpp11/statement_fwd.h +++ b/include/sqlpp11/statement_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_STATEMENT_FWD_H -#define SQLPP_STATEMENT_FWD_H +#ifndef SQLPP11_STATEMENT_FWD_H +#define SQLPP11_STATEMENT_FWD_H namespace sqlpp { diff --git a/include/sqlpp11/table.h b/include/sqlpp11/table.h index 7e51f22d..b260d590 100644 --- a/include/sqlpp11/table.h +++ b/include/sqlpp11/table.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TABLE_H -#define SQLPP_TABLE_H +#ifndef SQLPP11_TABLE_H +#define SQLPP11_TABLE_H #include #include diff --git a/include/sqlpp11/table_alias.h b/include/sqlpp11/table_alias.h index ae534463..7d4bb684 100644 --- a/include/sqlpp11/table_alias.h +++ b/include/sqlpp11/table_alias.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TABLE_ALIAS_H -#define SQLPP_TABLE_ALIAS_H +#ifndef SQLPP11_TABLE_ALIAS_H +#define SQLPP11_TABLE_ALIAS_H #include #include diff --git a/include/sqlpp11/table_ref.h b/include/sqlpp11/table_ref.h index e10d55c0..c7011311 100644 --- a/include/sqlpp11/table_ref.h +++ b/include/sqlpp11/table_ref.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TABLE_REF_H -#define SQLPP_TABLE_REF_H +#ifndef SQLPP11_TABLE_REF_H +#define SQLPP11_TABLE_REF_H #include diff --git a/include/sqlpp11/transaction.h b/include/sqlpp11/transaction.h index 0d2a16be..038dc624 100644 --- a/include/sqlpp11/transaction.h +++ b/include/sqlpp11/transaction.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TRANSACTION_H -#define SQLPP_TRANSACTION_H +#ifndef SQLPP11_TRANSACTION_H +#define SQLPP11_TRANSACTION_H #include #include @@ -35,12 +35,13 @@ namespace sqlpp static constexpr bool quiet_auto_rollback = false; static constexpr bool report_auto_rollback = true; - enum class isolation_level { - undefined, // use the current database default - serializable, // highest level, stronguest guarantee - repeatable_read, // DBMS holds read and write locks - read_committed, // DMBS holds read locks, non-repeatable reads can occur - read_uncommitted // lowest isolation level, dirty reads may occur + enum class isolation_level + { + undefined, // use the current database default + serializable, // highest level, stronguest guarantee + repeatable_read, // DBMS holds read and write locks + read_committed, // DMBS holds read locks, non-repeatable reads can occur + read_uncommitted // lowest isolation level, dirty reads may occur }; template @@ -103,11 +104,13 @@ namespace sqlpp template transaction_t start_transaction(Db& db, bool report_unfinished_transaction = report_auto_rollback) { - return {db, report_unfinished_transaction}; + return {db, report_unfinished_transaction}; } template - transaction_t start_transaction(Db& db, isolation_level isolation, bool report_unfinished_transaction = report_auto_rollback) + transaction_t start_transaction(Db& db, + isolation_level isolation, + bool report_unfinished_transaction = report_auto_rollback) { return {db, report_unfinished_transaction, isolation}; } diff --git a/include/sqlpp11/tvin.h b/include/sqlpp11/tvin.h index efe0f2b1..ba473539 100644 --- a/include/sqlpp11/tvin.h +++ b/include/sqlpp11/tvin.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TVIN_H -#define SQLPP_TVIN_H +#ifndef SQLPP11_TVIN_H +#define SQLPP11_TVIN_H // TVIN: Trivial value is NULL diff --git a/include/sqlpp11/type_traits.h b/include/sqlpp11/type_traits.h index 427308c6..4974d194 100644 --- a/include/sqlpp11/type_traits.h +++ b/include/sqlpp11/type_traits.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_TYPE_TRAITS_H -#define SQLPP_TYPE_TRAITS_H +#ifndef SQLPP11_TYPE_TRAITS_H +#define SQLPP11_TYPE_TRAITS_H #include #include diff --git a/include/sqlpp11/unconditional.h b/include/sqlpp11/unconditional.h index ac4d9349..6f905a2c 100644 --- a/include/sqlpp11/unconditional.h +++ b/include/sqlpp11/unconditional.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNCONDITIONAL_H -#define SQLPP_UNCONDITIONAL_H +#ifndef SQLPP11_UNCONDITIONAL_H +#define SQLPP11_UNCONDITIONAL_H namespace sqlpp { diff --git a/include/sqlpp11/union.h b/include/sqlpp11/union.h index dd15400d..a54dc69f 100644 --- a/include/sqlpp11/union.h +++ b/include/sqlpp11/union.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNION_H -#define SQLPP_UNION_H +#ifndef SQLPP11_UNION_H +#define SQLPP11_UNION_H #include #include diff --git a/include/sqlpp11/union_data.h b/include/sqlpp11/union_data.h index 8e3e34bc..054c8694 100644 --- a/include/sqlpp11/union_data.h +++ b/include/sqlpp11/union_data.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNION_DATA_H -#define SQLPP_UNION_DATA_H +#ifndef SQLPP11_UNION_DATA_H +#define SQLPP11_UNION_DATA_H #include diff --git a/include/sqlpp11/union_flags.h b/include/sqlpp11/union_flags.h index 434535a1..01853c67 100644 --- a/include/sqlpp11/union_flags.h +++ b/include/sqlpp11/union_flags.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UNION_FLAGS_H -#define SQLPP_UNION_FLAGS_H +#ifndef SQLPP11_UNION_FLAGS_H +#define SQLPP11_UNION_FLAGS_H #include #include diff --git a/include/sqlpp11/update.h b/include/sqlpp11/update.h index 85991153..12b01fe1 100644 --- a/include/sqlpp11/update.h +++ b/include/sqlpp11/update.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UPDATE_H -#define SQLPP_UPDATE_H +#ifndef SQLPP11_UPDATE_H +#define SQLPP11_UPDATE_H #include #include diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h index a95f434c..f75267d1 100644 --- a/include/sqlpp11/update_list.h +++ b/include/sqlpp11/update_list.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_UPDATE_LIST_H -#define SQLPP_UPDATE_LIST_H +#ifndef SQLPP11_UPDATE_LIST_H +#define SQLPP11_UPDATE_LIST_H #include #include @@ -172,10 +172,9 @@ namespace sqlpp assert_update_set_no_duplicates_t>, static_check_t::value...>::value, assert_update_set_allowed_t>, - static_check_t< - sizeof...(Assignments) == 0 or - detail::make_joined_set_t::type>...>::size::value == 1, - assert_update_set_single_table_t>>; + static_check_t::type>...>::size::value == 1, + assert_update_set_single_table_t>>; template struct check_update_static_set diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h index 6586f011..1fa74538 100644 --- a/include/sqlpp11/using.h +++ b/include/sqlpp11/using.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_USING_H -#define SQLPP_USING_H +#ifndef SQLPP11_USING_H +#define SQLPP11_USING_H #include #include diff --git a/include/sqlpp11/value.h b/include/sqlpp11/value.h index 0df9a34b..42c7a1aa 100644 --- a/include/sqlpp11/value.h +++ b/include/sqlpp11/value.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VALUE_H -#define SQLPP_VALUE_H +#ifndef SQLPP11_VALUE_H +#define SQLPP11_VALUE_H #include diff --git a/include/sqlpp11/value_or_null.h b/include/sqlpp11/value_or_null.h index 39fd217b..d9d45c68 100644 --- a/include/sqlpp11/value_or_null.h +++ b/include/sqlpp11/value_or_null.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VALUE_OR_NULL_H -#define SQLPP_VALUE_OR_NULL_H +#ifndef SQLPP11_VALUE_OR_NULL_H +#define SQLPP11_VALUE_OR_NULL_H #include #include diff --git a/include/sqlpp11/value_type.h b/include/sqlpp11/value_type.h index d7c60726..ccf04109 100644 --- a/include/sqlpp11/value_type.h +++ b/include/sqlpp11/value_type.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VALUE_TYPE_H -#define SQLPP_VALUE_TYPE_H +#ifndef SQLPP11_VALUE_TYPE_H +#define SQLPP11_VALUE_TYPE_H #include #include diff --git a/include/sqlpp11/value_type_fwd.h b/include/sqlpp11/value_type_fwd.h index 9c3a641b..a3e4bb34 100644 --- a/include/sqlpp11/value_type_fwd.h +++ b/include/sqlpp11/value_type_fwd.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VALUE_TYPE_FWD_H -#define SQLPP_VALUE_TYPE_FWD_H +#ifndef SQLPP11_VALUE_TYPE_FWD_H +#define SQLPP11_VALUE_TYPE_FWD_H #include diff --git a/include/sqlpp11/verbatim.h b/include/sqlpp11/verbatim.h index 4a25f102..3bb61a68 100644 --- a/include/sqlpp11/verbatim.h +++ b/include/sqlpp11/verbatim.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VERBATIM_H -#define SQLPP_VERBATIM_H +#ifndef SQLPP11_VERBATIM_H +#define SQLPP11_VERBATIM_H #include #include diff --git a/include/sqlpp11/verbatim_table.h b/include/sqlpp11/verbatim_table.h index 2839e4ce..7c7ac713 100644 --- a/include/sqlpp11/verbatim_table.h +++ b/include/sqlpp11/verbatim_table.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_VERBATIM_TABLE_H -#define SQLPP_VERBATIM_TABLE_H +#ifndef SQLPP11_VERBATIM_TABLE_H +#define SQLPP11_VERBATIM_TABLE_H #include #include diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h index 516841e7..c3792983 100644 --- a/include/sqlpp11/where.h +++ b/include/sqlpp11/where.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_WHERE_H -#define SQLPP_WHERE_H +#ifndef SQLPP11_WHERE_H +#define SQLPP11_WHERE_H #include #include diff --git a/include/sqlpp11/with.h b/include/sqlpp11/with.h index a9880af3..92c545b6 100644 --- a/include/sqlpp11/with.h +++ b/include/sqlpp11/with.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_WITH_H -#define SQLPP_WITH_H +#ifndef SQLPP11_WITH_H +#define SQLPP11_WITH_H #include #include diff --git a/include/sqlpp11/without_table_check.h b/include/sqlpp11/without_table_check.h index 82051860..5ed744ad 100644 --- a/include/sqlpp11/without_table_check.h +++ b/include/sqlpp11/without_table_check.h @@ -1,3 +1,6 @@ +#ifndef SQLPP11_WITHOUT_TABLE_CHECK_H +#define SQLPP11_WITHOUT_TABLE_CHECK_H + /* * Copyright (c) 2016-2016, Roland Bock * All rights reserved. @@ -65,3 +68,5 @@ namespace sqlpp } #endif + +#endif diff --git a/include/sqlpp11/wrap_operand.h b/include/sqlpp11/wrap_operand.h index 9cbf5929..0ad7085f 100644 --- a/include/sqlpp11/wrap_operand.h +++ b/include/sqlpp11/wrap_operand.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_DETAIL_WRAP_OPERAND_H -#define SQLPP_DETAIL_WRAP_OPERAND_H +#ifndef SQLPP11_WRAP_OPERAND_H +#define SQLPP11_WRAP_OPERAND_H namespace sqlpp { diff --git a/include/sqlpp11/wrong.h b/include/sqlpp11/wrong.h index 5eff23e6..05226646 100644 --- a/include/sqlpp11/wrong.h +++ b/include/sqlpp11/wrong.h @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SQLPP_WRONG_H -#define SQLPP_WRONG_H +#ifndef SQLPP11_WRONG_H +#define SQLPP11_WRONG_H #include