From 20945f7802826991f10bd455e2fddd5449f0c983 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Mon, 27 Dec 2010 10:01:28 +0100 Subject: [PATCH] moved StatusTypeNames to .cpp --- pvDataApp/Makefile | 1 + pvDataApp/misc/status.cpp | 13 +++++++++++++ pvDataApp/misc/status.h | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pvDataApp/misc/status.cpp diff --git a/pvDataApp/Makefile b/pvDataApp/Makefile index 8b5bc4b..7a0b54a 100644 --- a/pvDataApp/Makefile +++ b/pvDataApp/Makefile @@ -41,6 +41,7 @@ LIBSRCS += timeFunction.cpp LIBSRCS += timer.cpp LIBSRCS += queueVoid.cpp LIBSRCS += messageQueue.cpp +LIBSRCS += status.cpp LIBSRCS += StatusCreateFactory.cpp SRC_DIRS += $(PVDATA)/pv diff --git a/pvDataApp/misc/status.cpp b/pvDataApp/misc/status.cpp new file mode 100644 index 0000000..ba6a532 --- /dev/null +++ b/pvDataApp/misc/status.cpp @@ -0,0 +1,13 @@ +/*pvData.cpp*/ +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ +#include + +namespace epics { namespace pvData { + +const char* StatusTypeName[] = { "OK", "WARNING", "ERROR", "FATAL" }; + +}} \ No newline at end of file diff --git a/pvDataApp/misc/status.h b/pvDataApp/misc/status.h index f496f9c..ac88074 100644 --- a/pvDataApp/misc/status.h +++ b/pvDataApp/misc/status.h @@ -27,7 +27,7 @@ namespace epics { namespace pvData { STATUSTYPE_FATAL }; - const char* StatusTypeName[] = { "OK", "WARNING", "ERROR", "FATAL" }; + extern const char* StatusTypeName[]; /** * Status interface.