summaryrefslogtreecommitdiffstats
path: root/Utilities/cmjsoncpp/include/json/allocator.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2022-01-121-5/+5
| | | | | * upstream-jsoncpp: jsoncpp 2022-01-12 (42e892d9)
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2021-09-091-75/+66
| | | | | * upstream-jsoncpp: jsoncpp 2020-09-25 (9059f5ca)
* jsoncpp: Fix compilation on SunProBrad King2017-08-301-0/+4
| | | | The SunPro compiler does not support `#pragma pack`.
* Merge branch 'upstream-jsoncpp' into update-jsoncppBrad King2017-08-301-0/+98
* upstream-jsoncpp: jsoncpp 2017-08-27 (4cfae897)