ScalarAlarmSupport::AlarmRange now declares an enum

Remove the unused private field by that name. Make prevAlarmRange use that enum.
epics-base · Dec 28, 2023 · dbc06c1 · dbc06c1
1 parent f207e51
commit dbc06c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/pv/scalarAlarmSupport.h b/src/pv/scalarAlarmSupport.h
@@ -52,8 +52,7 @@ class epicsShareClass ScalarAlarmSupport :
     /**
      * @brief Honors scalarAlarm fields.
      *
-     *
-     * @return Returns true is any fields were modified; otherwise false.
+     * @return true if any fields were modified, otherwise false.
      */
     virtual bool process();
     /**
@@ -77,20 +76,20 @@ class epicsShareClass ScalarAlarmSupport :
 private:
 
     ScalarAlarmSupport(PVRecordPtr const & pvRecord);
-    enum {
+    enum AlarmRange {
         range_Lolo = 0,
         range_Low,
         range_Normal,
         range_High,
         range_Hihi,
         range_Invalid,
         range_Undefined
-    } AlarmRange;
+    };
     void setAlarm(
         epics::pvData::PVStructurePtr const & pvAlarm,
         int alarmRange);
     PVRecordPtr pvRecord;
-    int prevAlarmRange;
+    enum AlarmRange prevAlarmRange;
     epics::pvData::PVScalarPtr pvValue;
     epics::pvData::PVStructurePtr pvAlarm;
     epics::pvData::PVStructurePtr pvScalarAlarm;

diff --git a/src/support/scalarAlarmSupport.cpp b/src/support/scalarAlarmSupport.cpp
@@ -110,7 +110,7 @@ bool ScalarAlarmSupport::process()
     double highWarningLimit = pvHighWarningLimit->get();
     double highAlarmLimit = pvHighAlarmLimit->get();
     double hysteresis = pvHysteresis->get();
-    int alarmRange = range_Normal;
+    enum AlarmRange alarmRange = range_Normal;
     if(highAlarmLimit>lowAlarmLimit) {
          if(value>=highAlarmLimit
          ||(prevAlarmRange==range_Hihi && value>=highAlarmLimit-hysteresis)) {