Merge branch 'develop' of https://github.com/nlohmann/json into binary_type

2020-05-16 12:58:13 +02:00 · 2020-05-16 12:58:13 +02:00 · c0cf67ead3
commit c0cf67ead3
parent 3ed059f6ff f40a9f876a
5 changed files with 212 additions and 9 deletions
--- a/include/nlohmann/json.hpp
+++ b/include/nlohmann/json.hpp
@ -7073,7 +7073,7 @@ class basic_json
          - break (0xFF)

    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
+    @return CBOR serialization as byte vector

    @complexity Linear in the size of the JSON value @a j.