epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

gddScaler => gddScalar

Browse Source
This commit is contained in:
Jeff Hill
1996-08-05 23:22:58 +00:00
parent 8fd7fff71c
commit 998e413bed
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cas/example/exPV.cc
View File

@@ -64,7 +64,7 @@ void exPV::scanPV()
//
this->currentTime = osiTime::getCurrent();
pDD = new gddScaler (gddAppType_value, aitEnumFloat32);
pDD = new gddScalar (gddAppType_value, aitEnumFloat32);
if (!pDD) {
return;
}
@@ -140,7 +140,7 @@ caStatus exPV::update(gdd &valueIn)
this->info.getName().string, valueIn);
# endif
if (valueIn.isScaler()) {
if (valueIn.isScalar()) {
pNewValue = &valueIn;
pNewValue->reference();
}
@@ -149,7 +149,7 @@ caStatus exPV::update(gdd &valueIn)
// this does not modify the current value
// (because it may be referenced in the event queue)
//
pNewValue = new gddScaler (gddAppType_value, aitEnumFloat32);
pNewValue = new gddScalar (gddAppType_value, aitEnumFloat32);
if (!pNewValue) {
return S_casApp_noMemory;
}

11
src/cas/generic/casStrmClient.cc
View File

@@ -29,6 +29,9 @@
*
* History
* $Log$
* Revision 1.7 1996/08/05 19:26:51 jhill
* doc
*
* Revision 1.5 1996/07/09 22:53:33 jhill
* init stat and sev in gdd
*
@@ -1349,7 +1352,7 @@ caStatus casStrmClient::write()
status = this->writeArrayData();
}
else {
status = this->writeScalerData();
status = this->writeScalarData();
}
(*pPV)->endTransaction();
@@ -1359,9 +1362,9 @@ caStatus casStrmClient::write()
//
// casStrmClient::writeScalerData()
// casStrmClient::writeScalarData()
//
caStatus casStrmClient::writeScalerData()
caStatus casStrmClient::writeScalarData()
{
gdd *pDD;
const caHdr *pHdr = this->ctx.getMsg();
@@ -1374,7 +1377,7 @@ caStatus casStrmClient::writeScalerData()
return S_cas_badType;
}
pDD = new gddScaler (gddAppType_value, type);
pDD = new gddScalar (gddAppType_value, type);
if (!pDD) {
return S_cas_noMemory;
}

10
src/cas/generic/server.h
View File

@@ -29,6 +29,9 @@
*
* History
* $Log$
* Revision 1.7 1996/08/05 19:27:28 jhill
* added process()
*
* Revision 1.5 1996/07/24 22:00:50 jhill
* added pushOnToEventQueue()
*
@@ -321,11 +324,6 @@ public:
private:
};
//
// ndim == 0 => scaler
// otherwise pIndexArray points to an array of ndim items
//
#define nDimScaler 0U
class casCtx {
public:
casCtx() :
@@ -811,7 +809,7 @@ private:
caStatus channelCreateFailed (const caHdr *mp, caStatus createStatus);
caStatus writeArrayData();
caStatus writeScalerData();
caStatus writeScalarData();
caStatus writeString();
};