EPICS_base/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge pull request #70 from epics-base/jenkins_problem

Browse Source 
another attempt to fix jenkins failure
This commit is contained in:
Marty Kraimer
2021-04-07 11:55:18 -04:00
committed by GitHub
parent 426af714a1 1e1d5455a8
commit d54031a2fb
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -38,7 +38,4 @@ SHRLIB_VERSION ?= $(EPICS_PVDATABASE_MAJOR_VERSION).$(EPICS_PVDATABASE_MINOR_VER
# needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
#pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
#pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
include $(TOP)/configure/RULES

2
src/pvAccess/channelLocal.cpp
View File

@ -912,7 +912,7 @@ void ChannelRPCLocal::processRequest(
{
result = service->request(pvArgument);
}
catch (RPCRequestException& rre)
catch (epics::pvAccess::RPCRequestException& rre)
{
status = Status(rre.getStatus(), rre.what());
ok = false;

1
src/pvAccess/registerChannelProviderLocal.cpp
View File

@ -46,7 +46,6 @@ extern "C" void pvdbl(const iocshArgBuf *args)
static void registerChannelProviderLocal(void)
{
static int firstTime = 1;
cout << "registerChannelProviderLocal firstTime " << (firstTime ? "true" : "false") << endl;
if (firstTime) {
firstTime = 0;
iocshRegister(&pvdblFuncDef, pvdbl);