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

Merge pull request #11 from anjohnson/master

Browse Source 
Support for additional Windows targets
This commit is contained in:
Marty Kraimer
2016-04-12 11:50:04 -04:00
parent c36b969da4 351840b490
commit db2f528c0a
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;
typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr;
epicsShareExtern MonitorFactoryPtr getMonitorFactory();
epicsShareFunc MonitorFactoryPtr getMonitorFactory();
/**
* @brief MonitorFactory
@ -92,13 +92,13 @@ public:
private:
MonitorFactory();
friend class MonitorLocal;
friend MonitorFactoryPtr getMonitorFactory();
friend epicsShareFunc MonitorFactoryPtr getMonitorFactory();
bool isDestroyed;
epics::pvData::Mutex mutex;
};
epicsShareExtern ChannelProviderLocalPtr getChannelProviderLocal();
epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
/**
* @brief ChannelProvider for PVDatabase.
@ -186,7 +186,7 @@ private:
return shared_from_this();
}
ChannelProviderLocal();
friend ChannelProviderLocalPtr getChannelProviderLocal();
friend epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
PVDatabasePtr pvDatabase;
epics::pvData::Mutex mutex;
bool beingDestroyed;

2
src/pv/pvDatabase.h
View File

@ -266,7 +266,7 @@ private:
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.

2
test/src/powerSupply.h
View File

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