summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/reader.h
Commit message (Collapse)AuthorAgeFilesLines
* jsoncpp: Drop deprecation markupBrad King2022-01-121-2/+2
| | | | | Apply the change from commit 0a0f71066f (jsoncpp: Drop deprecation markup, 2017-08-28, v3.10.0-rc1~199^2~3) to new markup instances.
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2022-01-121-5/+8
| | | | | * upstream-jsoncpp: jsoncpp 2022-01-12 (42e892d9)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-091-199/+191
| | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
* jsoncpp: Drop doxygen comments not recognized by ClangBrad King2017-08-301-2/+2
| | | | | Some Clang versions warn with `-Wdocumentation-unknown-command` about the `\internal` and `\snippet` command tag names.
* jsoncpp: Fix compilation on SunProBrad King2017-08-301-0/+4
| | | | The SunPro compiler does not support `#pragma pack`.
* jsoncpp: Drop deprecation markupBrad King2017-08-301-2/+2
| | | | | | | | Even though we disable warnings when building jsoncpp itself, including its headers from other CMake sources may still cause warnings. Additional work will be needed to port CMake to newer jsoncpp interfaces while still supporting jsoncpp 1.0.0. For now, just suppress the markup.
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-20/+157
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* jsoncpp: Drop doxygen comments that cause Clang warningsBrad King2015-01-201-2/+0
| | | | | | Even though we disable warnings when building jsoncpp itself, including its headers from other CMake sources may still cause warnings. Update the code to remove these -Wdocumentation warnings.
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-131-0/+276
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.