summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include
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-126-30/+38
| | | | | * upstream-jsoncpp: jsoncpp 2022-01-12 (42e892d9)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-0910-829/+873
| | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
* Fixing warnings generated by clang 8.0 on WindowsZsolt Parragi2019-05-291-6/+4
| | | | | | | | | | | | * Deprecation removals previously specific to MSVC/Intel now also used by clang * String literals were assigned to non const pointers. These are stored in mutable arrays now * An implicit function pointer to pointer conversion is a Microsoft extension warning is suppressed by an explicit reinterpret_cast * The MSVC specific deprecation macro for jsoncpp was moved after the clang macro to avoid redefinition warnings. This is consistent with how jsoncpp fixed the issue in 36d8cfd7
* jsoncpp: Fix include order for build within CMakeBrad King2019-02-251-3/+4
| | | | | Include the KWSys `Configure.h` header first to get its large file support definitions before including system headers.
* jsoncpp: Drop doxygen comments not recognized by ClangBrad King2017-08-303-5/+5
| | | | | Some Clang versions warn with `-Wdocumentation-unknown-command` about the `\internal` and `\snippet` command tag names.
* jsoncpp: Fix compilation on SunProBrad King2017-08-305-0/+20
| | | | The SunPro compiler does not support `#pragma pack`.
* jsoncpp: Drop deprecation markupBrad King2017-08-304-11/+12
| | | | | | | | 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-3010-574/+825
| | | | | * upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)
* jsoncpp: Drop doxygen comments that cause Clang warningsBrad King2015-01-202-3/+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.
* jsoncpp: Add missing <iosfwd> include in json/writer.hBrad King2015-01-151-0/+1
| | | | The header uses std::ostream, so it must be declared.
* jsoncpp: Disable warnings to avoid changing 3rd party codeBrad King2015-01-151-0/+4
| | | | | Add '-w' or equivalent flag on compilers supporting it. Tell MSVC to use its lowest warning level inside jsoncpp sources.
* jsoncpp: Build the library within CMakeBrad King2015-01-152-1/+3
| | | | | | | | | Update json/json.h to account for our lack of autolink.h. Update json/config.h to include KWSys Large File Support configuration so that consistent stream libraries are used (on AIX with XL). Add a cm_jsoncpp_reader.h header to include the CMake-provided copy of the json/reader.h header from CMake sources.
* jsoncpp: Include "config.h" before system headersBrad King2015-01-151-2/+2
|
* Merge branch 'jsoncpp-upstream' into import-jsoncppBrad King2015-01-139-0/+1859
Use a subtree merge to place the upstream content in the Utilities/cmjsoncpp directory.