diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-28 11:33:06 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-08-30 10:16:59 -0400 |
| commit | e09819557f5bf29f8414d5165e2c3e8ad8dee2d1 (patch) | |
| tree | a12c94c8890665c2c45d7a859f897efe8931b4ad /Utilities/cmjsoncpp/include/json/version.h | |
| parent | a7241206bf4e1cb6ebbb24a05334cf4b9e2328df (diff) | |
| parent | 6e9ef8d1b18f8a33ab97483437da819e342a9997 (diff) | |
| download | cmake-e09819557f5bf29f8414d5165e2c3e8ad8dee2d1.tar.gz | |
Merge branch 'upstream-jsoncpp' into update-jsoncpp
* upstream-jsoncpp:
jsoncpp 2017-08-27 (4cfae897)
Diffstat (limited to 'Utilities/cmjsoncpp/include/json/version.h')
| -rw-r--r-- | Utilities/cmjsoncpp/include/json/version.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Utilities/cmjsoncpp/include/json/version.h b/Utilities/cmjsoncpp/include/json/version.h index 6fe06824d9..d953961895 100644 --- a/Utilities/cmjsoncpp/include/json/version.h +++ b/Utilities/cmjsoncpp/include/json/version.h @@ -1,14 +1,20 @@ -// DO NOT EDIT. This file is generated by CMake from "version" -// and "version.h.in" files. +// DO NOT EDIT. This file (and "version") is generated by CMake. // Run CMake configure step to update it. #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.0.0" +# define JSONCPP_VERSION_STRING "1.8.2" # define JSONCPP_VERSION_MAJOR 1 -# define JSONCPP_VERSION_MINOR 0 -# define JSONCPP_VERSION_PATCH 0 +# define JSONCPP_VERSION_MINOR 8 +# define JSONCPP_VERSION_PATCH 2 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) +#ifdef JSONCPP_USING_SECURE_MEMORY +#undef JSONCPP_USING_SECURE_MEMORY +#endif +#define JSONCPP_USING_SECURE_MEMORY 0 +// If non-zero, the library zeroes any memory that it has allocated before +// it frees its memory. + #endif // JSON_VERSION_H_INCLUDED |