From a1ec6136301aca8f7f2a2fad57bd207c7222afdc Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Wed, 30 Apr 2025 12:11:23 +0100 Subject: [PATCH] Fixed parameter shadowing warnings --- include/etl/private/chrono/year_month_day.h | 22 +++++++++---------- .../etl/private/chrono/year_month_weekday.h | 12 +++++----- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/etl/private/chrono/year_month_day.h b/include/etl/private/chrono/year_month_day.h index 7b60c907..53a14619 100644 --- a/include/etl/private/chrono/year_month_day.h +++ b/include/etl/private/chrono/year_month_day.h @@ -94,8 +94,6 @@ namespace etl //************************************************************************* ETL_CONSTEXPR14 bool ok() const ETL_NOEXCEPT { - private_chrono::days_in_month[m]; - // Check if the year, month, and day are valid individually return y.ok() && m.ok() && @@ -292,10 +290,10 @@ namespace etl //************************************************************************* /// //************************************************************************* - ETL_CONSTEXPR year_month_day_last(const etl::chrono::year& y, - const etl::chrono::month_day_last& mdl) ETL_NOEXCEPT - : y(y) - , m(mdl.month()) + ETL_CONSTEXPR year_month_day_last(const etl::chrono::year& y_, + const etl::chrono::month_day_last& mdl_) ETL_NOEXCEPT + : y(y_) + , m(mdl_.month()) { } @@ -460,19 +458,19 @@ namespace etl [[nodiscard]] friend constexpr auto operator <=>(const etl::chrono::year_month_day_last& lhs, const etl::chrono::year_month_day_last& rhs) ETL_NOEXCEPT { - auto cmp = lhs.year() <=> rhs.year(); + auto cmp1 = lhs.year() <=> rhs.year(); - if (cmp != 0) + if (cmp1 != 0) { - return cmp; + return cmp1; } else { - auto cmp = lhs.month() <=> rhs.month(); + auto cmp2 = lhs.month() <=> rhs.month(); - if (cmp != 0) + if (cmp2 != 0) { - return cmp; + return cmp2; } else { diff --git a/include/etl/private/chrono/year_month_weekday.h b/include/etl/private/chrono/year_month_weekday.h index 03242c6e..b12be805 100644 --- a/include/etl/private/chrono/year_month_weekday.h +++ b/include/etl/private/chrono/year_month_weekday.h @@ -403,19 +403,19 @@ namespace etl [[nodiscard]] friend constexpr auto operator <=>(const etl::chrono::year_month_weekday_last& lhs, const etl::chrono::year_month_weekday_last& rhs) ETL_NOEXCEPT { - auto cmp = lhs.year() <=> rhs.year(); + auto cmp1 = lhs.year() <=> rhs.year(); - if (cmp != 0) + if (cmp1 != 0) { - return cmp; + return cmp1; } else { - auto cmp = lhs.month() <=> rhs.month(); + auto cmp2 = lhs.month() <=> rhs.month(); - if (cmp != 0) + if (cmp2 != 0) { - return cmp; + return cmp2; } else {