diff options
| author | Brad King <brad.king@kitware.com> | 2021-09-09 20:20:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-09-09 20:20:13 (GMT) |
| commit | d7dfb84f890478e0e4a7facbe9d71c778ca033da (patch) | |
| tree | cafebd3393fad333eba3736c67918fd124568132 /Utilities/cmjsoncpp/include/json/json.h | |
| parent | d9f8e39357b8d7244172223f76862eea88fbc374 (diff) | |
| parent | 0b9765051855ece984fa83154d063b7cc7b62c1d (diff) | |
| download | CMake-d7dfb84f890478e0e4a7facbe9d71c778ca033da.zip CMake-d7dfb84f890478e0e4a7facbe9d71c778ca033da.tar.gz CMake-d7dfb84f890478e0e4a7facbe9d71c778ca033da.tar.bz2 | |
Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
jsoncpp 2020-09-25 (9059f5ca)
Diffstat (limited to 'Utilities/cmjsoncpp/include/json/json.h')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/json.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Utilities/cmjsoncpp/include/json/json.h b/Utilities/cmjsoncpp/include/json/json.h index 5964672..5c776a1 100644 --- a/Utilities/cmjsoncpp/include/json/json.h +++ b/Utilities/cmjsoncpp/include/json/json.h @@ -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 |