epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix 3.16

Browse Source
This commit is contained in:
Michael Davidsaver
2022-01-27 09:27:19 -08:00
parent 8039c75b3e
commit 93e90c5a04
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/json/print.cpp
View File

@@ -72,7 +72,7 @@ struct args {
static bool warned;
if(!warned) {
warned = true;
errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.5");
errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.6.1");
}
}
#else
@@ -84,7 +84,17 @@ struct args {
} else {
yajl_gen_config(handle, yajl_gen_beautify, 0);
}
# if EPICS_VERSION_INT>=VERSION_INT(7,0,6,1)
yajl_gen_config(handle, yajl_gen_json5, (int)opts.json5);
# else
if(opts.json5) {
static bool warned;
if(!warned) {
warned = true;
errlogPrintf("Warning: Ignoring request to print JSON5. Update Base >= 7.0.6.1");
}
}
# endif
yajl_gen_config(handle, yajl_gen_print_callback, stream_printer, &strm);
#endif
}