commit ae564653c4c9acac795d189efb463ea13194169c
author dawesc <chris.dawes@eftlab.co.uk> Mon Mar 14 19:11:02 2016 -0500
committer Christopher Dunn <cdunn2001@gmail.com> Sat Mar 19 19:21:15 2016 -0500
tree d24330212f601d5f251ae20c873d2880b264d63c
parent f8674c63b1d2e4faf4160b2a51e46cbe3a24dbfa

-DJSONCPP_USE_SECURE_MEMORY=1 for cmake

Add allocator.h to amalgamated header
Test JSONCPP_USE_SECURE_MEMORY in Travis

amalgamate.py

diff --git a/amalgamate.py b/amalgamate.py
index 1916bb0..2102f30 100644
--- a/amalgamate.py
+++ b/amalgamate.py
@@ -67,6 +67,7 @@
     header.add_text("/// to prevent private header inclusion.")
     header.add_text("#define JSON_IS_AMALGAMATION")
     header.add_file("include/json/version.h")
+    header.add_file("include/json/allocator.h")
     header.add_file("include/json/config.h")
     header.add_file("include/json/forwards.h")
     header.add_file("include/json/features.h")