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

include/json/config.h

diff --git a/include/json/config.h b/include/json/config.h
index 213d9cb..1e96210 100644
--- a/include/json/config.h
+++ b/include/json/config.h
@@ -119,13 +119,9 @@
 #  define JSON_USE_INT64_DOUBLE_CONVERSION 1
 #endif
 
-// If non-zero, the library zeroes any memory that it has allocated before
-// it frees its
-#ifndef JSON_USE_SECURE_MEMORY
-#define JSON_USE_SECURE_MEMORY 0
-#endif
+#include "version.h"
 
-#if JSON_USE_SECURE_MEMORY
+#if JSONCPP_USING_SECURE_MEMORY
 #include "allocator.h" //typedef Allocator
 #endif
 
@@ -149,11 +145,11 @@
 typedef UInt64 LargestUInt;
 #define JSON_HAS_INT64
 #endif // if defined(JSON_NO_INT64)
-#if JSON_USE_SECURE_MEMORY
-#define JSONCPP_STRING        std::basic_string<char, std::char_traits<char>, SecureAllocator<char> >
-#define JSONCPP_OSTRINGSTREAM std::basic_ostringstream<char, std::char_traits<char>, SecureAllocator<char> >
+#if JSONCPP_USING_SECURE_MEMORY
+#define JSONCPP_STRING        std::basic_string<char, std::char_traits<char>, Json::SecureAllocator<char> >
+#define JSONCPP_OSTRINGSTREAM std::basic_ostringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
 #define JSONCPP_OSTREAM       std::basic_ostream<char, std::char_traits<char>>
-#define JSONCPP_ISTRINGSTREAM std::basic_istringstream<char, std::char_traits<char>, SecureAllocator<char> >
+#define JSONCPP_ISTRINGSTREAM std::basic_istringstream<char, std::char_traits<char>, Json::SecureAllocator<char> >
 #define JSONCPP_ISTREAM       std::istream
 #else
 #define JSONCPP_STRING        std::string
@@ -161,7 +157,7 @@
 #define JSONCPP_OSTREAM       std::ostream
 #define JSONCPP_ISTRINGSTREAM std::istringstream
 #define JSONCPP_ISTREAM       std::istream
-#endif // if JSON_USE_SECURE_MEMORY
+#endif // if JSONCPP_USING_SECURE_MEMORY
 } // end namespace Json
 
 #endif // JSON_CONFIG_H_INCLUDED