Compare commits
4
Commits
7626331866
...
5dae396842
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5dae396842 | ||
|
|
bc1d5effd3 | ||
|
|
340fa5fd28 | ||
|
|
1143710f8d |
+1
-1
@@ -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)
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <sstream>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -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, {columns});
|
return into(tab, std::vector<table_column>{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) {
|
||||||
|
|||||||
@@ -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)) {}
|
||||||
|
|
||||||
long id{};
|
int64_t 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)){}
|
||||||
|
|
||||||
long id{};
|
int64_t id{};
|
||||||
double weight{};
|
double weight{};
|
||||||
object::object_ptr<shipment> delivery;
|
object::object_ptr<shipment> delivery;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user