From 3d85852c93f840f197ff18737770fbb2fb693fff Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 18 Apr 2018 09:01:11 -0700 Subject: [PATCH] attempt to fix dllimport issue --- src/client/pva/client.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client/pva/client.h b/src/client/pva/client.h index bc2d88d..0c6b364 100644 --- a/src/client/pva/client.h +++ b/src/client/pva/client.h @@ -80,7 +80,7 @@ public: void reset() { impl.reset(); } protected: - friend ::std::ostream& operator<<(::std::ostream& strm, const Operation& op); + friend epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const Operation& op); std::tr1::shared_ptr impl; }; @@ -164,7 +164,7 @@ public: private: std::tr1::shared_ptr impl; - friend ::std::ostream& operator<<(::std::ostream& strm, const Monitor& op); + friend epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const Monitor& op); friend struct MonitorSync; }; @@ -250,7 +250,7 @@ private: std::tr1::shared_ptr impl; friend class ClientProvider; friend void detail::registerRefTrack(); - friend ::std::ostream& operator<<(::std::ostream& strm, const ClientChannel& op); + friend epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const ClientChannel& op); ClientChannel(const std::tr1::shared_ptr& i) :impl(i) {} public: @@ -466,7 +466,7 @@ class epicsShareClass ClientProvider struct Impl; std::tr1::shared_ptr impl; friend void detail::registerRefTrack(); - friend ::std::ostream& operator<<(::std::ostream& strm, const ClientProvider& op); + friend epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const ClientProvider& op); public: /** Use named provider. @@ -519,10 +519,10 @@ ClientChannel::put(const epics::pvData::PVStructure::const_shared_pointer& pvReq return detail::PutBuilder(*this, pvRequest); } -epicsShareExtern ::std::ostream& operator<<(::std::ostream& strm, const Operation& op); -epicsShareExtern ::std::ostream& operator<<(::std::ostream& strm, const Monitor& op); -epicsShareExtern ::std::ostream& operator<<(::std::ostream& strm, const ClientChannel& op); -epicsShareExtern ::std::ostream& operator<<(::std::ostream& strm, const ClientProvider& op); +epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const Operation& op); +epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const Monitor& op); +epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const ClientChannel& op); +epicsShareFunc ::std::ostream& operator<<(::std::ostream& strm, const ClientProvider& op); //! @}