Skip to content

Commit 69d7448

Browse files
nlohmannnlohmann
committed
Merge branch 'release/3.11.1'
2 parents cbaf103 + f2020da commit 69d7448

File tree

149 files changed

+384
-371
lines changed

Some content is hidden

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

149 files changed

+384
-371
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/bug.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ body:
7676
label: Library version
7777
description: >
7878
Which version of the library did you use? If it is a released version,
79-
please enter the version number (e.g., 3.11.0). Otherwise, please enter
79+
please enter the version number (e.g., 3.11.1). Otherwise, please enter
8080
the commit hash. If you got the library from another source as the
8181
GitHub repository (e.g., via a package manager), please also state
8282
this.

Diff for: ‎.reuse/templates/json.jinja2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__ _____ _____ _____
22
__| | __| | | | JSON for Modern C++
3-
| | |__ | | | | | | version 3.11.0
3+
| | |__ | | | | | | version 3.11.1
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

Diff for: ‎.reuse/templates/json_support.jinja2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__ _____ _____ _____
22
__| | __| | | | JSON for Modern C++ (supporting code)
3-
| | |__ | | | | | | version 3.11.0
3+
| | |__ | | | | | | version 3.11.1
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

Diff for: ‎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.11.0
10+
version: 3.11.1
1111
date-released: 2022-01-03
1212
license: MIT
1313
repository-code: "https://github.com/nlohmann"

Diff for: ‎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.11.0 LANGUAGES CXX)
7+
project(nlohmann_json VERSION 3.11.1 LANGUAGES CXX)
88

99
##
1010
## MAIN_PROJECT CHECK

Diff for: ‎ChangeLog.md

+182-169

Diff for: ‎README.md

+1-1

Diff for: ‎docs/docset/docset.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "JSON for Modern C++",
3-
"version": "3.11.0",
3+
"version": "3.11.1",
44
"archive": "JSON_for_Modern_C++.tgz",
55
"author": {
66
"name": "Niels Lohmann",

Diff for: ‎docs/examples/meta.output

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

Diff for: ‎docs/examples/nlohmann_json_version.output

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
JSON for Modern C++ version 3.11.0
1+
JSON for Modern C++ version 3.11.1

Diff for: ‎docs/json.gif

208 Bytes

Diff for: ‎docs/mkdocs/docs/integration/cmake.md

+4-4

Diff for: ‎include/nlohmann/adl_serializer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/byte_container_with_subtype.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/abi_macros.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>
@@ -12,15 +12,15 @@
1212

1313
#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
1414
#if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
15-
#if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 0
15+
#if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 1
1616
#warning "Already included a different version of the library!"
1717
#endif
1818
#endif
1919
#endif
2020

2121
#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum)
2222
#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum)
23-
#define NLOHMANN_JSON_VERSION_PATCH 0 // NOLINT(modernize-macro-to-enum)
23+
#define NLOHMANN_JSON_VERSION_PATCH 1 // NOLINT(modernize-macro-to-enum)
2424

2525
#ifndef JSON_DIAGNOSTICS
2626
#define JSON_DIAGNOSTICS 0

Diff for: ‎include/nlohmann/detail/conversions/from_json.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/conversions/to_chars.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>

Diff for: ‎include/nlohmann/detail/conversions/to_json.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/exceptions.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/hash.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/binary_reader.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/input_adapters.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/json_sax.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/lexer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/parser.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/input/position_t.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/internal_iterator.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/iter_impl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/iteration_proxy.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/iterator_traits.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/json_reverse_iterator.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/iterators/primitive_iterator.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/json_pointer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/json_ref.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/macro_scope.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/macro_unscope.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/call_std/begin.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/call_std/end.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/cpp_future.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/detected.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/identity_tag.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/is_sax.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/std_fs.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/type_traits.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/meta/void_t.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

Diff for: ‎include/nlohmann/detail/output/binary_writer.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// __ _____ _____ _____
22
// __| | __| | | | JSON for Modern C++
3-
// | | |__ | | | | | | version 3.11.0
3+
// | | |__ | | | | | | version 3.11.1
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2022 Niels Lohmann <https://nlohmann.me>

0 commit comments

Comments
 (0)