From 5845175972ea1d35dc90d4d58a3709c7d52f629f Mon Sep 17 00:00:00 2001
From: Oliver Heidmann <oliver.heidmann@mpimet.mpg.de>
Date: Mon, 20 Jan 2025 10:46:12 +0100
Subject: [PATCH] fixed shadow warning for function argument optarg
---
src/datetime.cc | 12 ++++++------
src/datetime.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/datetime.cc b/src/datetime.cc
index e82cf5cae..e260cc719 100644
--- a/src/datetime.cc
+++ b/src/datetime.cc
@@ -37,18 +37,18 @@ time_units_cstr(TimeUnits timeUnit)
}
void
-set_timestat_date(const std::string &optarg)
+set_timestat_date(const std::string &p_optarg)
{
TimeStat timestatdate = TimeStat::UNDEF;
// clang-format off
- if (optarg == "first") timestatdate = TimeStat::FIRST;
- else if (optarg == "last") timestatdate = TimeStat::LAST;
- else if (optarg == "middle") timestatdate = TimeStat::MEAN;
- else if (optarg == "midhigh") timestatdate = TimeStat::MIDHIGH;
+ if (p_optarg == "first") timestatdate = TimeStat::FIRST;
+ else if (p_optarg == "last") timestatdate = TimeStat::LAST;
+ else if (p_optarg == "middle") timestatdate = TimeStat::MEAN;
+ else if (p_optarg == "midhigh") timestatdate = TimeStat::MIDHIGH;
// clang-format on
- if (timestatdate == TimeStat::UNDEF) cdo_abort("option --%s: unsupported argument: %s", "timestat_date", optarg);
+ if (timestatdate == TimeStat::UNDEF) cdo_abort("option --%s: unsupported argument: %s", "timestat_date", p_optarg);
CDO_Timestat_Date = timestatdate;
}
diff --git a/src/datetime.h b/src/datetime.h
index ec510c7de..61cda014e 100644
--- a/src/datetime.h
+++ b/src/datetime.h
@@ -111,7 +111,7 @@ private:
};
CdiDateTime datetime_avg(int calendar, int ndates, const std::vector<CdiDateTime> &cdiDateTimes);
-void set_timestat_date(const std::string &optarg);
+void set_timestat_date(const std::string &p_optarg);
void adjust_month_and_year(int &month, int &year);
--
GitLab