From 7ed5f8b4bfa63d6333d8ed52dafab573decba804 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 5 Apr 2016 18:28:20 -0500 Subject: [PATCH] Wrong keyword, use epicsShareFunc --- src/client/pv/pvAccess.h | 6 +++--- src/pipelineService/pv/pipelineServer.h | 2 +- src/pva/pv/pvaVersion.h | 2 +- src/remote/pv/blockingUDP.h | 2 +- src/remoteClient/pv/clientContextImpl.h | 2 +- src/rpcService/pv/rpcServer.h | 2 +- src/server/pv/serverContext.h | 2 +- src/utils/pv/logger.h | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/client/pv/pvAccess.h b/src/client/pv/pvAccess.h index 7ff9831..937c54a 100644 --- a/src/client/pv/pvAccess.h +++ b/src/client/pv/pvAccess.h @@ -990,9 +990,9 @@ public: virtual std::auto_ptr getProviderNames() = 0; }; -epicsShareExtern ChannelProviderRegistry::shared_pointer getChannelProviderRegistry(); -epicsShareExtern void registerChannelProviderFactory(ChannelProviderFactory::shared_pointer const & channelProviderFactory); -epicsShareExtern void unregisterChannelProviderFactory(ChannelProviderFactory::shared_pointer const & channelProviderFactory); +epicsShareFunc ChannelProviderRegistry::shared_pointer getChannelProviderRegistry(); +epicsShareFunc void registerChannelProviderFactory(ChannelProviderFactory::shared_pointer const & channelProviderFactory); +epicsShareFunc void unregisterChannelProviderFactory(ChannelProviderFactory::shared_pointer const & channelProviderFactory); /** diff --git a/src/pipelineService/pv/pipelineServer.h b/src/pipelineService/pv/pipelineServer.h index 4a50beb..968e9f0 100644 --- a/src/pipelineService/pv/pipelineServer.h +++ b/src/pipelineService/pv/pipelineServer.h @@ -65,7 +65,7 @@ public: }; -epicsShareExtern Channel::shared_pointer createPipelineChannel(ChannelProvider::shared_pointer const & provider, +epicsShareFunc Channel::shared_pointer createPipelineChannel(ChannelProvider::shared_pointer const & provider, std::string const & channelName, ChannelRequester::shared_pointer const & channelRequester, PipelineService::shared_pointer const & pipelineService); diff --git a/src/pva/pv/pvaVersion.h b/src/pva/pv/pvaVersion.h index a00a2a1..0781a42 100644 --- a/src/pva/pv/pvaVersion.h +++ b/src/pva/pv/pvaVersion.h @@ -111,7 +111,7 @@ private: bool _developmentFlag; }; -epicsShareExtern std::ostream& operator<<(std::ostream& o, const Version& v); +epicsShareFunc std::ostream& operator<<(std::ostream& o, const Version& v); } } diff --git a/src/remote/pv/blockingUDP.h b/src/remote/pv/blockingUDP.h index b49196e..606f092 100644 --- a/src/remote/pv/blockingUDP.h +++ b/src/remote/pv/blockingUDP.h @@ -505,7 +505,7 @@ private: typedef std::vector BlockingUDPTransportVector; -epicsShareExtern void initializeUDPTransports( +epicsShareFunc void initializeUDPTransports( bool serverFlag, BlockingUDPTransportVector& udpTransports, const IfaceNodeVector& ifaceList, diff --git a/src/remoteClient/pv/clientContextImpl.h b/src/remoteClient/pv/clientContextImpl.h index d74b987..5d5488b 100644 --- a/src/remoteClient/pv/clientContextImpl.h +++ b/src/remoteClient/pv/clientContextImpl.h @@ -131,7 +131,7 @@ public: virtual void destroy() = 0; }; -epicsShareExtern ChannelProvider::shared_pointer createClientProvider(const Configuration::shared_pointer& conf); +epicsShareFunc ChannelProvider::shared_pointer createClientProvider(const Configuration::shared_pointer& conf); } } diff --git a/src/rpcService/pv/rpcServer.h b/src/rpcService/pv/rpcServer.h index abc6c3c..b6ead62 100644 --- a/src/rpcService/pv/rpcServer.h +++ b/src/rpcService/pv/rpcServer.h @@ -67,7 +67,7 @@ public: }; -epicsShareExtern Channel::shared_pointer createRPCChannel(ChannelProvider::shared_pointer const & provider, +epicsShareFunc Channel::shared_pointer createRPCChannel(ChannelProvider::shared_pointer const & provider, std::string const & channelName, ChannelRequester::shared_pointer const & channelRequester, Service::shared_pointer const & rpcService); diff --git a/src/server/pv/serverContext.h b/src/server/pv/serverContext.h index dcae129..fde37e1 100644 --- a/src/server/pv/serverContext.h +++ b/src/server/pv/serverContext.h @@ -453,7 +453,7 @@ private: }; -epicsShareExtern ServerContext::shared_pointer startPVAServer( +epicsShareFunc ServerContext::shared_pointer startPVAServer( std::string const & providerNames = PVACCESS_ALL_PROVIDERS, int timeToRun = 0, bool runInSeparateThread = false, diff --git a/src/utils/pv/logger.h b/src/utils/pv/logger.h index 8d6ddc6..66456aa 100644 --- a/src/utils/pv/logger.h +++ b/src/utils/pv/logger.h @@ -48,9 +48,9 @@ OFF */ -epicsShareExtern void pvAccessLog(pvAccessLogLevel level, const char* format, ...); -epicsShareExtern void pvAccessSetLogLevel(pvAccessLogLevel level); -epicsShareExtern bool pvAccessIsLoggable(pvAccessLogLevel level); +epicsShareFunc void pvAccessLog(pvAccessLogLevel level, const char* format, ...); +epicsShareFunc void pvAccessSetLogLevel(pvAccessLogLevel level); +epicsShareFunc bool pvAccessIsLoggable(pvAccessLogLevel level); #if defined (__GNUC__) && __GNUC__ < 3 #define LOG(level, format, ARGS...) pvAccessLog(level, format, ##ARGS) @@ -76,7 +76,7 @@ epicsShareExtern bool pvAccessIsLoggable(pvAccessLogLevel level); * @param[in] fname The file to write to. If the file exists, it * is opened for append. */ -epicsShareExtern void createFileLogger( std::string const & fname ); +epicsShareFunc void createFileLogger( std::string const & fname ); } }