Skip to content

Commit f642934

Browse files
nlohmannnlohmann
committed
🔀 merge branch 'release/2.1.0' into develop
2 parents 2f62607 + 6746a57 commit f642934

53 files changed

Lines changed: 195 additions & 65 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.0)
22

33
# define the project
4-
project(nlohmann_json VERSION 2.0.10 LANGUAGES CXX)
4+
project(nlohmann_json VERSION 2.1.0 LANGUAGES CXX)
55

66
enable_testing()
77

‎ChangeLog.md‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,43 @@
11
# Change Log
22
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
33

4+
## [v2.1.0](https://github.com/nlohmann/json/releases/tag/v2.1.0) (2017-01-28)
5+
[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.10...v2.1.0)
6+
7+
- Parsing multiple JSON objects from a string or stream [\#438](https://github.com/nlohmann/json/issues/438)
8+
- Use-of-uninitialized-value \(OSS-Fuzz issue 477\) [\#437](https://github.com/nlohmann/json/issues/437)
9+
- add `reserve` function for array to reserve memory before adding json values into it [\#436](https://github.com/nlohmann/json/issues/436)
10+
- Typo in examples page [\#434](https://github.com/nlohmann/json/issues/434)
11+
- avoid malformed json [\#433](https://github.com/nlohmann/json/issues/433)
12+
- How to add json objects to a map? [\#432](https://github.com/nlohmann/json/issues/432)
13+
- create json instance from raw json \(unsigned char\*\) [\#431](https://github.com/nlohmann/json/issues/431)
14+
- Getting std::invalid\_argument: stream error when following example [\#429](https://github.com/nlohmann/json/issues/429)
15+
- Forward declare-only header? [\#427](https://github.com/nlohmann/json/issues/427)
16+
- Implicit conversion from array to object [\#425](https://github.com/nlohmann/json/issues/425)
17+
- Automatic ordered JSON [\#424](https://github.com/nlohmann/json/issues/424)
18+
- error C4996: 'strerror' when reading file [\#422](https://github.com/nlohmann/json/issues/422)
19+
- Get an error - JSON pointer must be empty or begin with '/' [\#421](https://github.com/nlohmann/json/issues/421)
20+
- size parameter for parse\(\) [\#419](https://github.com/nlohmann/json/issues/419)
21+
- json.hpp forcibly defines GCC\_VERSION [\#417](https://github.com/nlohmann/json/issues/417)
22+
- Use-of-uninitialized-value \(OSS-Fuzz issue 377\) [\#416](https://github.com/nlohmann/json/issues/416)
23+
- Single char converted to ASCII code instead of string [\#413](https://github.com/nlohmann/json/issues/413)
24+
- How to know if a string was parsed as utf-8? [\#406](https://github.com/nlohmann/json/issues/406)
25+
- Overloaded += to add objects to an array makes no sense? [\#404](https://github.com/nlohmann/json/issues/404)
26+
- Finding a value in an array [\#399](https://github.com/nlohmann/json/issues/399)
27+
- add release information in static function [\#397](https://github.com/nlohmann/json/issues/397)
28+
- Optimize memory usage of json objects in combination with binary serialization [\#373](https://github.com/nlohmann/json/issues/373)
29+
- Conversion operators not considered [\#369](https://github.com/nlohmann/json/issues/369)
30+
- Append ".0" to serialized floating\_point values that are digits-only. [\#362](https://github.com/nlohmann/json/issues/362)
31+
- Add a customization point for user-defined types [\#328](https://github.com/nlohmann/json/issues/328)
32+
- Conformance report for reference [\#307](https://github.com/nlohmann/json/issues/307)
33+
- Document the best way to serialize/deserialize user defined types to json [\#298](https://github.com/nlohmann/json/issues/298)
34+
- Add StringView template typename to basic\_json [\#297](https://github.com/nlohmann/json/issues/297)
35+
- \[Improvement\] Add option to remove exceptions [\#296](https://github.com/nlohmann/json/issues/296)
36+
- Performance in miloyip/nativejson-benchmark [\#202](https://github.com/nlohmann/json/issues/202)
37+
38+
- conversion from/to user-defined types [\#435](https://github.com/nlohmann/json/pull/435) ([nlohmann](https://github.com/nlohmann))
39+
- Fix documentation error [\#430](https://github.com/nlohmann/json/pull/430) ([vjon](https://github.com/vjon))
40+
441
## [v2.0.10](https://github.com/nlohmann/json/releases/tag/v2.0.10) (2017-01-02)
542
[Full Changelog](https://github.com/nlohmann/json/compare/v2.0.9...v2.0.10)
643

‎LICENSE.MIT‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
JSON for Modern C++ is licensed under the MIT License
2-
<http://opensource.org/licenses/MIT>:
1+
MIT License
32

43
Copyright (c) 2013-2017 Niels Lohmann
54

6-
Permission is hereby granted, free of charge, to any person obtaining a copy of
7-
this software and associated documentation files (the "Software"), to deal in
8-
the Software without restriction, including without limitation the rights to
9-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
10-
of the Software, and to permit persons to whom the Software is furnished to do
11-
so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
1211

1312
The above copyright notice and this permission notice shall be included in all
1413
copies or substantial portions of the Software.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Build status](https://doozer.io/badge/nlohmann/json/buildstatus/develop)](https://doozer.io/user/nlohmann/json)
66
[![Coverage Status](https://img.shields.io/coveralls/nlohmann/json.svg)](https://coveralls.io/r/nlohmann/json)
77
[![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json)
8-
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/IoZNMHqubixQx2dN)
8+
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](http://melpon.org/wandbox/permlink/4NEU6ZZMoM9lpIex)
99
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](http://nlohmann.github.io/json)
1010
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
1111
[![Github Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)

‎doc/Doxyfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#---------------------------------------------------------------------------
66
DOXYFILE_ENCODING = UTF-8
77
PROJECT_NAME = "JSON for Modern C++"
8-
PROJECT_NUMBER = 2.0.10
8+
PROJECT_NUMBER = 2.1.0
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =
1111
OUTPUT_DIRECTORY = .

‎doc/examples/README.link‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a target="_blank" href="http://melpon.org/wandbox/permlink/IoZNMHqubixQx2dN"><b>online</b></a>
1+
<a target="_blank" href="http://melpon.org/wandbox/permlink/4NEU6ZZMoM9lpIex"><b>online</b></a>

‎doc/examples/meta.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include <json.hpp>
2+
3+
using json = nlohmann::json;
4+
5+
int main()
6+
{
7+
// call meta()
8+
std::cout << std::setw(4) << json::meta() << '\n';
9+
}

‎doc/examples/meta.link‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<a target="_blank" href="http://melpon.org/wandbox/permlink/3hERJociqLo3vdod"><b>online</b></a>

‎doc/examples/meta.output‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"compiler": {
3+
"c++": "201103",
4+
"family": "clang",
5+
"version": "8.0.0 (clang-800.0.42.1)"
6+
},
7+
"copyright": "(C) 2013-2017 Niels Lohmann",
8+
"name": "JSON for Modern C++",
9+
"platform": "apple",
10+
"url": "https://github.com/nlohmann/json",
11+
"version": {
12+
"major": 2,
13+
"minor": 1,
14+
"patch": 0,
15+
"string": "2.1.0"
16+
}
17+
}

‎doc/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,4 +277,4 @@ The container functions known from STL have been extended to support the differe
277277
@author [Niels Lohmann](http://nlohmann.me)
278278
@see https://github.com/nlohmann/json to download the source code
279279

280-
@version 2.0.10
280+
@version 2.1.0

0 commit comments

Comments
 (0)