diff --git a/include/json/config.h b/include/json/config.h index 1af868122..e22b8be39 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -173,10 +173,13 @@ typedef UInt64 LargestUInt; #define JSON_HAS_INT64 #endif // if defined(JSON_NO_INT64) +#if JSONCPP_USING_SECURE_MEMORY template -using Allocator = typename std::conditional, - std::allocator>::type; +using Allocator = SecureAllocator; +#else // !JSONCPP_USING_SECURE_MEMORY +template +using Allocator = std::allocator; +#endif // JSONCPP_USING_SECURE_MEMORY using String = std::basic_string, Allocator>; using IStringStream = std::basic_istringstream