From a3a2c12ab3fde19e620e62396427e2e794f0f7be Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Thu, 16 May 2013 09:05:36 -0400 Subject: [PATCH] bitSetUtil was changed in pvDataCPP --- pvAccessApp/remoteClient/clientContextImpl.cpp | 16 ++++++++-------- testApp/client/testCreateRequest.cpp | 7 +++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/pvAccessApp/remoteClient/clientContextImpl.cpp index 07ec597..3d7975e 100644 --- a/pvAccessApp/remoteClient/clientContextImpl.cpp +++ b/pvAccessApp/remoteClient/clientContextImpl.cpp @@ -2045,8 +2045,8 @@ namespace epics { // compress if needed if (m_needToCompress) { - BitSetUtil::compress(m_monitorElement->changedBitSet.get(), m_monitorElement->pvStructurePtr.get()); - BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), m_monitorElement->pvStructurePtr.get()); + BitSetUtil::compress(m_monitorElement->changedBitSet, m_monitorElement->pvStructurePtr); + BitSetUtil::compress(m_monitorElement->overrunBitSet, m_monitorElement->pvStructurePtr); m_needToCompress = false; } @@ -2159,8 +2159,8 @@ namespace epics { PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr; getConvert()->copy(pvStructure, newElement->pvStructurePtr); - BitSetUtil::compress(m_monitorElement->changedBitSet.get(), pvStructure.get()); - BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), pvStructure.get()); + BitSetUtil::compress(m_monitorElement->changedBitSet, pvStructure); + BitSetUtil::compress(m_monitorElement->overrunBitSet, pvStructure); //monitorQueue.setUsed(monitorElement); @@ -2223,8 +2223,8 @@ namespace epics { // if there was overrun in progress we manipulated bitSets... compress them if (m_overrunInProgress) { - BitSetUtil::compress(changedBitSet.get(), pvStructure.get()); - BitSetUtil::compress(overrunBitSet.get(), pvStructure.get()); + BitSetUtil::compress(changedBitSet, pvStructure); + BitSetUtil::compress(overrunBitSet, pvStructure); m_overrunInProgress = false; } @@ -2262,8 +2262,8 @@ namespace epics { PVStructurePtr pvStructure = m_monitorElement->pvStructurePtr; getConvert()->copy(pvStructure, newElement->pvStructurePtr); - BitSetUtil::compress(m_monitorElement->changedBitSet.get(), pvStructure.get()); - BitSetUtil::compress(m_monitorElement->overrunBitSet.get(), pvStructure.get()); + BitSetUtil::compress(m_monitorElement->changedBitSet, pvStructure); + BitSetUtil::compress(m_monitorElement->overrunBitSet, pvStructure); //monitorQueue.setUsed(monitorElement); m_monitorElement = newElement; diff --git a/testApp/client/testCreateRequest.cpp b/testApp/client/testCreateRequest.cpp index 1e17286..cc79a53 100644 --- a/testApp/client/testCreateRequest.cpp +++ b/testApp/client/testCreateRequest.cpp @@ -43,6 +43,13 @@ void testCreateRequest() { assert(pvRequest.get()); out.clear(); pvRequest->toString(&out); std::cout << out << std::endl; +request = "record[process=true]field(alarm,timeStamp)putField(synput:a,synput:b,stnput:c)"; + std::cout << std::endl << String("request") <createRequest(request,requester); +assert(pvRequest.get()); +out.clear(); pvRequest->toString(&out); std::cout << out << std::endl; + + request = "alarm,timeStamp,power.value"; std::cout << std::endl << String("request") <createRequest(request,requester);