Christopher Dunn
980cdf0fb5
Exclude allocator.h from amalgamated header
...
Nobody using SecureAllocator really needs the amalgamated header.
resolves #461
2016-04-22 00:45:18 -05:00
dawesc
ae564653c4
-DJSONCPP_USE_SECURE_MEMORY=1 for cmake
...
Add allocator.h to amalgamated header
Test JSONCPP_USE_SECURE_MEMORY in Travis
2016-03-19 19:21:15 -05:00
Christopher Dunn
99822b27cd
clarify python version
2015-03-03 16:17:11 -06:00
Christopher Dunn
4788764844
drop JSON_VALUE_USE_INTERNAL_MAP, JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
...
And remove some old headers.
These were not actually compiling anymore, and there were outstanding,
known bugs, e.g. https://sourceforge.net/p/jsoncpp/bugs/27
2015-02-25 10:04:13 -06:00
Christopher Dunn
2f4e40bc95
fix typo: issue #177
2015-02-18 09:17:06 -06:00
Christopher Dunn
c6582415d8
fix typos
2015-02-15 13:06:48 -06:00
Christopher Dunn
0ee7e2426f
help use of amalgamated header
...
* Include from same-directory first, so `-I DIR` is rarely needed.
* Double-check that proper header has been included.
http://stackoverflow.com/questions/28510109/linking-problems-with-jsoncpp
2015-02-15 13:06:48 -06:00
Christopher Dunn
494950a63d
rm extra whitespace in python, per PEP8
2015-01-24 16:21:12 -06:00
Christopher Dunn
bd1e895287
simple py3 changes
2014-11-19 23:30:47 -06:00
Christopher Dunn
09228968ea
fix for python2
2014-09-10 17:26:46 -07:00
SuperManitu
83b43caf8e
allow python3
2014-09-10 11:09:35 -07:00
eightnoteight
3585477f33
add file version.h temporarily commented | header include path modified
2014-07-14 11:11:14 +05:30
Baptiste Lepilleur
eafd702a17
- New CMake based build system. Based in part on contribution from
...
Igor Okulist and Damien Buhl (Patch #14 ). Added support for running
tests and building with DLL on Windows.
- added missing JSON_API
- Visual Studio DLL: suppressed warning "C4251: <data member>: <type>
needs to have dll-interface to be used by..." via pragma push/pop
in json-cpp headers.
- New header json/version.h now contains version number macros
(JSONCPP_VERSION_MAJOR, JSONCPP_VERSION_MINOR, JSONCPP_VERSION_PATCH
and JSONCPP_VERSION_HEXA). While this header is generated by CMake,
it is committed to ease build with alternate build system
(CMake only update the file when it changes avoid issues with VCS).
2013-05-08 20:21:11 +00:00
Baptiste Lepilleur
aff1171153
Added missing "include/json/assertions.h" header in amalgamate.py.
2012-07-27 09:06:40 +00:00
Christopher Dunn
03288e8eb6
(bug#3314841) Fixed JSON_IS_AMALGAMATION. Using os.path for OSX filename compatibility.
2011-06-22 00:43:31 +00:00
Christopher Dunn
dc0f736f59
Switched CRLF to LF in repo, and added svn:eol-style native. I might have missed a few files though. Just committing what I have so far.
2011-06-21 21:18:49 +00:00
Baptiste Lepilleur
eadc478e50
Fixed typo: amalga*ma*te. Replaced macro JSON_IS_AMALGATED with JSON_IS_AMALGAMATION
2011-05-02 21:09:30 +00:00
