From ccfe04a0a2b64c2bdfd10c4a0aadf61847001eae Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 9 May 2015 01:22:33 +0100
Subject: Updated and submodularised JsonCPP

Conflicts:
	lib/jsoncpp
---
 lib/jsoncpp                         |  1 +
 lib/jsoncpp/include/json/features.h | 42 -------------------------------------
 2 files changed, 1 insertion(+), 42 deletions(-)
 create mode 160000 lib/jsoncpp
 delete mode 100644 lib/jsoncpp/include/json/features.h

(limited to 'lib/jsoncpp/include/json/features.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/features.h b/lib/jsoncpp/include/json/features.h
deleted file mode 100644
index 5a9adec11..000000000
--- a/lib/jsoncpp/include/json/features.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-# define CPPTL_JSON_FEATURES_H_INCLUDED
-
-# include "forwards.h"
-
-namespace Json {
-
-   /** \brief Configuration passed to reader and writer.
-    * This configuration object can be used to force the Reader or Writer
-    * to behave in a standard conforming way.
-    */
-   class JSON_API Features
-   {
-   public:
-      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
-       * - C & C++ comments are allowed
-       * - Root object can be any JSON value
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features all();
-
-      /** \brief A configuration that is strictly compatible with the JSON specification.
-       * - Comments are forbidden.
-       * - Root object must be either an array or an object value.
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features strictMode();
-
-      /** \brief Initialize the configuration like JsonConfig::allFeatures;
-       */
-      Features();
-
-      /// \c true if comments are allowed. Default: \c true.
-      bool allowComments_;
-
-      /// \c true if root must be either an array or an object value. Default: \c false.
-      bool strictRoot_;
-   };
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED
-- 
cgit v1.2.3