remove CPPTL

Author: ambiennt

include/json/autolink.h

@@ -6,14 +6,6 @@
 #ifndef JSONCPP_CONFIG_H_INCLUDED
 #define JSONCPP_CONFIG_H_INCLUDED
 
-/// If defined, indicates that json library is embedded in CppTL library.
-// # define JSONCPP_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-// #  define JSONCPP_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of std::map
-/// as Value container.
-// #  define JSONCPP_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! There is know bugs: See #3177332
@@ -37,16 +29,7 @@
 /// Remarks: defining this macro enables the functionality of: JSONCPP_ASSERT_UNREACHABLE, JSONCPP_ASSERT, JSONCPP_FAIL_MESSAGE, and JSONCPP_ASSERT_MESSAGE
 // # define JSONCPP_ENABLE_ASSERTS 1
 
-#ifdef JSONCPP_IN_CPPTL
-#include <cpptl/config.h>
-#ifndef JSONCPP_USE_CPPTL
-#define JSONCPP_USE_CPPTL 1
-#endif
-#endif
-
-#ifdef JSONCPP_IN_CPPTL
-#define JSONCPP_API CPPTL_API
-#elif defined(JSONCPP_DLL_BUILD)
+#if defined(JSONCPP_DLL_BUILD)
 #define JSONCPP_API __declspec(dllexport)
 #elif defined(JSONCPP_DLL)
 #define JSONCPP_API __declspec(dllimport)

include/json/config.h

@@ -3,8 +3,8 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef CPPTL_JSONCPP_FEATURES_H_INCLUDED
-#define CPPTL_JSONCPP_FEATURES_H_INCLUDED
+#ifndef JSONCPP_FEATURES_H_INCLUDED
+#define JSONCPP_FEATURES_H_INCLUDED
 
 #if !defined(JSONCPP_IS_AMALGAMATION)
 #include "forwards.h"
@@ -45,4 +45,4 @@ namespace Json {
 
 } // namespace Json
 
-#endif // CPPTL_JSONCPP_FEATURES_H_INCLUDED
+#endif // JSONCPP_FEATURES_H_INCLUDED

include/json/features.h

@@ -6,10 +6,10 @@
 #ifndef JSONCPP_JSON_H_INCLUDED
 #define JSONCPP_JSON_H_INCLUDED
 
-#include "autolink.h"
-#include "features.h"
-#include "reader.h"
+#include "config.h"
 #include "value.h"
+#include "reader.h"
 #include "writer.h"
+#include "features.h"
 
 #endif // JSONCPP_JSON_H_INCLUDED

include/json/json.h

@@ -3,17 +3,17 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef CPPTL_JSONCPP_READER_H_INCLUDED
-#define CPPTL_JSONCPP_READER_H_INCLUDED
+#ifndef JSONCPP_READER_H_INCLUDED
+#define JSONCPP_READER_H_INCLUDED
 
 #if !defined(JSONCPP_IS_AMALGAMATION)
 #include "features.h"
 #include "value.h"
 #endif // if !defined(JSONCPP_IS_AMALGAMATION)
 #include <deque>
-#include <iostream>
 #include <stack>
 #include <string>
+#include <iostream>
 
 namespace Json {
 
@@ -186,4 +186,4 @@ namespace Json {
 
 } // namespace Json
 
-#endif // CPPTL_JSONCPP_READER_H_INCLUDED
+#endif // JSONCPP_READER_H_INCLUDED

include/json/reader.h

@@ -3,23 +3,15 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef CPPTL_JSONCPP_H_INCLUDED
-#define CPPTL_JSONCPP_H_INCLUDED
+#ifndef JSONCPP_H_INCLUDED
+#define JSONCPP_H_INCLUDED
 
 #if !defined(JSONCPP_IS_AMALGAMATION)
 #include "forwards.h"
 #endif // if !defined(JSONCPP_IS_AMALGAMATION)
 #include <string>
 #include <vector>
-
-#ifndef JSONCPP_USE_CPPTL_SMALLMAP
 #include <map>
-#else
-#include <cpptl/smallmap.h>
-#endif
-#ifdef JSONCPP_USE_CPPTL
-#include <cpptl/forwards.h>
-#endif
 
 #ifdef JSONCPP_ENABLE_ASSERTS
 #define JSONCPP_ASSERT_UNREACHABLE assert(false)
@@ -59,11 +51,6 @@ namespace Json {
         numberOfCommentPlacement
     };
 
-    // # ifdef JSONCPP_USE_CPPTL
-    //    typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
-    //    typedef CppTL::AnyEnumerator<const Value &> EnumValues;
-    // # endif
-
     /** \brief Lightweight wrapper to tag static string.
      *
      * Value constructor and objectValue member assignement takes advantage of the
@@ -191,11 +178,7 @@ namespace Json {
         };
 
     public:
-#ifndef JSONCPP_USE_CPPTL_SMALLMAP
         typedef std::map<CZString, Value> ObjectValues;
-#else
-        typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#endif // ifndef JSONCPP_USE_CPPTL_SMALLMAP
 #endif // ifndef JSONCPP_VALUE_USE_INTERNAL_MAP
 #endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
@@ -237,9 +220,6 @@ namespace Json {
          */
         Value(const StaticString& value);
         Value(const std::string& value);
-#ifdef JSONCPP_USE_CPPTL
-        Value(const CppTL::ConstString& value);
-#endif
         Value(bool value);
         Value(const Value& other);
         ~Value();
@@ -264,9 +244,6 @@ namespace Json {
 
         const char* asCString() const;
         std::string asString(const std::string& defaultValue = "") const;
-#ifdef JSONCPP_USE_CPPTL
-        CppTL::ConstString asConstString() const;
-#endif
         Int asInt(Value::Int defaultValue = 0) const;
         UInt asUInt(Value::UInt defaultValue = 0) const;
         Int64 asInt64(Value::Int64 defaultValue = 0) const;
@@ -366,20 +343,10 @@ namespace Json {
          * \endcode
          */
         Value& operator[](const StaticString& key);
-#ifdef JSONCPP_USE_CPPTL
-        /// Access an object value by name, create a null member if it does not exist.
-        Value& operator[](const CppTL::ConstString& key);
-        /// Access an object value by name, returns null if there is no member with that name.
-        const Value& operator[](const CppTL::ConstString& key) const;
-#endif
         /// Return the member named key if it exist, defaultValue otherwise.
         Value get(const char* key, const Value& defaultValue) const;
         /// Return the member named key if it exist, defaultValue otherwise.
         Value get(const std::string& key, const Value& defaultValue) const;
-#ifdef JSONCPP_USE_CPPTL
-        /// Return the member named key if it exist, defaultValue otherwise.
-        Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
-#endif
         /// \brief Remove and return the named member.
         ///
         /// Do nothing if it did not exist.
@@ -394,10 +361,6 @@ namespace Json {
         bool isMember(const char* key) const;
         /// Return true if the object has a member named key.
         bool isMember(const std::string& key) const;
-#ifdef JSONCPP_USE_CPPTL
-        /// Return true if the object has a member named key.
-        bool isMember(const CppTL::ConstString& key) const;
-#endif
 
         /// \brief Return a list of the member names.
         ///
@@ -406,11 +369,6 @@ namespace Json {
         /// \post if type() was nullValue, it remains nullValue
         Members getMemberNames() const;
 
-        // # ifdef JSONCPP_USE_CPPTL
-        //       EnumMemberNames enumMemberNames() const;
-        //       EnumValues enumValues() const;
-        // # endif
-
         /// Comments must be //... or /* ... */
         void setComment(const char* comment, CommentPlacement placement);
         /// Comments must be //... or /* ... */
@@ -1030,4 +988,4 @@ namespace Json {
 
 } // namespace Json
 
-#endif // CPPTL_JSONCPP_H_INCLUDED
+#endif // JSONCPP_H_INCLUDED

include/json/value.h

@@ -9,9 +9,9 @@
 #if !defined(JSONCPP_IS_AMALGAMATION)
 #include "value.h"
 #endif // if !defined(JSONCPP_IS_AMALGAMATION)
-#include <iostream>
-#include <string>
 #include <vector>
+#include <string>
+#include <iostream>
 
 namespace Json {
 

include/json/writer.h

@@ -6,8 +6,8 @@
 #ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
 #define JSONCPP_BATCHALLOCATOR_H_INCLUDED
 
-#include <assert.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 

src/lib_json/json_batchallocator.h

@@ -8,12 +8,12 @@
 #include <json/value.h>
 #include "json_tool.h"
 #endif // if !defined(JSONCPP_IS_AMALGAMATION)
-#include <cassert>
+#include <utility>
 #include <cstdio>
+#include <cassert>
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <utility>
 
 #if _MSC_VER >= 1400            // VC++ 8.0
 #pragma warning(disable : 4996) // disable warning about strdup being deprecated.