From 7bfce59442dd76a52fee2d9d942255253ec731c6 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 8 Mar 2021 14:11:54 +0100 Subject: [PATCH 1/1] Use default parameter value instead of having an overload just for that --- src/surf/cpu_cas01.cpp | 5 ----- src/surf/cpu_cas01.hpp | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index 9694417a26..a5148072bc 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -214,11 +214,6 @@ CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double sp model->get_maxmin_system()->expand(constraint, get_variable(), 1.0); } -CpuCas01Action::CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint) - : CpuCas01Action(model, cost, failed, speed, constraint, /* requested_core */ 1) -{ -} - int CpuCas01Action::requested_core() const { return requested_core_; diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index aec4b5d99a..88d382be55 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -64,8 +64,8 @@ class CpuCas01Action : public CpuAction { friend CpuAction* CpuCas01::sleep(double duration); public: - CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int core_count); - CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint); + CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, + int requested_core = 1); CpuCas01Action(const CpuCas01Action&) = delete; CpuCas01Action& operator=(const CpuCas01Action&) = delete; ~CpuCas01Action() override; -- 2.30.2