CMakeLists.txt

@@ -30,7 +30,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   set(CMAKE_CXX_FLAGS_RELEASE "${GCC_CLANG_COMMON_FLAGS_RELEASE}")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   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_RELEASE "/O1 /DNDEBUG")
   add_compile_options(/Zc:preprocessor)

include/matador/utils/convert.hpp

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

source/orm/query/intermediates/query_insert_intermediate.cpp

@@ -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) {
-  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) {

test/models/shipment.hpp

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