Skip to content

Commit e7452d8

Browse files
committed
Merge branch 'release/3.8.0' into develop
2 parents 1ecb788 + 5f86271 commit e7452d8

Some content is hidden

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

60 files changed

+502
-146
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
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.7.3 LANGUAGES CXX)
7+
project(nlohmann_json VERSION 3.8.0 LANGUAGES CXX)
88

99
##
1010
## INCLUDE

ChangeLog.md

Lines changed: 433 additions & 77 deletions

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 = 3.7.3
8+
PROJECT_NUMBER = 3.8.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="https://wandbox.org/permlink/uDkr2VTjsrssiXq3"><b>online</b></a>
1+
<a target="_blank" href="https://wandbox.org/permlink/EezQxM0Nzi8tTUEe"><b>online</b></a>

doc/examples/meta.output

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"url": "https://github.com/nlohmann/json",
1111
"version": {
1212
"major": 3,
13-
"minor": 7,
14-
"patch": 3,
15-
"string": "3.7.3"
13+
"minor": 8,
14+
"patch": 0,
15+
"string": "3.8.0"
1616
}
1717
}

doc/index.md

Lines changed: 1 addition & 1 deletion

doc/json.gif

8.36 KB

include/nlohmann/json.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 3.7.3
4+
| | |__ | | | | | | version 3.8.0
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66
77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -31,8 +31,8 @@ SOFTWARE.
3131
#define INCLUDE_NLOHMANN_JSON_HPP_
3232

3333
#define NLOHMANN_JSON_VERSION_MAJOR 3
34-
#define NLOHMANN_JSON_VERSION_MINOR 7
35-
#define NLOHMANN_JSON_VERSION_PATCH 3
34+
#define NLOHMANN_JSON_VERSION_MINOR 8
35+
#define NLOHMANN_JSON_VERSION_PATCH 0
3636

3737
#include <algorithm> // all_of, find, for_each
3838
#include <cassert> // assert
@@ -1048,7 +1048,7 @@ class basic_json
10481048
object = nullptr; // silence warning, see #821
10491049
if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
10501050
{
1051-
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.7.3")); // LCOV_EXCL_LINE
1051+
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.8.0")); // LCOV_EXCL_LINE
10521052
}
10531053
break;
10541054
}

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('nlohmann_json',
22
'cpp',
3-
version : '3.7.3',
3+
version : '3.8.0',
44
license : 'MIT',
55
)
66

single_include/nlohmann/json.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
__ _____ _____ _____
33
__| | __| | | | JSON for Modern C++
4-
| | |__ | | | | | | version 3.7.3
4+
| | |__ | | | | | | version 3.8.0
55
|_____|_____|_____|_|___| https://github.com/nlohmann/json
66

77
Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -31,8 +31,8 @@ SOFTWARE.
3131
#define INCLUDE_NLOHMANN_JSON_HPP_
3232

3333
#define NLOHMANN_JSON_VERSION_MAJOR 3
34-
#define NLOHMANN_JSON_VERSION_MINOR 7
35-
#define NLOHMANN_JSON_VERSION_PATCH 3
34+
#define NLOHMANN_JSON_VERSION_MINOR 8
35+
#define NLOHMANN_JSON_VERSION_PATCH 0
3636

3737
#include <algorithm> // all_of, find, for_each
3838
#include <cassert> // assert
@@ -16829,7 +16829,7 @@ class basic_json
1682916829
object = nullptr; // silence warning, see #821
1683016830
if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
1683116831
{
16832-
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.7.3")); // LCOV_EXCL_LINE
16832+
JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.8.0")); // LCOV_EXCL_LINE
1683316833
}
1683416834
break;
1683516835
}

0 commit comments

Comments
 (0)