Skip to content

Commit 1571c90

Browse files
committed
fix some minor switch/case issues in TimeMgr, IOStream
- to eliminate some compiler warnings
1 parent 116bfb3 commit 1571c90

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

components/omega/src/infra/IOStream.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,6 @@ int IOStream::readFieldData(
22782278
LOG_ERROR("Invalid data type while reading field {} for stream {}",
22792279
FieldName, Name);
22802280
return Fail;
2281-
break;
22822281

22832282
} // end switch data type
22842283

components/omega/src/infra/TimeMgr.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,9 +1220,8 @@ Calendar::Calendar(CalendarKind InCalKind) { // [in] calendar type
12201220

12211221
case CalendarCustom:
12221222
// custom requires more info, so separate interface should be used
1223-
LOG_ERROR(
1223+
ABORT_ERROR(
12241224
"TimeMgr: Must use custom constructor for custom calendar type");
1225-
break;
12261225

12271226
default:
12281227
// unknown calendar kind, invalidate and abort with error
@@ -1350,17 +1349,14 @@ bool Calendar::isLeapYear(I8 Year // [in] a calendar year
13501349
case CalendarGregorian:
13511350
// leap year is divisible by 400 or divisible by 4 and not 100.
13521351
return (Year % 400 == 0) || ((Year % 4 == 0) && (Year % 100 != 0));
1353-
break;
13541352

13551353
case CalendarJulian:
13561354
// leap year is divisible by 4.
13571355
return Year % 4 == 0;
1358-
break;
13591356

13601357
default:
13611358
// all other calendars don't have leap years.
13621359
return false;
1363-
break;
13641360
} // end switch CalKind
13651361

13661362
} // end Calendar::isLeapYear
@@ -1391,7 +1387,7 @@ TimeFrac Calendar::getElapsedTime(
13911387

13921388
// Check that calendar has been defined
13931389
if (!isDefined())
1394-
LOG_CRITICAL("TimeMgr: Cannot get elapsed time - calendar not defined");
1390+
ABORT_ERROR("TimeMgr: Cannot get elapsed time - calendar not defined");
13951391

13961392
// Branch on calendar type for actual calculation
13971393
switch (Calendar::OmegaCal->CalKind) {

0 commit comments

Comments
 (0)