commit de72d5d1342d4b18119d82ffb94b66bd21127757
author Matthew Barth <msbarth@us.ibm.com> Fri Jul 16 10:39:42 2021 -0500
committer Matt Spinler <spinler@us.ibm.com> Mon Jul 26 20:18:47 2021 +0000
tree 14432d8ec1ce49b5f109fd8e0738557fbc64bed7
parent 5a2b5017866f2d338d17eac7b8ab65cb60e597f8

json: Enable ignoring `//` or `/* */` comments

The `basic_json::parse` method of nlohmann JSON allows for ignoring
comments within JSON files where it treats these comments as whitespace.
This would be good to enable for the configuration files to be annotated
by users configuring the fan applications.

Change-Id: Ib8cd4b2d6d706e8469aa8ae522744a08bffb945f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

json_config.hpp

diff --git a/json_config.hpp b/json_config.hpp
index 005b028..129e222 100644
--- a/json_config.hpp
+++ b/json_config.hpp
@@ -248,7 +248,8 @@
             file.open(confFile);
             try
             {
-                jsonConf = json::parse(file);
+                // Enable ignoring `//` or `/* */` comments
+                jsonConf = json::parse(file, nullptr, true, true);
             }
             catch (std::exception& e)
             {