still working on RAII; work on doxygen

This commit is contained in:
mrkraimer
2016-05-27 14:20:41 -04:00
parent 3008825587
commit 6ff53f4dcb
10 changed files with 820 additions and 526 deletions

View File

@@ -128,14 +128,14 @@ PvaClient::PvaClient(std::string const & providerNames)
}
PvaClient::~PvaClient() {
if(PvaClient::debug) cout<< "PvaClient::~PvaClient()\n";
{
Lock xx(mutex);
if(isDestroyed) throw std::runtime_error("pvaClient was destroyed");
isDestroyed = true;
}
if(PvaClient::debug) {
cout << "pvaChannel cache:\n";
cout<< "PvaClient::~PvaClient()\n"
<< "pvaChannel cache:\n";
showCache();
}
if(pvaStarted){
@@ -188,7 +188,7 @@ PvaClientChannelPtr PvaClient::channel(
PvaClientChannelPtr PvaClient::createChannel(string const & channelName, string const & providerName)
{
return PvaClientChannel::create(getPtrSelf(),channelName,providerName);
return PvaClientChannel::create(shared_from_this(),channelName,providerName);
}
void PvaClient::setRequester(RequesterPtr const & requester)