From 9d8cbe8ce40bec2ae73222883890931230254420 Mon Sep 17 00:00:00 2001 From: Guobao Shen Date: Mon, 26 Sep 2011 15:26:05 -0400 Subject: [PATCH] add severityCount for severityNames --- pvDataApp/property/alarm.cpp | 3 ++- pvDataApp/property/alarm.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pvDataApp/property/alarm.cpp b/pvDataApp/property/alarm.cpp index 372a518..e1befb5 100644 --- a/pvDataApp/property/alarm.cpp +++ b/pvDataApp/property/alarm.cpp @@ -12,7 +12,8 @@ #include namespace epics { namespace pvData { -static String severityNames[4] = +const size_t severityCount = 4; +static String severityNames[severityCount] = { String("none"), String("minor"), diff --git a/pvDataApp/property/alarm.h b/pvDataApp/property/alarm.h index cde8c41..686afdf 100644 --- a/pvDataApp/property/alarm.h +++ b/pvDataApp/property/alarm.h @@ -14,6 +14,7 @@ enum AlarmSeverity { noAlarm,minorAlarm,majorAlarm,invalidAlarm }; +extern const size_t severityCount; class AlarmSeverityFunc { public: static AlarmSeverity getSeverity(int value);