From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 9 May 2015 01:22:33 +0100 Subject: Updated and submodularised JsonCPP Conflicts: lib/jsoncpp --- lib/jsoncpp | 1 + lib/jsoncpp/include/json/config.h | 43 --------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) create mode 160000 lib/jsoncpp delete mode 100644 lib/jsoncpp/include/json/config.h (limited to 'lib/jsoncpp/include/json/config.h') diff --git a/lib/jsoncpp b/lib/jsoncpp new file mode 160000 index 000000000..5256551b0 --- /dev/null +++ b/lib/jsoncpp @@ -0,0 +1 @@ +Subproject commit 5256551b0307d3e85f453faf1b1822b1d859f949 diff --git a/lib/jsoncpp/include/json/config.h b/lib/jsoncpp/include/json/config.h deleted file mode 100644 index 5d334cbc5..000000000 --- a/lib/jsoncpp/include/json/config.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef JSON_CONFIG_H_INCLUDED -# define JSON_CONFIG_H_INCLUDED - -/// If defined, indicates that json library is embedded in CppTL library. -//# define JSON_IN_CPPTL 1 - -/// If defined, indicates that json may leverage CppTL library -//# define JSON_USE_CPPTL 1 -/// If defined, indicates that cpptl vector based map should be used instead of std::map -/// as Value container. -//# define JSON_USE_CPPTL_SMALLMAP 1 -/// If defined, indicates that Json specific container should be used -/// (hash table & simple deque container with customizable allocator). -/// THIS FEATURE IS STILL EXPERIMENTAL! -//# define JSON_VALUE_USE_INTERNAL_MAP 1 -/// Force usage of standard new/malloc based allocator instead of memory pool based allocator. -/// The memory pools allocator used optimization (initializing Value and ValueInternalLink -/// as if it was a POD) that may cause some validation tool to report errors. -/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined. -//# define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1 - -/// If defined, indicates that Json use exception to report invalid type manipulation -/// instead of C assert macro. -# define JSON_USE_EXCEPTION 1 - -# ifdef JSON_IN_CPPTL -# include -# ifndef JSON_USE_CPPTL -# define JSON_USE_CPPTL 1 -# endif -# endif - -# ifdef JSON_IN_CPPTL -# define JSON_API CPPTL_API -# elif defined(JSON_DLL_BUILD) -# define JSON_API __declspec(dllexport) -# elif defined(JSON_DLL) -# define JSON_API __declspec(dllimport) -# else -# define JSON_API -# endif - -#endif // JSON_CONFIG_H_INCLUDED -- cgit v1.2.3