From 3d90d9d6ee0356b72cf143df596a3309fc202d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Thu, 6 Feb 2025 22:18:46 +0100 Subject: [PATCH] fixed linux compile --- include/matador/object/attribute_definition_generator.hpp | 2 +- include/matador/utils/convert.hpp | 1 + include/matador/utils/field_attributes.hpp | 2 ++ source/core/object/attribute_definition_generator.cpp | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/matador/object/attribute_definition_generator.hpp b/include/matador/object/attribute_definition_generator.hpp index d8450e3..c256c06 100644 --- a/include/matador/object/attribute_definition_generator.hpp +++ b/include/matador/object/attribute_definition_generator.hpp @@ -72,7 +72,7 @@ public: template < class V > void on_primary_key(const char *, V &x, std::enable_if_t && !std::is_same_v>* = nullptr); void on_primary_key(const char *id, std::string &pk, size_t size); - void on_revision(const char *id, unsigned long long &rev); + void on_revision(const char *id, uint64_t &rev); template void on_attribute(const char *id, Type &x, const utils::field_attributes &attr = utils::null_attributes); diff --git a/include/matador/utils/convert.hpp b/include/matador/utils/convert.hpp index aad4647..ea3e3d0 100644 --- a/include/matador/utils/convert.hpp +++ b/include/matador/utils/convert.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/include/matador/utils/field_attributes.hpp b/include/matador/utils/field_attributes.hpp index 6fe6a1d..678e071 100644 --- a/include/matador/utils/field_attributes.hpp +++ b/include/matador/utils/field_attributes.hpp @@ -3,6 +3,8 @@ #include "matador/utils/constraints.hpp" +#include + namespace matador::utils { /** diff --git a/source/core/object/attribute_definition_generator.cpp b/source/core/object/attribute_definition_generator.cpp index 9ab87bb..9f040a7 100644 --- a/source/core/object/attribute_definition_generator.cpp +++ b/source/core/object/attribute_definition_generator.cpp @@ -13,9 +13,9 @@ void attribute_definition_generator::on_primary_key(const char *id, std::string on_attribute(id, pk, { size, utils::constraints::PRIMARY_KEY }); } -void attribute_definition_generator::on_revision(const char *id, unsigned long long int &x) +void attribute_definition_generator::on_revision(const char *id, uint64_t &rev) { - on_attribute(id, x); + on_attribute(id, rev); } std::pair attribute_definition_generator::determine_foreign_ref(const std::type_index &ti)