From 7a4bd88d8dc57371cd858b48415c4f741a3a91b8 Mon Sep 17 00:00:00 2001 From: mrkraimer Date: Sat, 11 Jun 2016 12:01:57 -0400 Subject: [PATCH] doc and shared version changes --- RELEASE_NOTES.md => documentation/RELEASE_NOTES.md | 5 ++--- src/Makefile | 3 ++- src/pvaClient.cpp | 3 +-- src/pvaClientChannel.cpp | 2 -- 4 files changed, 5 insertions(+), 8 deletions(-) rename RELEASE_NOTES.md => documentation/RELEASE_NOTES.md (77%) diff --git a/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md similarity index 77% rename from RELEASE_NOTES.md rename to documentation/RELEASE_NOTES.md index d9380b7..d13c27b 100644 --- a/RELEASE_NOTES.md +++ b/documentation/RELEASE_NOTES.md @@ -1,4 +1,4 @@ -pvaClientCPP - Release/4.2 +EPICS V4 release 4.6 ========================== PvaClientMultiChannel @@ -8,10 +8,9 @@ checkConnected() now throws an exception if connect fails. -pvaClientCPP - Release/4.1 +EPICS V4 release 4.5 ========================== -This is for EPICS V4 release 4.5 pvaClient is a synchronous API for pvAccess. diff --git a/src/Makefile b/src/Makefile index 921ee19..7c05e15 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,7 +5,8 @@ include $(TOP)/configure/CONFIG LIBRARY += pvaClient -SHRLIB_VERSION=4.1.1 +# shared library ABI version. +SHRLIB_VERSION ?= 4.2-DEV INC += pv/pvaClient.h INC += pv/pvaClientMultiChannel.h diff --git a/src/pvaClient.cpp b/src/pvaClient.cpp index 8416970..b385557 100644 --- a/src/pvaClient.cpp +++ b/src/pvaClient.cpp @@ -78,8 +78,7 @@ void PvaClientChannelCache::showCache() string providerName = channel->getProvider()->getProviderName(); cout << "channel " << channelName << " provider " << providerName << endl; pvaChannel->showCache(); - } - + } } size_t PvaClientChannelCache::cacheSize() diff --git a/src/pvaClientChannel.cpp b/src/pvaClientChannel.cpp index 45229c7..dd0680d 100644 --- a/src/pvaClientChannel.cpp +++ b/src/pvaClientChannel.cpp @@ -211,8 +211,6 @@ PvaClientChannel::~PvaClientChannel() << endl; } if(PvaClient::getDebug()) showCache(); - pvaClientGetCache.reset(); - pvaClientPutCache.reset(); }