diff --git a/src/cas/example/exPV.cc b/src/cas/example/exPV.cc index 82991d2e6..a3736a75d 100644 --- a/src/cas/example/exPV.cc +++ b/src/cas/example/exPV.cc @@ -64,7 +64,7 @@ void exPV::scanPV() // this->currentTime = osiTime::getCurrent(); - pDD = new gddScalar (gddAppType_value, aitEnumFloat32); + pDD = new gddScaler (gddAppType_value, aitEnumFloat32); if (!pDD) { return; } @@ -140,7 +140,7 @@ caStatus exPV::update(gdd &valueIn) this->info.getName().string, valueIn); # endif - if (valueIn.isScalar()) { + if (valueIn.isScaler()) { 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 gddScalar (gddAppType_value, aitEnumFloat32); + pNewValue = new gddScaler (gddAppType_value, aitEnumFloat32); if (!pNewValue) { return S_casApp_noMemory; } diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc index 51d565be5..615d20d72 100644 --- a/src/cas/generic/casStrmClient.cc +++ b/src/cas/generic/casStrmClient.cc @@ -1349,7 +1349,7 @@ caStatus casStrmClient::write() status = this->writeArrayData(); } else { - status = this->writeScalarData(); + status = this->writeScalerData(); } (*pPV)->endTransaction(); @@ -1359,9 +1359,9 @@ caStatus casStrmClient::write() // -// casStrmClient::writeScalarData() +// casStrmClient::writeScalerData() // -caStatus casStrmClient::writeScalarData() +caStatus casStrmClient::writeScalerData() { gdd *pDD; const caHdr *pHdr = this->ctx.getMsg(); @@ -1374,7 +1374,7 @@ caStatus casStrmClient::writeScalarData() return S_cas_badType; } - pDD = new gddScalar (gddAppType_value, type); + pDD = new gddScaler (gddAppType_value, type); if (!pDD) { return S_cas_noMemory; }