This commit is contained in:
Marty Kraimer
2012-08-17 06:46:31 -04:00
parent ef3d829527
commit 99d55ef56b
9 changed files with 65 additions and 65 deletions

View File

@@ -58,7 +58,7 @@ class MockChannelProcess : public ChannelProcess
m_valueField = static_cast<PVScalar*>(field);
// TODO pvRequest
m_channelProcessRequester->channelProcessConnect(Status::Ok, this);
m_channelProcessRequester->channelProcessConnect(Status::OK, this);
}
virtual void process(bool lastRequest)
@@ -134,7 +134,7 @@ class MockChannelProcess : public ChannelProcess
break;
}
m_channelProcessRequester->processDone(Status::Ok);
m_channelProcessRequester->processDone(Status::OK);
if (lastRequest)
destroy();
@@ -176,12 +176,12 @@ class MockChannelGet : public ChannelGet
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelGet);
// TODO pvRequest
m_channelGetRequester->channelGetConnect(Status::Ok, this, m_pvStructure, m_bitSet);
m_channelGetRequester->channelGetConnect(Status::OK, this, m_pvStructure, m_bitSet);
}
virtual void get(bool lastRequest)
{
m_channelGetRequester->getDone(Status::Ok);
m_channelGetRequester->getDone(Status::OK);
if (m_first)
{
m_first = false;
@@ -231,19 +231,19 @@ class MockChannelPut : public ChannelPut
PVACCESS_REFCOUNT_MONITOR_CONSTRUCT(mockChannelPut);
// TODO pvRequest
m_channelPutRequester->channelPutConnect(Status::Ok, this, m_pvStructure, m_bitSet);
m_channelPutRequester->channelPutConnect(Status::OK, this, m_pvStructure, m_bitSet);
}
virtual void put(bool lastRequest)
{
m_channelPutRequester->putDone(Status::Ok);
m_channelPutRequester->putDone(Status::OK);
if (lastRequest)
destroy();
}
virtual void get()
{
m_channelPutRequester->getDone(Status::Ok);
m_channelPutRequester->getDone(Status::OK);
}
virtual void destroy()
@@ -293,7 +293,7 @@ class MockMonitor : public Monitor, public MonitorElement
m_changedBitSet->set(0);
// TODO pvRequest
m_monitorRequester->monitorConnect(Status::Ok, this, m_pvStructure->getStructure());
m_monitorRequester->monitorConnect(Status::OK, this, m_pvStructure->getStructure());
}
virtual Status start()
@@ -301,12 +301,12 @@ class MockMonitor : public Monitor, public MonitorElement
// fist monitor
m_monitorRequester->monitorEvent(this);
return Status::Ok;
return Status::OK;
}
virtual Status stop()
{
return Status::Ok;
return Status::OK;
}
virtual MonitorElement* poll()
@@ -462,7 +462,7 @@ class MockChannel : public Channel {
virtual void getField(GetFieldRequester *requester,epics::pvData::String subField)
{
requester->getDone(Status::Ok,m_pvStructure->getSubField(subField)->getField());
requester->getDone(Status::OK,m_pvStructure->getSubField(subField)->getField());
}
virtual ChannelProcess* createChannelProcess(
@@ -591,7 +591,7 @@ class MockChannelProvider : public ChannelProvider {
epics::pvData::String channelName,
ChannelFindRequester *channelFindRequester)
{
channelFindRequester->channelFindResult(Status::Ok, m_mockChannelFind, true);
channelFindRequester->channelFindResult(Status::OK, m_mockChannelFind, true);
return m_mockChannelFind;
}
@@ -612,7 +612,7 @@ class MockChannelProvider : public ChannelProvider {
if (address == "local")
{
Channel* channel = new MockChannel(this, channelRequester, channelName, address);
channelRequester->channelCreated(Status::Ok, channel);
channelRequester->channelCreated(Status::OK, channel);
return channel;
}
else