From 8a7b9d776fec4c031edc15aa882b6fec73c21146 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 12 Jul 2017 13:13:44 +0200 Subject: [PATCH] requester.h moves to pvAccessCPP --- src/misc/Makefile | 2 - src/misc/pv/requester.h | 71 ----------------------------- src/misc/requester.cpp | 44 ------------------ testApp/property/testProperty.cpp | 1 - testApp/pv/testBitSetUtil.cpp | 1 - testApp/pv/testConvert.cpp | 1 - testApp/pv/testIntrospect.cpp | 1 - testApp/pv/testPVData.cpp | 1 - testApp/pv/testPVScalarArray.cpp | 1 - testApp/pv/testPVStructureArray.cpp | 1 - testApp/pv/testPVType.cpp | 1 - testApp/pv/testStandardField.cpp | 1 - testApp/pv/testStandardPVField.cpp | 1 - 13 files changed, 127 deletions(-) delete mode 100644 src/misc/pv/requester.h delete mode 100644 src/misc/requester.cpp diff --git a/src/misc/Makefile b/src/misc/Makefile index 3fb349c..346a9a5 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -4,7 +4,6 @@ SRC_DIRS += $(PVDATA_SRC)/misc INC += pv/noDefaultMethods.h INC += pv/lock.h -INC += pv/requester.h INC += pv/serialize.h INC += pv/bitSet.h INC += pv/byteBuffer.h @@ -29,7 +28,6 @@ INC += pv/pvUnitTest.h LIBSRCS += byteBuffer.cpp LIBSRCS += bitSet.cpp LIBSRCS += epicsException.cpp -LIBSRCS += requester.cpp LIBSRCS += serializeHelper.cpp LIBSRCS += event.cpp LIBSRCS += executor.cpp diff --git a/src/misc/pv/requester.h b/src/misc/pv/requester.h deleted file mode 100644 index f27d1ba..0000000 --- a/src/misc/pv/requester.h +++ /dev/null @@ -1,71 +0,0 @@ -/* requester.h */ -/* - * Copyright information and license terms for this software can be - * found in the file LICENSE that is included with the distribution - */ -/** - * @author mrk - */ -#ifndef REQUESTER_H -#define REQUESTER_H -#include - -#include -#include - -#include - -namespace epics { namespace pvData { - -class Requester; -typedef std::tr1::shared_ptr RequesterPtr; - -enum MessageType { - infoMessage,warningMessage,errorMessage,fatalErrorMessage -}; -#define MESSAGE_TYPE_COUNT 4 - -epicsShareExtern std::string getMessageTypeName(MessageType messageType); - -/** - * @brief Callback class for passing messages to a requester. - * - * This is used by many other classes and also extended by other classes. - * The request is passed a message and a messageType. - * A message is just a string and a messageType is: -@code -enum MessageType { - infoMessage,warningMessage,errorMessage,fatalErrorMessage -}; -@endcode - * - */ - -class epicsShareClass Requester { -public: - POINTER_DEFINITIONS(Requester); - /** - * Destructor - */ - virtual ~Requester(){} - /** - * The requester must have a name. - * @return The requester's name. - */ - virtual std::string getRequesterName() = 0; - /** - * - * A message for the requester. - * @param message The message. - * @param messageType The type of message: - @code - enum MessageType { - infoMessage,warningMessage,errorMessage,fatalErrorMessage - }; - @endcode - */ - virtual void message(std::string const & message,MessageType messageType); -}; - -}} -#endif /* REQUESTER_H */ diff --git a/src/misc/requester.cpp b/src/misc/requester.cpp deleted file mode 100644 index 69599a6..0000000 --- a/src/misc/requester.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* requester.cpp */ -/* - * Copyright information and license terms for this software can be - * found in the file LICENSE that is included with the distribution - */ -/** - * @author mrk - */ -#include -#include -#include - -#include - -#define epicsExportSharedSymbols -#include -#include - -using std::string; - -namespace epics { namespace pvData { - -static StringArray messageTypeName(MESSAGE_TYPE_COUNT); - -string getMessageTypeName(MessageType messageType) -{ - // TODO not thread-safe - static Mutex mutex; - Lock xx(mutex); - if(messageTypeName[0].size()==0) { - messageTypeName[0] = "info"; - messageTypeName[1] = "warning"; - messageTypeName[2] = "error"; - messageTypeName[3] = "fatalError"; - } - return messageTypeName[messageType]; -} - -void Requester::message(std::string const & message,MessageType messageType) -{ - std::cerr << "[" << getRequesterName() << "] message(" << message << ", " << getMessageTypeName(messageType) << ")\n"; -} - -}} diff --git a/testApp/property/testProperty.cpp b/testApp/property/testProperty.cpp index 45fbc2e..fd74d7d 100644 --- a/testApp/property/testProperty.cpp +++ b/testApp/property/testProperty.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testBitSetUtil.cpp b/testApp/pv/testBitSetUtil.cpp index 5fa9572..ab9c675 100644 --- a/testApp/pv/testBitSetUtil.cpp +++ b/testApp/pv/testBitSetUtil.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testConvert.cpp b/testApp/pv/testConvert.cpp index 27f14f5..a7b4bb9 100644 --- a/testApp/pv/testConvert.cpp +++ b/testApp/pv/testConvert.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testIntrospect.cpp b/testApp/pv/testIntrospect.cpp index 08d152c..4f02086 100644 --- a/testApp/pv/testIntrospect.cpp +++ b/testApp/pv/testIntrospect.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testPVData.cpp b/testApp/pv/testPVData.cpp index 1e3acd5..e465fa1 100644 --- a/testApp/pv/testPVData.cpp +++ b/testApp/pv/testPVData.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testPVScalarArray.cpp b/testApp/pv/testPVScalarArray.cpp index 7d4e570..f4c402d 100644 --- a/testApp/pv/testPVScalarArray.cpp +++ b/testApp/pv/testPVScalarArray.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testPVStructureArray.cpp b/testApp/pv/testPVStructureArray.cpp index b41d921..201f75b 100644 --- a/testApp/pv/testPVStructureArray.cpp +++ b/testApp/pv/testPVStructureArray.cpp @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testPVType.cpp b/testApp/pv/testPVType.cpp index aeab223..aea607c 100644 --- a/testApp/pv/testPVType.cpp +++ b/testApp/pv/testPVType.cpp @@ -14,7 +14,6 @@ #include #include -#include #include using namespace epics::pvData; diff --git a/testApp/pv/testStandardField.cpp b/testApp/pv/testStandardField.cpp index ed8b61a..6148724 100644 --- a/testApp/pv/testStandardField.cpp +++ b/testApp/pv/testStandardField.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/testApp/pv/testStandardPVField.cpp b/testApp/pv/testStandardPVField.cpp index ea4a67e..9b7b4c7 100644 --- a/testApp/pv/testStandardPVField.cpp +++ b/testApp/pv/testStandardPVField.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include #include