Merge pull request #991 from FireDaemon/issues/rename_serializator

finish_macros.h must be included last

Author: fnc12

include/sqlite_orm/sqlite_orm.h

@@ -18552,50 +18552,38 @@ namespace sqlite_orm {
 }
 #pragma once
 
-#if defined(_MSC_VER)
-#if defined(__RESTORE_MIN__)
-__pragma(pop_macro("min"))
-#undef __RESTORE_MIN__
-#endif
-#if defined(__RESTORE_MAX__)
-    __pragma(pop_macro("max"))
-#undef __RESTORE_MAX__
-#endif
-#endif  // defined(_MSC_VER)
-#pragma once
-
 #include <tuple>  //  std::tuple
 #include <utility>  //  std::pair
 #include <functional>  //  std::reference_wrapper
 #ifdef SQLITE_ORM_OPTIONAL_SUPPORTED
 #include <optional>  // std::optional
 #endif  // SQLITE_ORM_OPTIONAL_SUPPORTED
 
-    // #include "conditions.h"
+// #include "conditions.h"
 
-    // #include "operators.h"
+// #include "operators.h"
 
-    // #include "select_constraints.h"
+// #include "select_constraints.h"
 
-    // #include "prepared_statement.h"
+// #include "prepared_statement.h"
 
-    // #include "optional_container.h"
+// #include "optional_container.h"
 
-    // #include "core_functions.h"
+// #include "core_functions.h"
 
-    // #include "function.h"
+// #include "function.h"
 
-    // #include "ast/excluded.h"
+// #include "ast/excluded.h"
 
-    // #include "ast/upsert_clause.h"
+// #include "ast/upsert_clause.h"
 
-    // #include "ast/where.h"
+// #include "ast/where.h"
 
-    // #include "ast/into.h"
+// #include "ast/into.h"
 
-    // #include "ast/group_by.h"
+// #include "ast/group_by.h"
 
-    namespace sqlite_orm {
+namespace sqlite_orm {
 
     namespace internal {
 
@@ -19659,3 +19647,16 @@ namespace sqlite_orm {
 
     }
 }
+
+#pragma once
+
+#if defined(_MSC_VER)
+#if defined(__RESTORE_MIN__)
+__pragma(pop_macro("min"))
+#undef __RESTORE_MIN__
+#endif
+#if defined(__RESTORE_MAX__)
+    __pragma(pop_macro("max"))
+#undef __RESTORE_MAX__
+#endif
+#endif  // defined(_MSC_VER)

not_single_header_include/sqlite_orm/sqlite_orm.h

@@ -38,9 +38,9 @@
 #include "../../dev/storage_impl.h"
 #include "../../dev/default_value_extractor.h"
 #include "../../dev/storage.h"
-#include "../../dev/finish_macros.h"
 #include "../../dev/node_tuple.h"
 #include "../../dev/get_prepared_statement.h"
 #include "../../dev/carray.h"
 #include "../../dev/dbstat.h"
 #include "../../dev/interface_definitions.h"
+#include "../../dev/finish_macros.h"

third_party/amalgamate/config.json

@@ -40,12 +40,12 @@
     "dev/storage_impl.h",
     "dev/default_value_extractor.h",
     "dev/storage.h",
-    "dev/finish_macros.h",
     "dev/node_tuple.h",
     "dev/get_prepared_statement.h",
     "dev/carray.h",
     "dev/dbstat.h",
-    "dev/interface_definitions.h"
+    "dev/interface_definitions.h",
+    "dev/finish_macros.h"
   ],
 	"include_paths": ["dev"]
 }