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

In responseHandlers::monitorConnect change Structure* to StructureConstPtr Same in MockClientImpl.cpp and testRemoteClientImpl.cpp

Browse Source
This commit is contained in:
Marty Kraimer
2011-04-05 08:46:13 -04:00
parent 6e79ac9c09
commit fe8331ba12
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/RELEASE
View File

@@ -26,8 +26,8 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
# EPICS_BASE usually appears last so other apps can override stuff:
PVDATA=/opt/epics/pvDataCPP
EPICS_BASE=/opt/epics/base
PVDATA=/home/mrk/hg/pvDataCPP
EPICS_BASE=/home/install/epics/base
#PVDATA=/home/mrk/hg/pvDataCPP
#EPICS_BASE=/home/install/epics/base

2
pvAccessApp/server/responseHandlers.cpp
View File

@@ -1162,7 +1162,7 @@ ServerMonitorRequesterImpl::ServerMonitorRequesterImpl(ServerContextImpl* contex
INIT_EXCEPTION_GUARD(13, _channelMonitor = channel->getChannel()->createMonitor(this, pvRequest));
}
void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor* monitor, Structure* structure)
void ServerMonitorRequesterImpl::monitorConnect(const Status& status, Monitor* monitor, StructureConstPtr structure)
{
{
Lock guard(_mutex);

4
pvAccessApp/server/responseHandlers.h
View File

@@ -498,7 +498,7 @@ namespace epics {
{
public:
ServerMonitorRequesterImpl(ServerContextImpl* context, ServerChannelImpl* channel, const pvAccessID ioid, Transport* transport,epics::pvData::PVStructure* pvRequest);
void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor* monitor, epics::pvData::Structure* structure);
void monitorConnect(const epics::pvData::Status& status, epics::pvData::Monitor* monitor, epics::pvData::StructureConstPtr structure);
void unlisten(epics::pvData::Monitor* monitor);
void monitorEvent(epics::pvData::Monitor* monitor);
void lock();
@@ -512,7 +512,7 @@ namespace epics {
private:
epics::pvData::Monitor* _monitor;
epics::pvData::Monitor* _channelMonitor;
epics::pvData::Structure* _structure;
epics::pvData::StructureConstPtr _structure;
epics::pvData::Status _status;
};

2
testApp/client/MockClientImpl.cpp
View File

@@ -842,7 +842,7 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void monitorConnect(const Status& status, Monitor* monitor, Structure* structure)
virtual void monitorConnect(const Status& status, Monitor* monitor, StructureConstPtr structure)
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
if (structure)

2
testApp/remote/testRemoteClientImpl.cpp
View File

@@ -384,7 +384,7 @@ class MonitorRequesterImpl : public MonitorRequester
std::cout << "[" << getRequesterName() << "] message(" << message << ", " << messageTypeName[messageType] << ")" << std::endl;
}
virtual void monitorConnect(const epics::pvData::Status& status, Monitor* monitor, Structure* structure)
virtual void monitorConnect(const epics::pvData::Status& status, Monitor* monitor, StructureConstPtr structure)
{
std::cout << "monitorConnect(" << status.toString() << ")" << std::endl;
if (status.isSuccess() && structure)