Skip to content

Commit dbc06c1

Browse files
committed
ScalarAlarmSupport::AlarmRange now declares an enum
Remove the unused private field by that name. Make prevAlarmRange use that enum.
1 parent f207e51 commit dbc06c1

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/pv/scalarAlarmSupport.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ class epicsShareClass ScalarAlarmSupport :
5252
/**
5353
* @brief Honors scalarAlarm fields.
5454
*
55-
*
56-
* @return Returns true is any fields were modified; otherwise false.
55+
* @return true if any fields were modified, otherwise false.
5756
*/
5857
virtual bool process();
5958
/**
@@ -77,20 +76,20 @@ class epicsShareClass ScalarAlarmSupport :
7776
private:
7877

7978
ScalarAlarmSupport(PVRecordPtr const & pvRecord);
80-
enum {
79+
enum AlarmRange {
8180
range_Lolo = 0,
8281
range_Low,
8382
range_Normal,
8483
range_High,
8584
range_Hihi,
8685
range_Invalid,
8786
range_Undefined
88-
} AlarmRange;
87+
};
8988
void setAlarm(
9089
epics::pvData::PVStructurePtr const & pvAlarm,
9190
int alarmRange);
9291
PVRecordPtr pvRecord;
93-
int prevAlarmRange;
92+
enum AlarmRange prevAlarmRange;
9493
epics::pvData::PVScalarPtr pvValue;
9594
epics::pvData::PVStructurePtr pvAlarm;
9695
epics::pvData::PVStructurePtr pvScalarAlarm;

src/support/scalarAlarmSupport.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ bool ScalarAlarmSupport::process()
110110
double highWarningLimit = pvHighWarningLimit->get();
111111
double highAlarmLimit = pvHighAlarmLimit->get();
112112
double hysteresis = pvHysteresis->get();
113-
int alarmRange = range_Normal;
113+
enum AlarmRange alarmRange = range_Normal;
114114
if(highAlarmLimit>lowAlarmLimit) {
115115
if(value>=highAlarmLimit
116116
||(prevAlarmRange==range_Hihi && value>=highAlarmLimit-hysteresis)) {

0 commit comments

Comments
 (0)