Christopher Dunn c334ac0376 Merge branch 'master' into 0.y.z ...

- fix for "C++ Builder" IDE
- Travis CI/AppVeyor
- **cmake** tweak
- fix memory leak in unit-test

See #268 and #252.

2015-04-27 18:33:07 -07:00

..

assertions.h

use Json::LogicError in macros

2015-03-08 12:42:53 -05:00

autolink.h

Ran clang-format over all .h and .cpp files.

2014-07-01 08:48:54 +10:00

config.h

Make preprocessor query robust against older gcc versions

2015-03-08 13:07:27 -05:00

features.h

partially revert 'Added features that allow the reader to accept common non-standard JSON.'

2015-04-11 14:49:59 -05:00

forwards.h

drop JSON_VALUE_USE_INTERNAL_MAP, JSON_USE_SIMPLE_INTERNAL_ALLOCATOR

2015-02-25 10:04:13 -06:00

json.h

Ran clang-format over all .h and .cpp files.

2014-07-01 08:48:54 +10:00

reader.h

Merge branch 'master' into 0.y.z

2015-04-27 18:33:07 -07:00

value.h

Merge branch 'master' into 0.y.z

2015-04-27 18:33:07 -07:00

version.h

0.10.z (based on 1.6.z, but binary-compat w/ 0.6.0-rc2)

2015-04-11 14:49:59 -05:00

writer.h

revert 'Made it possible to drop null placeholders from array output.'

2015-04-11 14:49:59 -05:00