From 8c1f0f4cb228ccc76cb27216fa3de220abd7254e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 11 Oct 2018 13:11:31 +0200 Subject: [PATCH] [shared] Fix StorageExpressionModel: inherits from Record --- apps/shared/storage_expression_model.cpp | 4 ++-- apps/shared/storage_function.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/shared/storage_expression_model.cpp b/apps/shared/storage_expression_model.cpp index a7e1c7e53..4de1940ef 100644 --- a/apps/shared/storage_expression_model.cpp +++ b/apps/shared/storage_expression_model.cpp @@ -53,7 +53,7 @@ bool StorageExpressionModel::isDefined() { } bool StorageExpressionModel::isEmpty() { - return record().value().size == 0; + return value().size == 0; } void StorageExpressionModel::tidy() { @@ -83,7 +83,7 @@ Ion::Storage::Record::ErrorStatus StorageExpressionModel::setExpressionContent(E newData.size = metaDataSize() + expressionToStoreSize; // Set the data - Ion::Storage::Record::ErrorStatus error = record().setValue(newData); + Ion::Storage::Record::ErrorStatus error = setValue(newData); if (error != Ion::Storage::Record::ErrorStatus::None) { assert(error == Ion::Storage::Record::ErrorStatus::NotEnoughSpaceAvailable); return error; diff --git a/apps/shared/storage_function.cpp b/apps/shared/storage_function.cpp index ac980af51..848c45db2 100644 --- a/apps/shared/storage_function.cpp +++ b/apps/shared/storage_function.cpp @@ -9,8 +9,8 @@ using namespace Poincare; namespace Shared { uint32_t StorageFunction::checksum() { - assert(!record().isNull()); - return record().checksum(); + assert(!isNull()); + return checksum(); } bool StorageFunction::isActive() const { @@ -36,7 +36,7 @@ T StorageFunction::templatedApproximateAtAbscissa(T x, Poincare::Context * conte } StorageFunction::FunctionRecordData * StorageFunction::recordData() const { - assert(!record().isNull()); + assert(!isNull()); Ion::Storage::Record::Data d = value(); return reinterpret_cast(const_cast(d.buffer)); }