Skip to content

Commit 9cca280

Browse files
nlohmannnlohmann
authored
JSON for Modern C++ 3.11.3 (#4222)
1 parent 1d59774 commit 9cca280

File tree

159 files changed

+242
-246
lines changed

Some content is hidden

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

159 files changed

+242
-246
lines changed

‎.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.2). Otherwise, please enter
79+
please enter the version number (e.g., 3.11.3). 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.

‎.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.2
3+
| | |__ | | | | | | version 3.11.3
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

‎.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.2
3+
| | |__ | | | | | | version 3.11.3
44
|_____|_____|_____|_|___| https://github.com/nlohmann/json
55

66
{% for copyright_line in copyright_lines %}

‎CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ authors:
77
email: mail@nlohmann.me
88
website: https://nlohmann.me
99
title: "JSON for Modern C++"
10-
version: 3.11.2
11-
date-released: 2022-08-12
10+
version: 3.11.3
11+
date-released: 2023-11-28
1212
license: MIT
1313
repository-code: "https://github.com/nlohmann"
1414
url: https://json.nlohmann.me

‎CMakeLists.txt

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

99
##
1010
## MAIN_PROJECT CHECK

‎README.md

+1-1

‎docs/avatars.png

3.66 KB

‎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.2",
3+
"version": "3.11.3",
44
"archive": "JSON_for_Modern_C++.tgz",
55
"author": {
66
"name": "Niels Lohmann",

‎docs/examples/meta.output

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"compiler": {
33
"c++": "201103",
44
"family": "gcc",
5-
"version": "12.1.0"
5+
"version": "12.3.0"
66
},
77
"copyright": "(C) 2013-2022 Niels Lohmann",
88
"name": "JSON for Modern C++",
@@ -11,7 +11,7 @@
1111
"version": {
1212
"major": 3,
1313
"minor": 11,
14-
"patch": 2,
15-
"string": "3.11.2"
14+
"patch": 3,
15+
"string": "3.11.3"
1616
}
1717
}

‎docs/examples/nlohmann_json_namespace.output

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nlohmann::json_abi_v3_11_2
1+
nlohmann::json_abi_v3_11_3

‎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.2
1+
JSON for Modern C++ version 3.11.3

‎docs/json.gif

7.92 KB

‎docs/mkdocs/docs/integration/cmake.md

+4-4

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 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 != 2
15+
#if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3
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 2 // NOLINT(modernize-macro-to-enum)
23+
#define NLOHMANN_JSON_VERSION_PATCH 3 // NOLINT(modernize-macro-to-enum)
2424

2525
#ifndef JSON_DIAGNOSTICS
2626
#define JSON_DIAGNOSTICS 0

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎include/nlohmann/detail/json_custom_base_class.hpp

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
// __ _____ _____ _____
2+
// __| | __| | | | JSON for Modern C++
3+
// | | |__ | | | | | | version 3.11.3
4+
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
5+
//
6+
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>
7+
// SPDX-License-Identifier: MIT
8+
19
#pragma once
210

311
#include <type_traits> // conditional, is_same

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

‎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.2
3+
// | | |__ | | | | | | version 3.11.3
44
// |_____|_____|_____|_|___| https://github.com/nlohmann/json
55
//
66
// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann <https://nlohmann.me>

0 commit comments

Comments
 (0)