diff --git a/include/orm/tiny/concerns/hasrelationstore.hpp b/include/orm/tiny/concerns/hasrelationstore.hpp index d83017772..38621275a 100644 --- a/include/orm/tiny/concerns/hasrelationstore.hpp +++ b/include/orm/tiny/concerns/hasrelationstore.hpp @@ -258,7 +258,7 @@ namespace Orm::Tiny::Concerns protected: /*! Store type initializer. */ - consteval static RelationStoreType initStoreType(); + constexpr static RelationStoreType initStoreType(); /*! Served store type, this class can handle two store types. */ T_THREAD_LOCAL @@ -653,7 +653,7 @@ namespace Orm::Tiny::Concerns template template - consteval typename + constexpr typename HasRelationStore::RelationStoreType HasRelationStore::QueriesRelationshipsStore ::initStoreType() diff --git a/include/orm/tiny/model.hpp b/include/orm/tiny/model.hpp index 5ad8ec312..032ad3e27 100644 --- a/include/orm/tiny/model.hpp +++ b/include/orm/tiny/model.hpp @@ -291,7 +291,7 @@ namespace Orm::Tiny /*! Qualify the given column name by the model's table. */ QString qualifyColumn(const QString &column) const; /*! Determina whether the Derived Model extends the SoftDeletes. */ - consteval static bool extendsSoftDeletes(); + constexpr static bool extendsSoftDeletes(); /* Data members */ /*! Indicates if the model exists. */ @@ -1390,7 +1390,7 @@ namespace Orm::Tiny } template - consteval bool Model::extendsSoftDeletes() + constexpr bool Model::extendsSoftDeletes() { return std::is_base_of_v, Derived>; } diff --git a/include/orm/tiny/relations/basepivot.hpp b/include/orm/tiny/relations/basepivot.hpp index e115cd13c..9e2c6b6fd 100644 --- a/include/orm/tiny/relations/basepivot.hpp +++ b/include/orm/tiny/relations/basepivot.hpp @@ -77,7 +77,7 @@ namespace Orm::Tiny::Relations PivotModel &setPivotKeys(const QString &foreignKey, const QString &relatedKey); /*! Determine whether the PivotType is a custom pivot. */ - consteval static bool isCustomPivot(); + constexpr static bool isCustomPivot(); protected: /* AsPivot */ @@ -297,7 +297,7 @@ namespace Orm::Tiny::Relations } template - consteval bool BasePivot::isCustomPivot() + constexpr bool BasePivot::isCustomPivot() { return !std::is_same_v; } diff --git a/include/orm/tiny/tinybuilder.hpp b/include/orm/tiny/tinybuilder.hpp index 571b18baf..057346b1a 100644 --- a/include/orm/tiny/tinybuilder.hpp +++ b/include/orm/tiny/tinybuilder.hpp @@ -270,7 +270,7 @@ namespace Orm::Tiny /*! Apply the SoftDeletes where null condition for the deleted_at column. */ Builder &applySoftDeletes(); /*! Determine whether the Model the TinyBuilder manages extends SoftDeletes. */ - consteval static bool extendsSoftDeletes() noexcept; + constexpr static bool extendsSoftDeletes() noexcept; protected: /*! Alias for the Expression. */ @@ -1194,7 +1194,7 @@ namespace Orm::Tiny } template - consteval bool Builder::extendsSoftDeletes() noexcept + constexpr bool Builder::extendsSoftDeletes() noexcept { return m_extendsSoftDeletes; }