Merge branch 'upstream-jsoncpp' into update-jsoncpp

* upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
2026-04-22 06:09:14 -05:00 · 2021-09-09 16:20:13 -04:00
parent d9f8e39357 0b97650518
commit d7dfb84f89
15 changed files with 2295 additions and 2344 deletions
@@ -6,9 +6,10 @@
 #ifndef JSON_JSON_H_INCLUDED
 #define JSON_JSON_H_INCLUDED

-#include "value.h"
+#include "config.h"
+#include "json_features.h"
 #include "reader.h"
+#include "value.h"
 #include "writer.h"
-#include "features.h"

 #endif // JSON_JSON_H_INCLUDED