Merge pull request #70 from epics-base/jenkins_problem

another attempt to fix jenkins failure
epics-base · Apr 7, 2021 · d54031a · d54031a
2 parents 426af71 + 1e1d545
commit d54031a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -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
diff --git a/src/pvAccess/channelLocal.cpp b/src/pvAccess/channelLocal.cpp
@@ -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;

diff --git a/src/pvAccess/registerChannelProviderLocal.cpp b/src/pvAccess/registerChannelProviderLocal.cpp
@@ -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);