From 3fb934a30b94d843a37bddbe96e9784e5de85512 Mon Sep 17 00:00:00 2001
From: mrkraimer <mrkraimer@comcast.net>
Date: Sat, 6 Mar 2021 11:17:18 -0500
Subject: [PATCH] replace boolean by epics::pvData::boolean

---
 src/pvaClientMultiChannel.cpp       | 4 ++--
 src/pvaClientMultiGetDouble.cpp     | 4 ++--
 src/pvaClientMultiMonitorDouble.cpp | 4 ++--
 src/pvaClientMultiPutDouble.cpp     | 4 ++--
 src/pvaClientNTMultiData.cpp        | 8 ++++----
 src/pvaClientNTMultiGet.cpp         | 4 ++--
 src/pvaClientNTMultiMonitor.cpp     | 4 ++--
 src/pvaClientNTMultiPut.cpp         | 6 +++---
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/pvaClientMultiChannel.cpp b/src/pvaClientMultiChannel.cpp
index e147579..6b3ce16 100644
--- a/src/pvaClientMultiChannel.cpp
+++ b/src/pvaClientMultiChannel.cpp
@@ -50,7 +50,7 @@ PvaClientMultiChannel::PvaClientMultiChannel(
   numConnected(0),
   firstConnect(true),
   pvaClientChannelArray(PvaClientChannelArray(numChannel,PvaClientChannelPtr())),
-  isConnected(shared_vector<boolean>(numChannel,false)),
+  isConnected(shared_vector<epics::pvData::boolean>(numChannel,false)),
   createRequest(CreateRequest::create())
 {
     if(PvaClient::getDebug()) cout<< "PvaClientMultiChannel::PvaClientMultiChannel()\n";
@@ -120,7 +120,7 @@ bool PvaClientMultiChannel::connectionChange()
     return false;
 }
 
-shared_vector<boolean>  PvaClientMultiChannel::getIsConnected()
+shared_vector<epics::pvData::boolean>  PvaClientMultiChannel::getIsConnected()
 {
     for(size_t i=0; i<numChannel; ++i) {
          PvaClientChannelPtr pvaClientChannel = pvaClientChannelArray[i];
diff --git a/src/pvaClientMultiGetDouble.cpp b/src/pvaClientMultiGetDouble.cpp
index f8aa4f1..3834cd9 100644
--- a/src/pvaClientMultiGetDouble.cpp
+++ b/src/pvaClientMultiGetDouble.cpp
@@ -53,7 +53,7 @@ PvaClientMultiGetDouble::~PvaClientMultiGetDouble()
 
 void PvaClientMultiGetDouble::connect()
 {
-    shared_vector<boolean>isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean>isConnected = pvaClientMultiChannel->getIsConnected();
     string request = "value";
     for(size_t i=0; i<nchannel; ++i)
     {
@@ -78,7 +78,7 @@ void PvaClientMultiGetDouble::connect()
 shared_vector<double> PvaClientMultiGetDouble::get()
 {
     if(!isGetConnected) connect();
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
diff --git a/src/pvaClientMultiMonitorDouble.cpp b/src/pvaClientMultiMonitorDouble.cpp
index eaaac01..f44df37 100644
--- a/src/pvaClientMultiMonitorDouble.cpp
+++ b/src/pvaClientMultiMonitorDouble.cpp
@@ -53,7 +53,7 @@ PvaClientMultiMonitorDouble::~PvaClientMultiMonitorDouble()
 
 void PvaClientMultiMonitorDouble::connect()
 {
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     string request = "value";
     for(size_t i=0; i<nchannel; ++i)
     {
@@ -86,7 +86,7 @@ bool PvaClientMultiMonitorDouble::poll()
          epicsThreadSleep(.1);
     }
     bool result = false;
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
diff --git a/src/pvaClientMultiPutDouble.cpp b/src/pvaClientMultiPutDouble.cpp
index dc45a5d..48affc6 100644
--- a/src/pvaClientMultiPutDouble.cpp
+++ b/src/pvaClientMultiPutDouble.cpp
@@ -55,7 +55,7 @@ PvaClientMultiPutDouble::~PvaClientMultiPutDouble()
 
 void PvaClientMultiPutDouble::connect()
 {
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
@@ -82,7 +82,7 @@ void PvaClientMultiPutDouble::put(shared_vector<double> const &data)
     if(data.size()!=nchannel) {
          throw std::runtime_error("data has wrong size");
     }
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
diff --git a/src/pvaClientNTMultiData.cpp b/src/pvaClientNTMultiData.cpp
index 6ba92c9..5a7c5d2 100644
--- a/src/pvaClientNTMultiData.cpp
+++ b/src/pvaClientNTMultiData.cpp
@@ -45,7 +45,7 @@ PvaClientNTMultiData::PvaClientNTMultiData(
   
 {
     if(PvaClient::getDebug()) cout<< "PvaClientNTMultiData::PvaClientNTMultiData()\n";
-    changeFlags =  shared_vector<boolean>(nchannel);
+    changeFlags =  shared_vector<epics::pvData::boolean>(nchannel);
     topPVStructure.resize(nchannel);
     
     unionValue.resize(nchannel);
@@ -93,7 +93,7 @@ void PvaClientNTMultiData::setPVStructure(
     topPVStructure[index] = pvStructure;
 }
 
-shared_vector<boolean> PvaClientNTMultiData::getChannelChangeFlags()
+shared_vector<epics::pvData::boolean> PvaClientNTMultiData::getChannelChangeFlags()
 {
     return changeFlags;
 }
@@ -190,8 +190,8 @@ NTMultiChannelPtr PvaClientNTMultiData::getNTMultiChannel()
     shared_vector<PVUnionPtr> val(nchannel);
     for(size_t i=0; i<nchannel; ++i) val[i] = unionValue[i];
     ntMultiChannel->getValue()->replace(freeze(val));
-    shared_vector<boolean> connected = pvaClientMultiChannel->getIsConnected();
-    shared_vector<boolean> isConnected(nchannel);
+    shared_vector<epics::pvData::boolean> connected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected(nchannel);
     for(size_t i=0; i<nchannel; ++i) isConnected[i] = connected[i];
     ntMultiChannel->getIsConnected()->replace(freeze(isConnected));
     if(gotAlarm)
diff --git a/src/pvaClientNTMultiGet.cpp b/src/pvaClientNTMultiGet.cpp
index b517436..93d189c 100644
--- a/src/pvaClientNTMultiGet.cpp
+++ b/src/pvaClientNTMultiGet.cpp
@@ -62,7 +62,7 @@ PvaClientNTMultiGet::~PvaClientNTMultiGet()
 void PvaClientNTMultiGet::connect()
 {
     pvaClientGet.resize(nchannel);
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
@@ -86,7 +86,7 @@ void PvaClientNTMultiGet::connect()
 void PvaClientNTMultiGet::get(bool valueOnly)
 {
     if(!isConnected) connect();
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
 
     for(size_t i=0; i<nchannel; ++i)
     {
diff --git a/src/pvaClientNTMultiMonitor.cpp b/src/pvaClientNTMultiMonitor.cpp
index ed7fe97..15cbd5f 100644
--- a/src/pvaClientNTMultiMonitor.cpp
+++ b/src/pvaClientNTMultiMonitor.cpp
@@ -66,7 +66,7 @@ PvaClientNTMultiMonitor::~PvaClientNTMultiMonitor()
 void PvaClientNTMultiMonitor::connect()
 {
     pvaClientMonitor.resize(nchannel);
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
@@ -95,7 +95,7 @@ bool PvaClientNTMultiMonitor::poll(bool valueOnly)
 {
     if(!isConnected) connect();
     bool result = false;
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected(); 
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected(); 
     pvaClientNTMultiData->startDeltaTime();  
     for(size_t i=0; i<nchannel; ++i)
     {
diff --git a/src/pvaClientNTMultiPut.cpp b/src/pvaClientNTMultiPut.cpp
index 9a6552e..e6751d3 100644
--- a/src/pvaClientNTMultiPut.cpp
+++ b/src/pvaClientNTMultiPut.cpp
@@ -54,7 +54,7 @@ PvaClientNTMultiPut::~PvaClientNTMultiPut()
 void PvaClientNTMultiPut::connect()
 {
     pvaClientPut.resize(nchannel);
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
@@ -105,7 +105,7 @@ void PvaClientNTMultiPut::connect()
 shared_vector<PVUnionPtr> PvaClientNTMultiPut::getValues()
 {
     if(!isConnected) connect();
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {
@@ -128,7 +128,7 @@ shared_vector<PVUnionPtr> PvaClientNTMultiPut::getValues()
 void PvaClientNTMultiPut::put()
 {
     if(!isConnected) connect();
-    shared_vector<boolean> isConnected = pvaClientMultiChannel->getIsConnected();
+    shared_vector<epics::pvData::boolean> isConnected = pvaClientMultiChannel->getIsConnected();
     for(size_t i=0; i<nchannel; ++i)
     {
          if(isConnected[i]) {