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

3.15 compat

Browse Source
This commit is contained in:
Michael Davidsaver
2020-11-28 09:24:23 -08:00
parent 1682c991d2
commit 503cf414be
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pdbApp/pdb.cpp
View File

@ -174,7 +174,9 @@ struct PDBProcessor
PDBProcessor() PDBProcessor()
{ {
#ifdef USE_MULTILOCK
GroupConfig conf; GroupConfig conf;
#endif
// process info(Q:Group, ...) // process info(Q:Group, ...)
for(pdbRecordIterator rec; !rec.done(); rec.next()) for(pdbRecordIterator rec; !rec.done(); rec.next())
@ -192,6 +194,7 @@ struct PDBProcessor
fprintf(stderr, "%s: info(Q:Group, ...\n", rec.name()); fprintf(stderr, "%s: info(Q:Group, ...\n", rec.name());
} }
#ifdef USE_MULTILOCK
try { try {
GroupConfig::parse(json, rec.name(), conf); GroupConfig::parse(json, rec.name(), conf);
if(!conf.warning.empty()) if(!conf.warning.empty())
@ -200,6 +203,7 @@ struct PDBProcessor
fprintf(stderr, "%s: Error parsing info(\"Q:group\", ... : %s\n", fprintf(stderr, "%s: Error parsing info(\"Q:group\", ... : %s\n",
rec.record()->name, e.what()); rec.record()->name, e.what());
} }
#endif
} }
// process group definition files // process group definition files
@ -233,6 +237,7 @@ struct PDBProcessor
fprintf(stderr, "Process dbGroup file \"%s\"\n", it->c_str()); fprintf(stderr, "Process dbGroup file \"%s\"\n", it->c_str());
} }
#ifdef USE_MULTILOCK
try { try {
GroupConfig::parse(json, "", conf); GroupConfig::parse(json, "", conf);
if(!conf.warning.empty()) if(!conf.warning.empty())
@ -240,8 +245,10 @@ struct PDBProcessor
}catch(std::exception& e){ }catch(std::exception& e){
fprintf(stderr, "Error from dbGroup file \"%s\"\n%s", it->c_str(), e.what()); fprintf(stderr, "Error from dbGroup file \"%s\"\n%s", it->c_str(), e.what());
} }
#endif
} }
#ifdef USE_MULTILOCK
for(GroupConfig::groups_t::const_iterator git=conf.groups.begin(), gend=conf.groups.end(); for(GroupConfig::groups_t::const_iterator git=conf.groups.begin(), gend=conf.groups.end();
git!=gend; ++git) git!=gend; ++git)
{ {
@ -351,6 +358,7 @@ struct PDBProcessor
resolveTriggers(); resolveTriggers();
// must not re-sort members after this point as resolveTriggers() // must not re-sort members after this point as resolveTriggers()
// has stored array indicies. // has stored array indicies.
#endif
} }
}; };

7
pdbApp/qsrv.cpp
View File

@ -55,6 +55,13 @@ long dbLoadGroup(const char* fname)
"Load additional DB group definitions from file.\n"); "Load additional DB group definitions from file.\n");
return 1; return 1;
} }
#ifndef USE_MULTILOCK
static bool warned;
if(!warned) {
warned = true;
fprintf(stderr, "ignoring %s\n", fname);
}
#endif
if(fname[0]=='-') { if(fname[0]=='-') {
fname++; fname++;