sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sascha:5dae3968424d78b1f9c146455c3556a58f24dbf5
Branches Tags
sascha:main
sascha:feature/matador-ng
..
compare: sascha:76263318666b9ab2094cc3eae8887b673c65a9ef
Branches Tags
sascha:feature/matador-ng
sascha:main

No commits in common. "5dae3968424d78b1f9c146455c3556a58f24dbf5" and "76263318666b9ab2094cc3eae8887b673c65a9ef" have entirely different histories.
5dae396842 ... 7626331866

4 changed files with 4 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -30,7 +30,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(CMAKE_CXX_FLAGS_RELEASE "${GCC_CLANG_COMMON_FLAGS_RELEASE}") set(CMAKE_CXX_FLAGS_RELEASE "${GCC_CLANG_COMMON_FLAGS_RELEASE}")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
message(STATUS "MSVC detected - Adding compiler flags") message(STATUS "MSVC detected - Adding compiler flags")
set(CMAKE_CXX_FLAGS "/W3 /EHsc /bigobj") # set(CMAKE_CXX_FLAGS "/W3 /EHsc /bigobj")
# set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Od /Zi /D_DEBUG /DDEBUG") # set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Od /Zi /D_DEBUG /DDEBUG")
# set(CMAKE_CXX_FLAGS_RELEASE "/O1 /DNDEBUG") # set(CMAKE_CXX_FLAGS_RELEASE "/O1 /DNDEBUG")
add_compile_options(/Zc:preprocessor) add_compile_options(/Zc:preprocessor)

1
include/matador/utils/convert.hpp
View File

@ -9,7 +9,6 @@
#include <cstring> #include <cstring>
#include <iomanip> #include <iomanip>
#include <string> #include <string>
#include <sstream>
#include <type_traits> #include <type_traits>
/* /*

2
source/orm/query/intermediates/query_insert_intermediate.cpp
View File

@ -11,7 +11,7 @@ query_insert_intermediate::query_insert_intermediate() {
} }
query_into_intermediate query_insert_intermediate::into(const table &tab, const std::initializer_list<table_column> columns) { query_into_intermediate query_insert_intermediate::into(const table &tab, const std::initializer_list<table_column> columns) {
return into(tab, std::vector<table_column>{columns}); return into(tab, {columns});
} }
query_into_intermediate query_insert_intermediate::into(const table &tab, const std::vector<table_column> &columns) { query_into_intermediate query_insert_intermediate::into(const table &tab, const std::vector<table_column> &columns) {

4
test/models/shipment.hpp
View File

@ -17,7 +17,7 @@ struct shipment {
shipment(const long id, std::string tracking_number) shipment(const long id, std::string tracking_number)
: id(id), tracking_number(std::move(tracking_number)) {} : id(id), tracking_number(std::move(tracking_number)) {}
int64_t id{}; long id{};
std::string tracking_number; std::string tracking_number;
object::collection<object::object_ptr<package> > packages{}; object::collection<object::object_ptr<package> > packages{};
@ -35,7 +35,7 @@ struct package {
package(const long id, double weight, object::object_ptr<shipment> del) package(const long id, double weight, object::object_ptr<shipment> del)
: id(id), weight(weight), delivery(std::move(del)){} : id(id), weight(weight), delivery(std::move(del)){}
int64_t id{}; long id{};
double weight{}; double weight{};
object::object_ptr<shipment> delivery; object::object_ptr<shipment> delivery;