Skip to content

Commit 07d26de

Browse files
committed
Fix gcc compiler error about enum scope
1 parent db0b00d commit 07d26de

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

core/src/G3Timestream.cxx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,13 @@ template <class A> void G3Timestream::save(A &ar, unsigned v) const
203203
}
204204
}
205205
}
206-
nanflag = SomeNan;
206+
nanflag = FLACNaNFlag::SomeNan;
207207
if (nans == 0)
208-
nanflag = NoNan;
208+
nanflag = FLACNaNFlag::NoNan;
209209
else if (nans == size())
210-
nanflag = AllNan;
210+
nanflag = FLACNaNFlag::AllNan;
211211
ar & cereal::make_nvp("nanflag", nanflag);
212-
if (nanflag == SomeNan)
212+
if (nanflag == FLACNaNFlag::SomeNan)
213213
ar & cereal::make_nvp("nanmask", nanbuf);
214214

215215
// Now do FLAC encoding
@@ -278,10 +278,10 @@ unpack_flac(const std::vector<int32_t> &buf, uint8_t nanflag, const std::vector<
278278
(*data)[i] = buf[i];
279279

280280
// Apply NaN mask
281-
if (nanflag == AllNan) {
281+
if (nanflag == FLACNaNFlag::AllNan) {
282282
for (size_t i = 0; i < buf.size(); i++)
283283
(*data)[i] = NAN;
284-
} else if (nanflag == SomeNan) {
284+
} else if (nanflag == FLACNaNFlag::SomeNan) {
285285
for (size_t i = 0; i < buf.size(); i++)
286286
if (nanbuf[i])
287287
(*data)[i] = NAN;
@@ -332,7 +332,7 @@ template <class A> void G3Timestream::load(A &ar, unsigned v)
332332
}
333333

334334
ar & cereal::make_nvp("nanflag", nanflag);
335-
if (nanflag == SomeNan)
335+
if (nanflag == FLACNaNFlag::SomeNan)
336336
ar & cereal::make_nvp("nanmask", nanbuf);
337337

338338
ar & cereal::make_size_tag(callback.nbytes);

0 commit comments

Comments
 (0)