epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Use epicsShareFunc, not epicsShareExtern

Browse Source 
Also needed on friend declarations.
This commit is contained in:
Andrew Johnson
2016-04-06 14:49:51 -05:00
parent c36b969da4
commit 351840b490
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pv/channelProviderLocal.h
View File

@ -55,7 +55,7 @@ typedef std::tr1::shared_ptr<ChannelProviderLocal> ChannelProviderLocalPtr;
class ChannelLocal; class ChannelLocal;
typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr; typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr;
epicsShareExtern MonitorFactoryPtr getMonitorFactory(); epicsShareFunc MonitorFactoryPtr getMonitorFactory();
/** /**
* @brief MonitorFactory * @brief MonitorFactory
@ -92,13 +92,13 @@ public:
private: private:
MonitorFactory(); MonitorFactory();
friend class MonitorLocal; friend class MonitorLocal;
friend MonitorFactoryPtr getMonitorFactory(); friend epicsShareFunc MonitorFactoryPtr getMonitorFactory();
bool isDestroyed; bool isDestroyed;
epics::pvData::Mutex mutex; epics::pvData::Mutex mutex;
}; };
epicsShareExtern ChannelProviderLocalPtr getChannelProviderLocal(); epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
/** /**
* @brief ChannelProvider for PVDatabase. * @brief ChannelProvider for PVDatabase.
@ -186,7 +186,7 @@ private:
return shared_from_this(); return shared_from_this();
} }
ChannelProviderLocal(); ChannelProviderLocal();
friend ChannelProviderLocalPtr getChannelProviderLocal(); friend epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
PVDatabasePtr pvDatabase; PVDatabasePtr pvDatabase;
epics::pvData::Mutex mutex; epics::pvData::Mutex mutex;
bool beingDestroyed; bool beingDestroyed;

2
src/pv/pvDatabase.h
View File

@ -266,7 +266,7 @@ private:
PVListenerWPtr pvListener; PVListenerWPtr pvListener;
}; };
epicsShareExtern std::ostream& operator<<(std::ostream& o, const PVRecord& record); epicsShareFunc std::ostream& operator<<(std::ostream& o, const PVRecord& record);
/** /**
* @brief Interface for a field of a record. * @brief Interface for a field of a record.

2
test/src/powerSupply.h
View File

@ -30,7 +30,7 @@
#include <shareLib.h> #include <shareLib.h>
//epicsShareExtern epics::pvData::PVStructurePtr createPowerSupply(); //epicsShareFunc epics::pvData::PVStructurePtr createPowerSupply();
namespace epics { namespace pvDatabase { namespace epics { namespace pvDatabase {