From e0bc9f29a184e67d0bab5ebc69ece53c7ea4953a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= Date: Wed, 20 Sep 2023 16:30:02 +0200 Subject: [PATCH] Remove warnings about unused parameters (-Wunused-parameter) --- mex/sources/libkorder/kord/approximation.cc | 4 ++-- mex/sources/libkorder/kord/decision_rule.hh | 4 ++-- mex/sources/libkorder/sylv/GeneralMatrix.cc | 13 +++++++------ mex/sources/libkorder/sylv/QuasiTriangular.cc | 2 +- mex/sources/libkorder/sylv/QuasiTriangularZero.cc | 6 +++--- mex/sources/libkorder/tl/equivalence.cc | 2 +- mex/sources/libkorder/tl/ps_tensor.cc | 2 +- mex/sources/libkorder/tl/pyramid_prod2.hh | 6 +++--- mex/sources/ms-sbvar/mex_top_level.cc | 4 ++-- mex/sources/ms-sbvar/modify_for_mex.cc | 4 ++-- 10 files changed, 24 insertions(+), 23 deletions(-) diff --git a/mex/sources/libkorder/kord/approximation.cc b/mex/sources/libkorder/kord/approximation.cc index d07a333e5..ffb4abfe7 100644 --- a/mex/sources/libkorder/kord/approximation.cc +++ b/mex/sources/libkorder/kord/approximation.cc @@ -174,7 +174,7 @@ Approximation::walkStochSteady() we save the steady state to ‘ss’. The new steady is also put to model.getSteady(). */ DRFixPoint fp(*rule_ders, ypart, model.getSteady(), dsigma); - bool converged = fp.calcFixPoint(DecisionRule::emethod::horner, model.getSteady()); + bool converged = fp.calcFixPoint(model.getSteady()); JournalRecord rec(journal); rec << "Fix point calcs: iter=" << fp.getNumIter() << ", newton_iter=" << fp.getNewtonTotalIter() << ", last_newton_iter=" << fp.getNewtonLastIter() << "."; @@ -233,7 +233,7 @@ Approximation::walkStochSteady() { // centralize decision rule for zero steps DRFixPoint fp(*rule_ders, ypart, model.getSteady(), 1.0); - bool converged = fp.calcFixPoint(DecisionRule::emethod::horner, model.getSteady()); + bool converged = fp.calcFixPoint(model.getSteady()); JournalRecord rec(journal); rec << "Fix point calcs: iter=" << fp.getNumIter() << ", newton_iter=" << fp.getNewtonTotalIter() << ", last_newton_iter=" << fp.getNewtonLastIter() << "."; diff --git a/mex/sources/libkorder/kord/decision_rule.hh b/mex/sources/libkorder/kord/decision_rule.hh index c2ec0d3cd..214c15d6c 100644 --- a/mex/sources/libkorder/kord/decision_rule.hh +++ b/mex/sources/libkorder/kord/decision_rule.hh @@ -523,7 +523,7 @@ public: DRFixPoint(const _Tg &g, const PartitionY &yp, const Vector &ys, double sigma); - bool calcFixPoint(emethod em, Vector &out); + bool calcFixPoint(Vector &out); int getNumIter() const @@ -685,7 +685,7 @@ DRFixPoint::solveNewton(Vector &y) template bool -DRFixPoint::calcFixPoint(emethod em, Vector &out) +DRFixPoint::calcFixPoint(Vector &out) { KORD_RAISE_IF(out.length() != ypart.ny(), "Wrong length of out in DRFixPoint::calcFixPoint"); diff --git a/mex/sources/libkorder/sylv/GeneralMatrix.cc b/mex/sources/libkorder/sylv/GeneralMatrix.cc index c238ebc62..65a84893c 100644 --- a/mex/sources/libkorder/sylv/GeneralMatrix.cc +++ b/mex/sources/libkorder/sylv/GeneralMatrix.cc @@ -1,6 +1,6 @@ /* * Copyright © 2004-2011 Ondra Kamenik - * Copyright © 2019-2022 Dynare Team + * Copyright © 2019-2023 Dynare Team * * This file is part of Dynare. * @@ -113,21 +113,22 @@ GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, const ConstGeneralMatrix void GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, const ConstGeneralMatrix &b, - const std::string &dum, double mult) + [[maybe_unused]] const std::string &dum, double mult) { gemm("N", a, "T", b, mult, 1.0); } void -GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, const std::string &dum, +GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, [[maybe_unused]] const std::string &dum, const ConstGeneralMatrix &b, double mult) { gemm("T", a, "N", b, mult, 1.0); } void -GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, const std::string &dum1, - const ConstGeneralMatrix &b, const std::string &dum2, double mult) +GeneralMatrix::multAndAdd(const ConstGeneralMatrix &a, [[maybe_unused]] const std::string &dum1, + const ConstGeneralMatrix &b, [[maybe_unused]] const std::string &dum2, + double mult) { gemm("T", a, "T", b, mult, 1.0); } @@ -242,7 +243,7 @@ GeneralMatrix::add(double a, const ConstGeneralMatrix &m) } void -GeneralMatrix::add(double a, const ConstGeneralMatrix &m, const std::string &dum) +GeneralMatrix::add(double a, const ConstGeneralMatrix &m, [[maybe_unused]] const std::string &dum) { if (m.nrows() != cols || m.ncols() != rows) throw SYLV_MES_EXCEPTION("Matrix has different size in GeneralMatrix::add."); diff --git a/mex/sources/libkorder/sylv/QuasiTriangular.cc b/mex/sources/libkorder/sylv/QuasiTriangular.cc index a4fda4366..7923bb1a3 100644 --- a/mex/sources/libkorder/sylv/QuasiTriangular.cc +++ b/mex/sources/libkorder/sylv/QuasiTriangular.cc @@ -421,7 +421,7 @@ QuasiTriangular::QuasiTriangular(const ConstVector &d, int d_size) { } -QuasiTriangular::QuasiTriangular(const std::string &dummy, const QuasiTriangular &t) +QuasiTriangular::QuasiTriangular([[maybe_unused]] const std::string &dummy, const QuasiTriangular &t) : SqSylvMatrix(t.nrows()), diagonal(getData().base(), t.diagonal) { Vector aux(t.getData()); diff --git a/mex/sources/libkorder/sylv/QuasiTriangularZero.cc b/mex/sources/libkorder/sylv/QuasiTriangularZero.cc index 294459fb9..c093e857f 100644 --- a/mex/sources/libkorder/sylv/QuasiTriangularZero.cc +++ b/mex/sources/libkorder/sylv/QuasiTriangularZero.cc @@ -1,6 +1,6 @@ /* * Copyright © 2004-2011 Ondra Kamenik - * Copyright © 2019 Dynare Team + * Copyright © 2019-2023 Dynare Team * * This file is part of Dynare. * @@ -157,13 +157,13 @@ QuasiTriangularZero::print() const } void -QuasiTriangularZero::multKron(KronVector &x) const +QuasiTriangularZero::multKron([[maybe_unused]] KronVector &x) const { throw SYLV_MES_EXCEPTION("Attempt to run QuasiTriangularZero::multKron."); } void -QuasiTriangularZero::multKronTrans(KronVector &x) const +QuasiTriangularZero::multKronTrans([[maybe_unused]] KronVector &x) const { throw SYLV_MES_EXCEPTION("Attempt to run QuasiTriangularZero::multKronTrans."); } diff --git a/mex/sources/libkorder/tl/equivalence.cc b/mex/sources/libkorder/tl/equivalence.cc index 45ebc3d47..b60759401 100644 --- a/mex/sources/libkorder/tl/equivalence.cc +++ b/mex/sources/libkorder/tl/equivalence.cc @@ -130,7 +130,7 @@ Equivalence::Equivalence(int num) } } -Equivalence::Equivalence(int num, const std::string &dummy) +Equivalence::Equivalence(int num, [[maybe_unused]] const std::string &dummy) : n(num) { OrdSequence s; diff --git a/mex/sources/libkorder/tl/ps_tensor.cc b/mex/sources/libkorder/tl/ps_tensor.cc index cb8704763..5c1322cd7 100644 --- a/mex/sources/libkorder/tl/ps_tensor.cc +++ b/mex/sources/libkorder/tl/ps_tensor.cc @@ -327,7 +327,7 @@ FPSTensor::increment(IntSequence &v) const } void -FPSTensor::decrement(IntSequence &v) const +FPSTensor::decrement([[maybe_unused]] IntSequence &v) const { TL_RAISE("FPSTensor::decrement not implemented"); } diff --git a/mex/sources/libkorder/tl/pyramid_prod2.hh b/mex/sources/libkorder/tl/pyramid_prod2.hh index f316e304b..f20085c92 100644 --- a/mex/sources/libkorder/tl/pyramid_prod2.hh +++ b/mex/sources/libkorder/tl/pyramid_prod2.hh @@ -1,6 +1,6 @@ /* * Copyright © 2004 Ondra Kamenik - * Copyright © 2019 Dynare Team + * Copyright © 2019-2023 Dynare Team * * This file is part of Dynare. * @@ -141,12 +141,12 @@ public: header.increment(v); } void - decrement(IntSequence &v) const override + decrement([[maybe_unused]] IntSequence &v) const override { TL_RAISE("Not implemented error in IrregTensor::decrement"); } int - getOffset(const IntSequence &v) const override + getOffset([[maybe_unused]] const IntSequence &v) const override { TL_RAISE("Not implemented error in IrregTensor::getOffset"); } diff --git a/mex/sources/ms-sbvar/mex_top_level.cc b/mex/sources/ms-sbvar/mex_top_level.cc index 0db65d833..d994a37ee 100644 --- a/mex/sources/ms-sbvar/mex_top_level.cc +++ b/mex/sources/ms-sbvar/mex_top_level.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2010-2020 Dynare Team + * Copyright © 2010-2023 Dynare Team * * This file is part of Dynare. * @@ -27,7 +27,7 @@ int main(int nargs, char **args); void -mexFunction(int nlhs, mxArray *plhs[], +mexFunction(int nlhs, [[maybe_unused]] mxArray *plhs[], int nrhs, const mxArray *prhs[]) { int nargs = 0; diff --git a/mex/sources/ms-sbvar/modify_for_mex.cc b/mex/sources/ms-sbvar/modify_for_mex.cc index f9acd4e29..43d49a4ea 100644 --- a/mex/sources/ms-sbvar/modify_for_mex.cc +++ b/mex/sources/ms-sbvar/modify_for_mex.cc @@ -1,5 +1,5 @@ /* - * Copyright © 2010-2013 Dynare Team + * Copyright © 2010-2023 Dynare Team * * This file is part of Dynare. * @@ -29,7 +29,7 @@ extern "C" int constant_seed; void - msExit(int status) + msExit([[maybe_unused]] int status) { throw "Error in MS-SBVAR MEX file.\n"; }