Skip to content
Snippets Groups Projects
Commit d578123a authored by Oliver Heidmann's avatar Oliver Heidmann
Browse files

renamed Filltype FILE to fix compiler warning -wshadow

parent 40cffafc
No related branches found
No related tags found
No related merge requests found
......@@ -51,7 +51,7 @@ class ModuleArith
TS,
VAR,
VARTS,
FILE
ALL_TIMESTEPS
};
FillType fillType{ FillType::NONE };
int nlevels2 = 1;
......@@ -266,7 +266,7 @@ public:
nrecs = cdo_stream_inq_timestep(streamID1, tsID);
nrecs2 = 0;
if (tsID == 0 || fillType == FillType::NONE || fillType == FillType::FILE || fillType == FillType::VARTS)
if (tsID == 0 || fillType == FillType::NONE || fillType == FillType::ALL_TIMESTEPS || fillType == FillType::VARTS)
{
nrecs2 = cdo_stream_inq_timestep(streamID2, tsID2);
if (nrecs2 == 0)
......@@ -275,11 +275,11 @@ public:
if (fillType == FillType::NONE && streamID2x == streamID2)
{
fillType = FillType::FILE;
fillType = FillType::ALL_TIMESTEPS;
cdo_print("Filling up stream2 >%s< by copying all timesteps.", cdo_get_stream_name(1));
}
if (fillType == FillType::FILE)
if (fillType == FillType::ALL_TIMESTEPS)
{
cdo_stream_close(streamID2);
......@@ -329,7 +329,7 @@ public:
auto varID2 = varID;
if (tsID == 0 || fillType == FillType::NONE || fillType == FillType::FILE || fillType == FillType::VARTS)
if (tsID == 0 || fillType == FillType::NONE || fillType == FillType::ALL_TIMESTEPS || fillType == FillType::VARTS)
{
auto lstatus = (nlevels2 > 1) ? (varID == 0) : (recID == 0);
if (lstatus || (fillType != FillType::VAR && fillType != FillType::VARTS))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment