Merge 19475e9 into 949b3f6

p2pApp/gwmain.cpp

@@ -34,7 +34,7 @@ namespace pva = epics::pvAccess;
 
 extern int p2pReadOnly;
 
-namespace {
+namespace p2pgw {
 
 pvd::StructureConstPtr schema(pvd::getFieldCreate()->createFieldBuilder()
                               ->add("version", pvd::pvUInt)
@@ -235,10 +235,12 @@ void gwcr(int lvl, const char *client, const char *channel)
     }
 }
 
-}// namespace
+} // namespace p2pgw
+
 
 int main(int argc, char *argv[])
 {
+    using namespace p2pgw;
     try {
         pva::refTrackRegistrar();
 
@@ -280,7 +282,7 @@ int main(int argc, char *argv[])
             lvl = pva::logLevelDebug;
         else if(arg.debug==3)
             lvl = pva::logLevelTrace;
-        else if(arg.debug>=4)
+        else // arg.debug>=4
             lvl = pva::logLevelAll;
         SET_LOG_LEVEL(lvl);
 

pdbApp/qsrv.cpp

@@ -82,7 +82,7 @@ long dbLoadGroup(const char* fname)
     }
 }
 
-namespace {
+namespace qsrv {
 
 void dbLoadGroupWrap(const char* fname)
 {
@@ -124,16 +124,18 @@ void dbgl(int lvl, const char *pattern)
     }
 }
 
-void QSRVRegistrar()
+} // namespace qsrv
+
+static void QSRVRegistrar()
 {
+    using namespace qsrv;
+
     QSRVRegistrar_counters();
     pva::ChannelProviderRegistry::servers()->addSingleton<PDBProvider>("QSRV");
     epics::iocshRegister<int, const char*, &dbgl>("dbgl", "level", "pattern");
     epics::iocshRegister<const char*, &dbLoadGroupWrap>("dbLoadGroup", "jsonfile");
 }
 
-} // namespace
-
 unsigned qsrvVersion(void)
 {
     return QSRV_VERSION_INT;

testApp/Makefile

@@ -24,7 +24,6 @@ PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 TESTPROD_HOST += testweak
 testweak_SRCS += testweak.cpp
-testweak_LIBS += Com
 TESTS += testweak
 
 TESTPROD_HOST += testtest
@@ -57,14 +56,12 @@ testpvalink_LIBS += qsrv
 
 TESTPROD_HOST += testgroupconfig
 testgroupconfig_SRCS += testgroupconfig
-testgroupconfig_LIBS += qsrv pvAccess pvData
-testgroupconfig_LIBS += $(EPICS_BASE_IOC_LIBS)
+testgroupconfig_LIBS += qsrv
 TESTS += testgroupconfig
 
 TESTPROD_HOST += testdbf_copy
 testdbf_copy_SRCS += testdbf_copy
-testdbf_copy_LIBS += qsrv pvAccess pvData
-testdbf_copy_LIBS += $(EPICS_BASE_IOC_LIBS)
+testdbf_copy_LIBS += qsrv
 TESTS += testdbf_copy
 endif
 

testApp/check_consist.cpp

@@ -7,11 +7,14 @@ namespace pvd = epics::pvData;
 namespace pva = epics::pvAccess;
 
 namespace {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 struct Destroyer {
     pvd::Destroyable::shared_pointer D;
     Destroyer(const pvd::Destroyable::shared_pointer& d) : D(d) {}
     ~Destroyer() { if(D) D->destroy(); }
 };
+#pragma GCC diagnostic pop
 
 struct Releaser {
     pva::Monitor::shared_pointer& mon;