From 71206cdcc170abb769da4e88a78a9f9ae713f53f Mon Sep 17 00:00:00 2001
From: danielaparker <danielaparker@yahoo.com>
Date: Mon, 18 Jan 2021 15:24:51 -0500
Subject: [PATCH] ChangeLog update

---
 ChangeLog.md                    |  9 +++++++++
 include/jsoncons/basic_json.hpp | 21 ---------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 88096a312e..cc5b11258a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -6,6 +6,9 @@ Bugs fixed:
 - A C++20 change caused a `basic_json` overloaded operator '==' to be ambiguous 
 despite there being a unique best viable function. Fixed.
 
+- When parsing MessagePack buffers, lengths were being incorrectly 
+parsed as signed integers. Fixed.
+
 Enhancements:
 
 - Added jsonschema extension that implements the JSON Schema [Draft 7](https://json-schema.org/specification-links.html#draft-7) 
@@ -21,6 +24,12 @@ the flattened output was {"/bar":null,"/foo":null}, but is now
 `{"/bar":{},"/foo":[]}`. `jsonpointer::unflatten` will now return 
 the original object.  
 
+Deprecated function removed:
+
+- The long since deprecated `basic_json` funtion 
+`to_string(const basic_json_encode_options<char_type>&, char_allocator_type&) const`
+has been removed (replaced by `dump`).
+
 v0.159.0
 --------
 
diff --git a/include/jsoncons/basic_json.hpp b/include/jsoncons/basic_json.hpp
index 9cfeef0571..4d68913c52 100644
--- a/include/jsoncons/basic_json.hpp
+++ b/include/jsoncons/basic_json.hpp
@@ -1708,14 +1708,6 @@ class basic_json
                 evaluate().dump(os, options);
             }
         }
-/*
-        template <class SAllocator=std::allocator<char_type>>
-        JSONCONS_DEPRECATED_MSG("Instead, use dump(std::basic_ostream<char_type>&, const basic_json_encode_options<char_type>&)")
-        std::basic_string<char_type,char_traits_type,SAllocator> to_string(const basic_json_encode_options<char_type>& options, char_allocator_type& alloc = char_allocator_type()) const
-        {
-            return evaluate().to_string(options,alloc);
-        }
-*/
         JSONCONS_DEPRECATED_MSG("Instead, use dump(basic_json_visitor<char_type>&)")
         void to_stream(basic_json_visitor<char_type>& visitor) const
         {
@@ -4773,19 +4765,6 @@ class basic_json
     }
 
 #if !defined(JSONCONS_NO_DEPRECATED)
-/*
-    template <class SAllocator = std::allocator<char_type>>
-    JSONCONS_DEPRECATED_MSG("Instead, use dump(std::basic_ostream<char_type>&, const basic_json_encode_options<char_type>&)")
-    std::basic_string<char_type, char_traits_type, SAllocator> to_string(const basic_json_encode_options<char_type>& options,
-        const SAllocator& alloc = SAllocator()) const
-    {
-        using string_type = std::basic_string<char_type, char_traits_type, SAllocator>;
-        string_type s(alloc);
-        basic_compact_json_encoder<char_type, jsoncons::string_sink<string_type>> encoder(s, options);
-        dump(encoder);
-        return s;
-    }
-*/
     JSONCONS_DEPRECATED_MSG("Instead, use basic_json(byte_string_arg_t, const Source&, semantic_tag=semantic_tag::none,const Allocator& = Allocator())")
     basic_json(const byte_string_view& bytes, 
                semantic_tag tag,