pvDatabaseCPP/src/V3IOC/* has been moved to pvAccessCPP; epicsShare has been added.
This commit is contained in:
@@ -16,6 +16,8 @@
|
||||
#include <memory>
|
||||
#include <set>
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
#include <pv/lock.h>
|
||||
#include <pv/pvType.h>
|
||||
#include <pv/pvData.h>
|
||||
@@ -40,9 +42,9 @@ typedef std::tr1::shared_ptr<ChannelProviderLocal> ChannelProviderLocalPtr;
|
||||
class ChannelLocal;
|
||||
typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr;
|
||||
|
||||
extern MonitorFactoryPtr getMonitorFactory();
|
||||
epicsShareExtern MonitorFactoryPtr getMonitorFactory();
|
||||
|
||||
class MonitorFactory
|
||||
class epicsShareClass MonitorFactory
|
||||
{
|
||||
public:
|
||||
POINTER_DEFINITIONS(MonitorFactory);
|
||||
@@ -66,9 +68,9 @@ private:
|
||||
};
|
||||
|
||||
|
||||
extern ChannelProviderLocalPtr getChannelProviderLocal();
|
||||
epicsShareExtern ChannelProviderLocalPtr getChannelProviderLocal();
|
||||
|
||||
class ChannelProviderLocal :
|
||||
class epicsShareClass ChannelProviderLocal :
|
||||
public epics::pvAccess::ChannelProvider,
|
||||
public std::tr1::enable_shared_from_this<ChannelProviderLocal>
|
||||
{
|
||||
@@ -103,7 +105,7 @@ private:
|
||||
friend class ChannelProviderLocalRun;
|
||||
};
|
||||
|
||||
class ChannelLocal :
|
||||
class epicsShareClass ChannelLocal :
|
||||
public epics::pvAccess::Channel,
|
||||
public PVRecordClient,
|
||||
public std::tr1::enable_shared_from_this<ChannelLocal>
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
#ifndef MONITORALGORITHM_H
|
||||
#define MONITORALGORITHM_H
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
#include <pv/pvCopy.h>
|
||||
|
||||
namespace epics { namespace pvDatabase {
|
||||
@@ -20,7 +22,7 @@ typedef std::tr1::shared_ptr<MonitorAlgorithm> MonitorAlgorithmPtr;
|
||||
class MonitorAlgorithmCreate;
|
||||
typedef std::tr1::shared_ptr<MonitorAlgorithmCreate> MonitorAlgorithmCreatePtr;
|
||||
|
||||
class MonitorAlgorithm
|
||||
class epicsShareClass MonitorAlgorithm
|
||||
{
|
||||
public:
|
||||
POINTER_DEFINITIONS(MonitorAlgorithm);
|
||||
@@ -35,7 +37,7 @@ protected:
|
||||
epics::pvData::String algorithmName;
|
||||
};
|
||||
|
||||
class MonitorAlgorithmCreate
|
||||
class epicsShareClass MonitorAlgorithmCreate
|
||||
{
|
||||
public:
|
||||
POINTER_DEFINITIONS(MonitorAlgorithmCreate);
|
||||
|
||||
@@ -14,6 +14,8 @@
|
||||
#include <stdexcept>
|
||||
#include <memory>
|
||||
|
||||
#include <shareLib.h>
|
||||
|
||||
#include <pv/pvAccess.h>
|
||||
#include <pv/pvDatabase.h>
|
||||
|
||||
@@ -34,7 +36,7 @@ struct CopyStructureNode;
|
||||
typedef std::tr1::shared_ptr<CopyStructureNode> CopyStructureNodePtr;
|
||||
|
||||
|
||||
class PVCopy :
|
||||
class epicsShareClass PVCopy :
|
||||
public std::tr1::enable_shared_from_this<PVCopy>
|
||||
{
|
||||
public:
|
||||
@@ -146,7 +148,7 @@ private:
|
||||
|
||||
};
|
||||
|
||||
class PVCopyMonitor :
|
||||
class epicsShareClass PVCopyMonitor :
|
||||
public PVListener,
|
||||
public std::tr1::enable_shared_from_this<PVCopyMonitor>
|
||||
{
|
||||
@@ -197,7 +199,7 @@ private:
|
||||
epics::pvData::Mutex mutex;
|
||||
};
|
||||
|
||||
class PVCopyMonitorRequester
|
||||
class epicsShareClass PVCopyMonitorRequester
|
||||
{
|
||||
public:
|
||||
POINTER_DEFINITIONS(PVCopyMonitorRequester);
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include <epicsEvent.h>
|
||||
#include <epicsThread.h>
|
||||
#include <iocsh.h>
|
||||
#include <shareLib.h>
|
||||
|
||||
#include <epicsExport.h>
|
||||
|
||||
@@ -41,7 +42,7 @@ using namespace epics::pvDatabase;
|
||||
static const iocshFuncDef pvdblFuncDef = {
|
||||
"pvdbl", 0, 0
|
||||
};
|
||||
extern "C" void pvdbl(const iocshArgBuf *args)
|
||||
extern "C" void epicsShareAPI pvdbl(const iocshArgBuf *args)
|
||||
{
|
||||
PVDatabasePtr master = PVDatabase::getMaster();
|
||||
PVStringArrayPtr pvNames = master->getRecordNames();
|
||||
|
||||
Reference in New Issue
Block a user