From 8464aacbeffb7e6ef0a64e1b7bbefdb9ec2c7d4f Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Thu, 20 Oct 2011 15:40:53 +0200 Subject: [PATCH] header cleanup --- pvAccessApp/Makefile | 6 ++-- pvAccessApp/client/pvAccess.cpp | 7 +++-- pvAccessApp/client/pvAccess.h | 10 +++++-- pvAccessApp/factory/ChannelAccessFactory.cpp | 9 ++++-- pvAccessApp/factory/CreateRequestFactory.cpp | 7 +++-- .../remote/abstractResponseHandler.cpp | 9 +++--- pvAccessApp/remote/beaconHandler.cpp | 27 +++++++++-------- pvAccessApp/remote/beaconHandler.h | 9 ++++-- .../remote/blockingClientTCPTransport.cpp | 17 ++++------- .../remote/blockingServerTCPTransport.cpp | 17 ++++------- pvAccessApp/remote/blockingTCP.h | 13 +++----- pvAccessApp/remote/blockingTCPAcceptor.cpp | 14 ++++----- pvAccessApp/remote/blockingTCPConnector.cpp | 11 ++++--- pvAccessApp/remote/blockingTCPTransport.cpp | 30 +++++++------------ pvAccessApp/remote/blockingUDP.h | 14 ++++----- pvAccessApp/remote/blockingUDPConnector.cpp | 14 ++++----- pvAccessApp/remote/blockingUDPTransport.cpp | 23 ++++---------- pvAccessApp/remote/channelSearchManager.cpp | 6 ++-- pvAccessApp/remote/channelSearchManager.h | 8 +++-- pvAccessApp/remote/remote.h | 9 +++--- .../{utils => remote}/transportRegistry.cpp | 0 .../{utils => remote}/transportRegistry.h | 0 .../remoteClient/clientContextImpl.cpp | 10 +++---- pvAccessApp/remoteClient/clientContextImpl.h | 9 +++--- pvAccessApp/server/baseChannelRequester.cpp | 9 ++++-- pvAccessApp/server/baseChannelRequester.h | 6 ++-- pvAccessApp/server/beaconEmitter.cpp | 6 ++-- pvAccessApp/server/beaconEmitter.h | 6 ++-- .../server/beaconServerStatusProvider.cpp | 9 ++++-- .../server/beaconServerStatusProvider.h | 9 ++++-- pvAccessApp/server/responseHandlers.cpp | 6 ++-- pvAccessApp/server/responseHandlers.h | 8 +++-- pvAccessApp/server/serverChannelImpl.cpp | 9 ++++-- pvAccessApp/server/serverChannelImpl.h | 6 ++-- pvAccessApp/server/serverContext.cpp | 6 ++-- pvAccessApp/server/serverContext.h | 6 ++-- 36 files changed, 182 insertions(+), 183 deletions(-) rename pvAccessApp/{utils => remote}/transportRegistry.cpp (100%) rename pvAccessApp/{utils => remote}/transportRegistry.h (100%) diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile index 6b1887c..757c567 100644 --- a/pvAccessApp/Makefile +++ b/pvAccessApp/Makefile @@ -17,15 +17,14 @@ INC += hexDump.h INC += inetAddressUtil.h INC += logger.h INC += introspectionRegistry.h -INC += transportRegistry.h INC += namedLockPattern.h INC += referenceCountingLock.h INC += configuration.h +INC += likely.h LIBSRCS += hexDump.cpp LIBSRCS += inetAddressUtil.cpp LIBSRCS += logger.cpp LIBSRCS += introspectionRegistry.cpp -LIBSRCS += transportRegistry.cpp LIBSRCS += configuration.cpp LIBSRCS += referenceCountingLock.cpp @@ -58,6 +57,7 @@ INC += blockingUDP.h INC += beaconHandler.h INC += blockingTCP.h INC += channelSearchManager.h +INC += transportRegistry.h LIBSRCS += blockingUDPTransport.cpp LIBSRCS += blockingUDPConnector.cpp LIBSRCS += beaconHandler.cpp @@ -68,7 +68,7 @@ LIBSRCS += blockingServerTCPTransport.cpp LIBSRCS += channelSearchManager.cpp LIBSRCS += abstractResponseHandler.cpp LIBSRCS += blockingTCPAcceptor.cpp - +LIBSRCS += transportRegistry.cpp SRC_DIRS += $(PVACCESS)/remoteClient INC += clientContextImpl.h diff --git a/pvAccessApp/client/pvAccess.cpp b/pvAccessApp/client/pvAccess.cpp index 3bb043a..d5b79fc 100644 --- a/pvAccessApp/client/pvAccess.cpp +++ b/pvAccessApp/client/pvAccess.cpp @@ -1,12 +1,13 @@ -/*pvAccess.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * pvAccessCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ + #include -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { const char* Channel::ConnectionStateNames[] = { "NEVER_CONNECTED", "CONNECTED", "DISCONNECTED", "DESTROYED" }; diff --git a/pvAccessApp/client/pvAccess.h b/pvAccessApp/client/pvAccess.h index 92228f4..43a4aec 100644 --- a/pvAccessApp/client/pvAccess.h +++ b/pvAccessApp/client/pvAccess.h @@ -1,4 +1,9 @@ -/* pvAccess.h */ +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ + #ifndef PVACCESS_H #define PVACCESS_H #include @@ -9,7 +14,8 @@ #include #include -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { enum AccessRights { /** diff --git a/pvAccessApp/factory/ChannelAccessFactory.cpp b/pvAccessApp/factory/ChannelAccessFactory.cpp index c9d94fe..ea1d717 100644 --- a/pvAccessApp/factory/ChannelAccessFactory.cpp +++ b/pvAccessApp/factory/ChannelAccessFactory.cpp @@ -1,4 +1,8 @@ -/*ChannelAccessFactory.cpp*/ +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ #include #include @@ -10,7 +14,8 @@ using namespace epics::pvData; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { static ChannelAccess::shared_pointer channelAccess; diff --git a/pvAccessApp/factory/CreateRequestFactory.cpp b/pvAccessApp/factory/CreateRequestFactory.cpp index e33ef64..0450d03 100644 --- a/pvAccessApp/factory/CreateRequestFactory.cpp +++ b/pvAccessApp/factory/CreateRequestFactory.cpp @@ -1,9 +1,9 @@ -/*CreateRequestFactory.cpp*/ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * pvAccessCPP is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ + #include #include #include @@ -13,7 +13,8 @@ using namespace epics::pvData; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { class CreateRequestImpl : public CreateRequest { private: diff --git a/pvAccessApp/remote/abstractResponseHandler.cpp b/pvAccessApp/remote/abstractResponseHandler.cpp index b8e78d8..ad00f88 100644 --- a/pvAccessApp/remote/abstractResponseHandler.cpp +++ b/pvAccessApp/remote/abstractResponseHandler.cpp @@ -1,8 +1,7 @@ -/* - * abstractResponseHandler.cpp - * - * Created on: Jan 10, 2011 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include diff --git a/pvAccessApp/remote/beaconHandler.cpp b/pvAccessApp/remote/beaconHandler.cpp index 45cff0c..2fc2e7d 100644 --- a/pvAccessApp/remote/beaconHandler.cpp +++ b/pvAccessApp/remote/beaconHandler.cpp @@ -1,5 +1,7 @@ -/* - * beaconHandler.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include @@ -9,22 +11,23 @@ using namespace std; using namespace epics::pvData; using namespace epics::pvAccess; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { BeaconHandler::BeaconHandler(Context::shared_pointer context, - const osiSockAddr* responseFrom) - :_context(Context::weak_pointer(context)) - ,_responseFrom(*responseFrom) - ,_mutex() - ,_serverStartupTime(0) + const osiSockAddr* responseFrom) : + _context(Context::weak_pointer(context)), + _responseFrom(*responseFrom), + _mutex(), + _serverStartupTime(0) { } -BeaconHandler::BeaconHandler(const osiSockAddr* responseFrom) - :_responseFrom(*responseFrom) - ,_mutex() - , _serverStartupTime(0) +BeaconHandler::BeaconHandler(const osiSockAddr* responseFrom) : + _responseFrom(*responseFrom), + _mutex(), + _serverStartupTime(0) { } diff --git a/pvAccessApp/remote/beaconHandler.h b/pvAccessApp/remote/beaconHandler.h index 253c76a..c2d169d 100644 --- a/pvAccessApp/remote/beaconHandler.h +++ b/pvAccessApp/remote/beaconHandler.h @@ -1,5 +1,7 @@ -/* - * beaconHandler.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef BEACONHANDLER_H @@ -12,7 +14,8 @@ #include #include -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { /** * BeaconHandler diff --git a/pvAccessApp/remote/blockingClientTCPTransport.cpp b/pvAccessApp/remote/blockingClientTCPTransport.cpp index a7b91eb..6a8c9a3 100644 --- a/pvAccessApp/remote/blockingClientTCPTransport.cpp +++ b/pvAccessApp/remote/blockingClientTCPTransport.cpp @@ -1,22 +1,15 @@ -/* - * BlockingClientTCPTransport.cpp - * - * Created on: Jan 3, 2011 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ -/* pvAccess */ #include - #include +#include -/* pvData */ #include -/* EPICSv3 */ -#include - -/* standard */ #include #include #include diff --git a/pvAccessApp/remote/blockingServerTCPTransport.cpp b/pvAccessApp/remote/blockingServerTCPTransport.cpp index a763ba7..d66862b 100644 --- a/pvAccessApp/remote/blockingServerTCPTransport.cpp +++ b/pvAccessApp/remote/blockingServerTCPTransport.cpp @@ -1,21 +1,16 @@ -/* - * blockingServerTCPTransport.cpp - * - * Created on: Jan 4, 2011 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ -/* pvAccess */ #include #include +#include -/* pvData */ #include #include -/* EPICSv3 */ -#include - /* standard */ #include @@ -23,7 +18,7 @@ using namespace epics::pvData; using namespace std; namespace epics { - namespace pvAccess { +namespace pvAccess { BlockingServerTCPTransport::BlockingServerTCPTransport( Context::shared_pointer const & context, SOCKET channel, diff --git a/pvAccessApp/remote/blockingTCP.h b/pvAccessApp/remote/blockingTCP.h index 6168c87..75c2d69 100644 --- a/pvAccessApp/remote/blockingTCP.h +++ b/pvAccessApp/remote/blockingTCP.h @@ -1,14 +1,12 @@ -/* - * blockingTCP.h - * - * Created on: Dec 29, 2010 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef BLOCKINGTCP_H_ #define BLOCKINGTCP_H_ -/* pvAccess */ #include #include #include @@ -16,20 +14,17 @@ #include #include -/* pvData */ #include #include #include #include #include -/* EPICSv3 */ #include #include #include #include -/* standard */ #include #include #include diff --git a/pvAccessApp/remote/blockingTCPAcceptor.cpp b/pvAccessApp/remote/blockingTCPAcceptor.cpp index fc675f5..18d75de 100644 --- a/pvAccessApp/remote/blockingTCPAcceptor.cpp +++ b/pvAccessApp/remote/blockingTCPAcceptor.cpp @@ -1,27 +1,25 @@ -/* - * blockingTCPAcceptor.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ -/* pvAccess */ #include #include +#include -/* pvData */ #include -/* EPICSv3 */ -#include #include #include -/* standard */ #include using std::ostringstream; using namespace epics::pvData; namespace epics { - namespace pvAccess { +namespace pvAccess { BlockingTCPAcceptor::BlockingTCPAcceptor( Context::shared_pointer const & context, diff --git a/pvAccessApp/remote/blockingTCPConnector.cpp b/pvAccessApp/remote/blockingTCPConnector.cpp index 0e4c27c..cdb7418 100644 --- a/pvAccessApp/remote/blockingTCPConnector.cpp +++ b/pvAccessApp/remote/blockingTCPConnector.cpp @@ -1,17 +1,16 @@ -/* - * blockingTCPConnector.cpp - * - * Created on: Jan 4, 2011 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include #include #include +#include #include #include -#include #include #include diff --git a/pvAccessApp/remote/blockingTCPTransport.cpp b/pvAccessApp/remote/blockingTCPTransport.cpp index d07e4ad..81855e4 100644 --- a/pvAccessApp/remote/blockingTCPTransport.cpp +++ b/pvAccessApp/remote/blockingTCPTransport.cpp @@ -1,28 +1,27 @@ -/* - * blockingTCPTransport.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ - + #define __STDC_LIMIT_MACROS 1 #include #include #include -#include +#include +#include +#include -/* pvData */ #include #include #include #include +#include -/* EPICSv3 */ #include #include #include -#include -#include - -/* standard */ #include #include #include @@ -39,17 +38,8 @@ using std::max; using std::min; using std::ostringstream; -// TODO moved to some compiler_utils.h? -#if defined(__GNUC__) - #define likely(x) __builtin_expect (x, 1) - #define unlikely(x) __builtin_expect (x, 0) -#else - #define likely(x) (x) - #define unlikely(x) (x) -#endif - namespace epics { - namespace pvAccess { +namespace pvAccess { /* class MonitorSender : public TransportSender, public NoDefaultMethods { diff --git a/pvAccessApp/remote/blockingUDP.h b/pvAccessApp/remote/blockingUDP.h index 8649142..50d4c0c 100644 --- a/pvAccessApp/remote/blockingUDP.h +++ b/pvAccessApp/remote/blockingUDP.h @@ -1,25 +1,21 @@ -/* - * blockingUDPTransport.h - * - * Created on: Dec 20, 2010 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ - + #ifndef BLOCKINGUDP_H_ #define BLOCKINGUDP_H_ -/* pvAccess */ #include #include #include -/* pvData */ #include #include #include #include -/* EPICSv3 */ #include #include #include diff --git a/pvAccessApp/remote/blockingUDPConnector.cpp b/pvAccessApp/remote/blockingUDPConnector.cpp index bc64791..47ff5d5 100644 --- a/pvAccessApp/remote/blockingUDPConnector.cpp +++ b/pvAccessApp/remote/blockingUDPConnector.cpp @@ -1,19 +1,15 @@ -/* - * blockingUDPConnector.cpp - * - * Created on: Dec 27, 2010 - * Author: Miha Vitorovic +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ -/* pvAccess */ #include #include +#include -/* EPICSv3 */ -#include #include -/* standard */ #include using namespace std; diff --git a/pvAccessApp/remote/blockingUDPTransport.cpp b/pvAccessApp/remote/blockingUDPTransport.cpp index 0133c64..a490192 100644 --- a/pvAccessApp/remote/blockingUDPTransport.cpp +++ b/pvAccessApp/remote/blockingUDPTransport.cpp @@ -1,40 +1,29 @@ -/* - * blockingUDPTransport.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ -/* pvAccess */ #include - #include #include +#include +#include -/* pvData */ #include #include #include -/* EPICSv3 */ #include #include -#include #include -/* standard */ #include #include using namespace epics::pvData; using namespace std; -// TODO moved to some compiler_utils.h? -#if defined(__GNUC__) - #define likely(x) __builtin_expect (x, 1) - #define unlikely(x) __builtin_expect (x, 0) -#else - #define likely(x) (x) - #define unlikely(x) (x) -#endif - namespace epics { namespace pvAccess { diff --git a/pvAccessApp/remote/channelSearchManager.cpp b/pvAccessApp/remote/channelSearchManager.cpp index 479a5a0..909f3d3 100644 --- a/pvAccessApp/remote/channelSearchManager.cpp +++ b/pvAccessApp/remote/channelSearchManager.cpp @@ -1,5 +1,7 @@ -/* - * channelSearchManager.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include diff --git a/pvAccessApp/remote/channelSearchManager.h b/pvAccessApp/remote/channelSearchManager.h index f15becf..f748eca 100644 --- a/pvAccessApp/remote/channelSearchManager.h +++ b/pvAccessApp/remote/channelSearchManager.h @@ -1,7 +1,9 @@ -/* - * channelSearchManager.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ - + #ifndef CHANNELSEARCHMANAGER_H #define CHANNELSEARCHMANAGER_H diff --git a/pvAccessApp/remote/remote.h b/pvAccessApp/remote/remote.h index f49f523..3319a8f 100644 --- a/pvAccessApp/remote/remote.h +++ b/pvAccessApp/remote/remote.h @@ -1,8 +1,7 @@ -/* - * remote.h - * - * Created on: Dec 21, 2010 - * Author: user +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef REMOTE_H_ diff --git a/pvAccessApp/utils/transportRegistry.cpp b/pvAccessApp/remote/transportRegistry.cpp similarity index 100% rename from pvAccessApp/utils/transportRegistry.cpp rename to pvAccessApp/remote/transportRegistry.cpp diff --git a/pvAccessApp/utils/transportRegistry.h b/pvAccessApp/remote/transportRegistry.h similarity index 100% rename from pvAccessApp/utils/transportRegistry.h rename to pvAccessApp/remote/transportRegistry.h diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/pvAccessApp/remoteClient/clientContextImpl.cpp index d022bb2..7e3f215 100644 --- a/pvAccessApp/remoteClient/clientContextImpl.cpp +++ b/pvAccessApp/remoteClient/clientContextImpl.cpp @@ -1,8 +1,8 @@ - - -/* clientClientContextImpl.cpp */ -/* Author: Matej Sekoranja Date: 2011.1.1 */ - +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. + */ #include #include diff --git a/pvAccessApp/remoteClient/clientContextImpl.h b/pvAccessApp/remoteClient/clientContextImpl.h index d188169..5b6ba88 100644 --- a/pvAccessApp/remoteClient/clientContextImpl.h +++ b/pvAccessApp/remoteClient/clientContextImpl.h @@ -1,8 +1,7 @@ -/* - * clientContext.h - * - * Created on: Dec 21, 2010 - * Author: msekoran +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef CLIENTCONTEXTIMPL_H_ diff --git a/pvAccessApp/server/baseChannelRequester.cpp b/pvAccessApp/server/baseChannelRequester.cpp index 60ba5c6..e5fc96e 100644 --- a/pvAccessApp/server/baseChannelRequester.cpp +++ b/pvAccessApp/server/baseChannelRequester.cpp @@ -1,12 +1,15 @@ -/* - * baseChannelRequester.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include using namespace epics::pvData; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { const Status BaseChannelRequester::okStatus = Status(); const Status BaseChannelRequester::badCIDStatus = Status(Status::STATUSTYPE_ERROR, "bad channel id"); diff --git a/pvAccessApp/server/baseChannelRequester.h b/pvAccessApp/server/baseChannelRequester.h index bac07a5..b986d8f 100644 --- a/pvAccessApp/server/baseChannelRequester.h +++ b/pvAccessApp/server/baseChannelRequester.h @@ -1,5 +1,7 @@ -/* - * baseChannelRequester.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef BASECHANNELREQUESTER_H_ diff --git a/pvAccessApp/server/beaconEmitter.cpp b/pvAccessApp/server/beaconEmitter.cpp index 3a7c4b2..dc02b9f 100644 --- a/pvAccessApp/server/beaconEmitter.cpp +++ b/pvAccessApp/server/beaconEmitter.cpp @@ -1,5 +1,7 @@ -/* - * beaconEmitter.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifdef _WIN32 diff --git a/pvAccessApp/server/beaconEmitter.h b/pvAccessApp/server/beaconEmitter.h index 03e7839..b0a0c0f 100644 --- a/pvAccessApp/server/beaconEmitter.h +++ b/pvAccessApp/server/beaconEmitter.h @@ -1,5 +1,7 @@ -/* - * beaconEmitter.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef BEACONEMITTER_H diff --git a/pvAccessApp/server/beaconServerStatusProvider.cpp b/pvAccessApp/server/beaconServerStatusProvider.cpp index f8fa825..9ad7a7f 100644 --- a/pvAccessApp/server/beaconServerStatusProvider.cpp +++ b/pvAccessApp/server/beaconServerStatusProvider.cpp @@ -1,5 +1,7 @@ -/* - * beaconServerStatusProvider.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include @@ -7,7 +9,8 @@ using namespace epics::pvData; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { DefaultBeaconServerStatusProvider::DefaultBeaconServerStatusProvider(ServerContext::shared_pointer const & context): _context(context) { diff --git a/pvAccessApp/server/beaconServerStatusProvider.h b/pvAccessApp/server/beaconServerStatusProvider.h index 04a996a..a4075d5 100644 --- a/pvAccessApp/server/beaconServerStatusProvider.h +++ b/pvAccessApp/server/beaconServerStatusProvider.h @@ -1,5 +1,7 @@ -/* - * beaconServerStatusProvider.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef BEACONSERVERSTATUSPROVIDER_H @@ -9,7 +11,8 @@ //#include #include -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { class ServerContext; diff --git a/pvAccessApp/server/responseHandlers.cpp b/pvAccessApp/server/responseHandlers.cpp index b47ce7a..d85c1ee 100644 --- a/pvAccessApp/server/responseHandlers.cpp +++ b/pvAccessApp/server/responseHandlers.cpp @@ -1,5 +1,7 @@ -/* - * responseHandlers.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include diff --git a/pvAccessApp/server/responseHandlers.h b/pvAccessApp/server/responseHandlers.h index 373a90f..283e676 100644 --- a/pvAccessApp/server/responseHandlers.h +++ b/pvAccessApp/server/responseHandlers.h @@ -1,5 +1,7 @@ -/* - * responseHandlers.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef RESPONSEHANDLERS_H_ @@ -11,7 +13,7 @@ #include namespace epics { - namespace pvAccess { +namespace pvAccess { /** */ diff --git a/pvAccessApp/server/serverChannelImpl.cpp b/pvAccessApp/server/serverChannelImpl.cpp index 81ddac2..83a5c78 100644 --- a/pvAccessApp/server/serverChannelImpl.cpp +++ b/pvAccessApp/server/serverChannelImpl.cpp @@ -1,12 +1,15 @@ -/* - * serverChannelImpl.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include using namespace epics::pvData; -namespace epics { namespace pvAccess { +namespace epics { +namespace pvAccess { ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer const & channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer const & securityToken): _channel(channel), diff --git a/pvAccessApp/server/serverChannelImpl.h b/pvAccessApp/server/serverChannelImpl.h index 871bb52..59c3c4f 100644 --- a/pvAccessApp/server/serverChannelImpl.h +++ b/pvAccessApp/server/serverChannelImpl.h @@ -1,5 +1,7 @@ -/* - * serverChannel.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef SERVERCHANNEL_H_ diff --git a/pvAccessApp/server/serverContext.cpp b/pvAccessApp/server/serverContext.cpp index 9340830..a939b42 100644 --- a/pvAccessApp/server/serverContext.cpp +++ b/pvAccessApp/server/serverContext.cpp @@ -1,5 +1,7 @@ -/* - * serverContext.cpp +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #include diff --git a/pvAccessApp/server/serverContext.h b/pvAccessApp/server/serverContext.h index 774980c..6466774 100644 --- a/pvAccessApp/server/serverContext.h +++ b/pvAccessApp/server/serverContext.h @@ -1,5 +1,7 @@ -/* - * serverContext.h +/** + * Copyright - See the COPYRIGHT that is included with this distribution. + * pvAccessCPP is distributed subject to a Software License Agreement found + * in file LICENSE that is included with this distribution. */ #ifndef SERVERCONTEXT_H_