From fba03516e3b15871a6be931e98443408f4cfdeb6 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 31 Dec 2024 13:00:55 +0100 Subject: [PATCH] use a pair --- .../parts/short-term-storage/AdditionalConstraints.h | 8 +------- .../parts/short-term-storage/AdditionalConstraints.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraints.h b/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraints.h index de800f5ac0..e202ddbf75 100644 --- a/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraints.h +++ b/src/libs/antares/study/include/antares/study/parts/short-term-storage/AdditionalConstraints.h @@ -47,13 +47,7 @@ struct AdditionalConstraints std::vector constraints; - struct ValidateResult - { - bool ok; - std::string error_msg; - }; - - ValidateResult validate() const; + std::pair validate() const; private: bool isValidVariable() const; diff --git a/src/libs/antares/study/parts/short-term-storage/AdditionalConstraints.cpp b/src/libs/antares/study/parts/short-term-storage/AdditionalConstraints.cpp index c16b35bef2..e6b9920706 100644 --- a/src/libs/antares/study/parts/short-term-storage/AdditionalConstraints.cpp +++ b/src/libs/antares/study/parts/short-term-storage/AdditionalConstraints.cpp @@ -18,13 +18,15 @@ ** You should have received a copy of the Mozilla Public Licence 2.0 ** along with Antares_Simulator. If not, see . */ -#include "antares/study/parts/short-term-storage/AdditionalConstraints.h" #include +#include "antares/study/parts/short-term-storage/AdditionalConstraints.h" + namespace Antares::Data::ShortTermStorage { -AdditionalConstraints::ValidateResult AdditionalConstraints::validate() const + +std::pair AdditionalConstraints::validate() const { if (cluster_id.empty()) {