mostly code cleanup

This commit is contained in:
mrkraimer
2016-07-06 10:49:22 -04:00
parent fac07c7f3a
commit d890ce28d8
21 changed files with 104 additions and 264 deletions

View File

@@ -25,10 +25,6 @@ using namespace std;
namespace epics { namespace pvaClient {
static ConvertPtr convert = getConvert();
static FieldCreatePtr fieldCreate = getFieldCreate();
static PVDataCreatePtr pvDataCreate = getPVDataCreate();
PvaClientNTMultiPutPtr PvaClientNTMultiPut::create(
PvaClientMultiChannelPtr const &pvaMultiChannel,
PvaClientChannelArray const &pvaClientChannelArray)
@@ -45,8 +41,7 @@ PvaClientNTMultiPut::PvaClientNTMultiPut(
nchannel(pvaClientChannelArray.size()),
unionValue(shared_vector<epics::pvData::PVUnionPtr>(nchannel,PVUnionPtr())),
value(shared_vector<epics::pvData::PVFieldPtr>(nchannel,PVFieldPtr())),
isConnected(false),
isDestroyed(false)
isConnected(false)
{
if(PvaClient::getDebug()) cout<< "PvaClientNTMultiPut::PvaClientNTMultiPut()\n";
}
@@ -55,12 +50,6 @@ PvaClientNTMultiPut::PvaClientNTMultiPut(
PvaClientNTMultiPut::~PvaClientNTMultiPut()
{
if(PvaClient::getDebug()) cout<< "PvaClientNTMultiPut::~PvaClientNTMultiPut()\n";
{
Lock xx(mutex);
if(isDestroyed) throw std::runtime_error("pvaClientNTMultiPut was destroyed");
isDestroyed = true;
}
pvaClientChannelArray.clear();
}
void PvaClientNTMultiPut::connect()
@@ -100,6 +89,8 @@ void PvaClientNTMultiPut::connect()
throw std::runtime_error(message);
}
}
FieldCreatePtr fieldCreate = getFieldCreate();
PVDataCreatePtr pvDataCreate = getPVDataCreate();
for(size_t i=0; i<nchannel; ++i)
{
if(isConnected[i]) {