Skip to content

Commit 626e7d6

Browse files
nlohmannnlohmann
committed
Merge branch 'release/3.10.2'
2 parents b488724 + 33b674b commit 626e7d6

File tree

78 files changed

+103
-85
lines changed

Some content is hidden

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

78 files changed

+103
-85
lines changed

‎.github/ISSUE_TEMPLATE/Bug_report.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ assignees: ''
4747

4848
<!-- Please add an `x` to the respective line. -->
4949

50-
- [ ] latest release version 3.10.1
50+
- [ ] latest release version 3.10.2
5151
- [ ] other release - please state the version: ___
5252
- [ ] the `develop` branch
5353

‎CITATION.cff

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors:
77
email: [email protected]
88
website: https://nlohmann.me
99
title: "JSON for Modern C++"
10-
version: 3.10.1
10+
version: 3.10.2
1111
date-released: 2021
1212
license: MIT
1313
repository-code: "https://github.com/nlohmann"

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
44
## PROJECT
55
## name and version
66
##
7-
project(nlohmann_json VERSION 3.10.1 LANGUAGES CXX)
7+
project(nlohmann_json VERSION 3.10.2 LANGUAGES CXX)
88

99
##
1010
## MAIN_PROJECT CHECK

‎ChangeLog.md

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
# Changelog
22
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
33

4-
## [3.10.1](https://github.com/nlohmann/json/releases/tag/3.10.1) (2021-08-24)
4+
## [3.10.2](https://github.com/nlohmann/json/releases/tag/3.10.2) (2021-08-26)
55

6-
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.0...3.10.1)
6+
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.1...3.10.2)
77

8+
- Annoying -Wundef on new JSON\_DIAGNOSTICS macro [\#2975](https://github.com/nlohmann/json/issues/2975)
9+
- += issue with multiple redirection. [\#2970](https://github.com/nlohmann/json/issues/2970)
810
- "incomplete type ‘nlohmann::detail::wide\_string\_input\_helper" compilation error [\#2969](https://github.com/nlohmann/json/issues/2969)
11+
12+
- Fix -Wunused warnings on JSON\_DIAGNOSTICS [\#2976](https://github.com/nlohmann/json/pull/2976) ([gcerretani](https://github.com/gcerretani))
13+
14+
## [v3.10.1](https://github.com/nlohmann/json/releases/tag/v3.10.1) (2021-08-24)
15+
16+
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.0...v3.10.1)
17+
918
- JSON\_DIAGNOSTICS assertion for ordered\_json [\#2962](https://github.com/nlohmann/json/issues/2962)
1019
- Inserting in unordered json using a pointer retains the leading slash [\#2958](https://github.com/nlohmann/json/issues/2958)
1120
- Test \#9: test-cbor test case sample.json fails in debug mode - Stack overflow [\#2955](https://github.com/nlohmann/json/issues/2955)

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/e0d1a9d5d6fd46fcb655c4cb930bb3e8)](https://www.codacy.com/gh/nlohmann/json/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=nlohmann/json&amp;utm_campaign=Badge_Grade)
1111
[![Language grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/nlohmann/json.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nlohmann/json/context:cpp)
1212
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/json.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:json)
13-
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/NVz8xGnDiSisXIiH)
13+
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/7p8sQckddTc0Y81T)
1414
[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://nlohmann.github.io/json/doxygen/index.html)
1515
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/nlohmann/json/master/LICENSE.MIT)
1616
[![GitHub Releases](https://img.shields.io/github/release/nlohmann/json.svg)](https://github.com/nlohmann/json/releases)
@@ -1590,6 +1590,7 @@ I deeply appreciate the help of the following people.
15901590
- [Arseniy Terekhin](https://github.com/senyai) made the GDB pretty-printer robust against unset variable names.
15911591
- [Amir Masoud Abdol](https://github.com/amirmasoudabdol) updated the Homebrew command as nlohmann/json is now in homebrew-core.
15921592
- [Hallot](https://github.com/Hallot) fixed some `-Wextra-semi-stmt warnings`.
1593+
- [Giovanni Cerretani](https://github.com/gcerretani) fixed `-Wunused` warnings on `JSON_DIAGNOSTICS`.
15931594

15941595
Thanks a lot for helping out! Please [let me know](mailto:[email protected]) if I forgot someone.
15951596

@@ -1621,7 +1622,7 @@ The library itself consists of a single header file licensed under the MIT licen
16211622
- [**send_to_wandbox**](https://github.com/nlohmann/json/blob/develop/doc/scripts/send_to_wandbox.py) to send code examples to [Wandbox](https://wandbox.org)
16221623
- [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS
16231624
- [**Valgrind**](https://valgrind.org) to check for correct memory management
1624-
- [**Wandbox**](https://wandbox.org) for [online examples](https://wandbox.org/permlink/NVz8xGnDiSisXIiH)
1625+
- [**Wandbox**](https://wandbox.org) for [online examples](https://wandbox.org/permlink/7p8sQckddTc0Y81T)
16251626

16261627

16271628
## Projects using JSON for Modern C++

‎doc/Doxyfile

+1-1
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 = 3.10.1
8+
PROJECT_NUMBER = 3.10.2
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =
1111
OUTPUT_DIRECTORY = .

‎doc/examples/README.link

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a target="_blank" href="https://wandbox.org/permlink/NVz8xGnDiSisXIiH"><b>online</b></a>
1+
<a target="_blank" href="https://wandbox.org/permlink/7p8sQckddTc0Y81T"><b>online</b></a>

‎doc/examples/meta.output

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": {
1212
"major": 3,
1313
"minor": 10,
14-
"patch": 1,
15-
"string": "3.10.1"
14+
"patch": 2,
15+
"string": "3.10.2"
1616
}
1717
}

‎doc/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,4 +332,4 @@ Note that this table only lists those exceptions thrown due to the type. For ins
332332
@author [Niels Lohmann](http://nlohmann.me)
333333
@see https://github.com/nlohmann/json to download the source code
334334

335-
@version 3.10.1
335+
@version 3.10.2

‎doc/json.gif

-151 Bytes
Loading

‎include/nlohmann/detail/macro_scope.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -301,3 +301,7 @@
301301
#else
302302
#define JSON_EXPLICIT explicit
303303
#endif
304+
305+
#ifndef JSON_DIAGNOSTICS
306+
#define JSON_DIAGNOSTICS 0
307+
#endif

‎include/nlohmann/json.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -32,7 +32,7 @@ SOFTWARE.
3232

3333
#define NLOHMANN_JSON_VERSION_MAJOR 3
3434
#define NLOHMANN_JSON_VERSION_MINOR 10
35-
#define NLOHMANN_JSON_VERSION_PATCH 1
35+
#define NLOHMANN_JSON_VERSION_PATCH 2
3636

3737
#include <algorithm> // all_of, find, for_each
3838
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
@@ -1065,7 +1065,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
10651065
object = nullptr; // silence warning, see #821
10661066
if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
10671067
{
1068-
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.1", basic_json())); // LCOV_EXCL_LINE
1068+
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.2", basic_json())); // LCOV_EXCL_LINE
10691069
}
10701070
break;
10711071
}

‎meson.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('nlohmann_json',
22
'cpp',
3-
version : '3.10.1',
3+
version : '3.10.2',
44
license : 'MIT',
55
)
66

‎single_include/nlohmann/json.hpp

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -32,7 +32,7 @@ SOFTWARE.
3232

3333
#define NLOHMANN_JSON_VERSION_MAJOR 3
3434
#define NLOHMANN_JSON_VERSION_MINOR 10
35-
#define NLOHMANN_JSON_VERSION_PATCH 1
35+
#define NLOHMANN_JSON_VERSION_PATCH 2
3636

3737
#include <algorithm> // all_of, find, for_each
3838
#include <cstddef> // nullptr_t, ptrdiff_t, size_t
@@ -2514,6 +2514,10 @@ JSON_HEDLEY_DIAGNOSTIC_POP
25142514
#define JSON_EXPLICIT explicit
25152515
#endif
25162516

2517+
#ifndef JSON_DIAGNOSTICS
2518+
#define JSON_DIAGNOSTICS 0
2519+
#endif
2520+
25172521

25182522
namespace nlohmann
25192523
{
@@ -18466,7 +18470,7 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
1846618470
object = nullptr; // silence warning, see #821
1846718471
if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
1846818472
{
18469-
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.1", basic_json())); // LCOV_EXCL_LINE
18473+
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.2", basic_json())); // LCOV_EXCL_LINE
1847018474
}
1847118475
break;
1847218476
}

‎test/src/fuzzer-driver_afl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a driver for American Fuzzy Lop (afl-fuzz). It relies on

‎test/src/fuzzer-parse_bson.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a parser test suitable for fuzz testing. Given a byte

‎test/src/fuzzer-parse_cbor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a parser test suitable for fuzz testing. Given a byte

‎test/src/fuzzer-parse_json.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a parser test suitable for fuzz testing. Given a byte

‎test/src/fuzzer-parse_msgpack.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a parser test suitable for fuzz testing. Given a byte

‎test/src/fuzzer-parse_ubjson.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (fuzz test support)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
This file implements a parser test suitable for fuzz testing. Given a byte

‎test/src/unit-algorithms.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-allocator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-alt-string.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-assert_macro.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-bson.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-byte_container_with_subtype.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-capacity.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-cbor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-class_const_iterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-class_iterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-class_lexer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-class_parser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-comparison.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-concepts.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-constructor1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-constructor2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

‎test/src/unit-convenience.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++ (test suite)
4-
| | |__ | | | | | | version 3.10.1
4+
| | |__ | | | | | | version 3.10.2
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.

0 commit comments

Comments
 (0)