Skip to content

Commit aa0e847

Browse files
nlohmannnlohmann
committed
Merge branch 'release/3.10.3'
2 parents 626e7d6 + ab6a2c7 commit aa0e847

File tree

94 files changed

+633
-295
lines changed

Some content is hidden

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

94 files changed

+633
-295
lines changed

Diff for: ‎.clang-tidy

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
Checks: '*,
2+
-altera-struct-pack-align,
23
-android-cloexec-fopen,
4+
-concurrency-mt-unsafe,
35
-cppcoreguidelines-avoid-goto,
46
-cppcoreguidelines-avoid-magic-numbers,
57
-cppcoreguidelines-avoid-non-const-global-variables,
@@ -30,6 +32,7 @@ Checks: '*,
3032
-misc-non-private-member-variables-in-classes,
3133
-modernize-use-trailing-return-type,
3234
-readability-function-size,
35+
-readability-function-cognitive-complexity,
3336
-readability-magic-numbers,
3437
-readability-redundant-access-specifiers,
3538
-readability-uppercase-literal-suffix'

Diff for: ‎.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.2
50+
- [ ] latest release version 3.10.3
5151
- [ ] other release - please state the version: ___
5252
- [ ] the `develop` branch
5353

Diff for: ‎.github/workflows/ubuntu.yml

+8-19
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,17 @@ on:
1111
jobs:
1212
ci_test_clang:
1313
runs-on: ubuntu-latest
14+
container: ghcr.io/nlohmann/json-ci:v1.0.0
1415
steps:
1516
- uses: actions/checkout@v2
16-
- name: install_ninja
17-
run: |
18-
sudo apt update
19-
sudo apt install ninja-build
20-
shell: bash
21-
- name: install_clang
22-
run: |
23-
wget https://apt.llvm.org/llvm.sh
24-
chmod +x llvm.sh
25-
sudo ./llvm.sh 11
26-
sudo apt-get install clang-tools-11
27-
shell: bash
2817
- name: cmake
2918
run: cmake -S . -B build -DJSON_CI=On
3019
- name: build
3120
run: cmake --build build --target ci_test_clang
3221

3322
ci_test_gcc:
3423
runs-on: ubuntu-latest
35-
container: nlohmann/json-ci:latest
24+
container: ghcr.io/nlohmann/json-ci:v1.0.0
3625
steps:
3726
- uses: actions/checkout@v2
3827
- name: cmake
@@ -42,7 +31,7 @@ jobs:
4231

4332
ci_static_analysis:
4433
runs-on: ubuntu-latest
45-
container: nlohmann/json-ci:latest
34+
container: ghcr.io/nlohmann/json-ci:v1.0.0
4635
strategy:
4736
matrix:
4837
target: [ci_clang_tidy, ci_cppcheck, ci_test_valgrind, ci_test_clang_sanitizer, ci_test_amalgamation, ci_clang_analyze, ci_cpplint, ci_cmake_flags, ci_single_binaries, ci_reproducible_tests, ci_non_git_tests, ci_offline_testdata, ci_infer]
@@ -55,7 +44,7 @@ jobs:
5544

5645
ci_cmake_options:
5746
runs-on: ubuntu-latest
58-
container: nlohmann/json-ci:latest
47+
container: ghcr.io/nlohmann/json-ci:v1.0.0
5948
strategy:
6049
matrix:
6150
target: [ci_test_diagnostics, ci_test_noexceptions, ci_test_noimplicitconversions]
@@ -68,7 +57,7 @@ jobs:
6857

6958
ci_test_coverage:
7059
runs-on: ubuntu-latest
71-
container: nlohmann/json-ci:latest
60+
container: ghcr.io/nlohmann/json-ci:v1.0.0
7261
steps:
7362
- uses: actions/checkout@v2
7463
- name: cmake
@@ -88,10 +77,10 @@ jobs:
8877

8978
ci_test_compilers:
9079
runs-on: ubuntu-latest
91-
container: nlohmann/json-ci:latest
80+
container: ghcr.io/nlohmann/json-ci:v1.0.0
9281
strategy:
9382
matrix:
94-
compiler: [g++-4.8, g++-4.9, g++-5, g++-7, g++-8, g++-9, g++-10, clang++-3.5, clang++-3.6, clang++-3.7, clang++-3.8, clang++-3.9, clang++-4.0, clang++-5.0, clang++-6.0, clang++-7, clang++-8, clang++-9, clang++-10, clang++-11]
83+
compiler: [g++-4.8, g++-4.9, g++-5, g++-7, g++-8, g++-9, g++-10, clang++-3.5, clang++-3.6, clang++-3.7, clang++-3.8, clang++-3.9, clang++-4.0, clang++-5.0, clang++-6.0, clang++-7, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12]
9584
steps:
9685
- uses: actions/checkout@v2
9786
- name: cmake
@@ -101,7 +90,7 @@ jobs:
10190

10291
ci_test_standards:
10392
runs-on: ubuntu-latest
104-
container: nlohmann/json-ci:latest
93+
container: ghcr.io/nlohmann/json-ci:v1.0.0
10594
strategy:
10695
matrix:
10796
standard: [11, 14, 17, 20]

Diff for: ‎.gitignore

+3-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ build
1212
build_coverage
1313
clang_analyze_build
1414

15-
doc/xml
16-
doc/html
17-
me.nlohmann.json.docset
18-
1915
benchmarks/files/numbers/*.json
2016

2117
.wsjcpp-logs/*
@@ -27,10 +23,11 @@ benchmarks/files/numbers/*.json
2723
test/test-*
2824
/.vs
2925

26+
doc/html
3027
doc/mkdocs/venv/
3128
doc/mkdocs/docs/images
3229
doc/mkdocs/docs/examples
3330
doc/mkdocs/site
3431
doc/mkdocs/docs/__pycache__/
35-
doc/xml
36-
/doc/docset/nlohmann_json.docset/
32+
/doc/docset/JSON_for_Modern_C++.docset/
33+
/doc/docset/JSON_for_Modern_C++.tgz

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.10.2
10+
version: 3.10.3
1111
date-released: 2021
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.10.2 LANGUAGES CXX)
7+
project(nlohmann_json VERSION 3.10.3 LANGUAGES CXX)
88

99
##
1010
## MAIN_PROJECT CHECK

Diff for: ‎ChangeLog.md

+35-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,47 @@
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.2](https://github.com/nlohmann/json/releases/tag/3.10.2) (2021-08-26)
4+
## [3.10.3](https://github.com/nlohmann/json/releases/tag/3.10.3) (2021-10-08)
5+
6+
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.2...3.10.3)
7+
8+
- Parsing an emtpy string returns a string with size 1 instead of expected 0 [\#3057](https://github.com/nlohmann/json/issues/3057)
9+
- Linking error "duplicate symbol: std::type\_info::operator==" on static build with MinGW [\#3042](https://github.com/nlohmann/json/issues/3042)
10+
- Yet another assertion failure when inserting into arrays with JSON\_DIAGNOSTICS set [\#3032](https://github.com/nlohmann/json/issues/3032)
11+
- accept and parse function not work well with a pure number string [\#3029](https://github.com/nlohmann/json/issues/3029)
12+
- push\_back doesn't work for serializing containers [\#3027](https://github.com/nlohmann/json/issues/3027)
13+
- Strange behaviour when creating array with single element [\#3025](https://github.com/nlohmann/json/issues/3025)
14+
- Input ordered\_json doesn't work [\#3023](https://github.com/nlohmann/json/issues/3023)
15+
- Issue iterating through 'items' [\#3021](https://github.com/nlohmann/json/issues/3021)
16+
- Cannot spell the namespace right [\#3015](https://github.com/nlohmann/json/issues/3015)
17+
- JSON Parse error when reading json object from file [\#3011](https://github.com/nlohmann/json/issues/3011)
18+
- Parent pointer not properly set when using update\(\) [\#3007](https://github.com/nlohmann/json/issues/3007)
19+
- Overwriting terminated null character [\#3001](https://github.com/nlohmann/json/issues/3001)
20+
- 'operator =' is ambiguous on VS2017 [\#2997](https://github.com/nlohmann/json/issues/2997)
21+
- JSON Patch for Array Elements [\#2994](https://github.com/nlohmann/json/issues/2994)
22+
- JSON Parse throwing error [\#2983](https://github.com/nlohmann/json/issues/2983)
23+
- to\_{binary format} does not provide a mechanism for specifying a custom allocator for the returned type. [\#2982](https://github.com/nlohmann/json/issues/2982)
24+
- 3.10.1 zip json.hpp has version number 3.10.0 instead of 3.10.1 [\#2973](https://github.com/nlohmann/json/issues/2973)
25+
- Assertion failure when serializing array with JSON\_DIAGNOSTICS set [\#2926](https://github.com/nlohmann/json/issues/2926)
26+
27+
- Fix Clang version [\#3040](https://github.com/nlohmann/json/pull/3040) ([nlohmann](https://github.com/nlohmann))
28+
- Fix assertion failure for JSON\_DIAGNOSTICS [\#3037](https://github.com/nlohmann/json/pull/3037) ([carlsmedstad](https://github.com/carlsmedstad))
29+
- meta: fix is\_compatible/constructible traits [\#3020](https://github.com/nlohmann/json/pull/3020) ([theodelrieu](https://github.com/theodelrieu))
30+
- Set parent pointers for values inserted via update\(\) \(fixes \#3007\). [\#3008](https://github.com/nlohmann/json/pull/3008) ([AnthonyVH](https://github.com/AnthonyVH))
31+
- Allow allocators for output\_vector\_adapter [\#2989](https://github.com/nlohmann/json/pull/2989) ([nlohmann](https://github.com/nlohmann))
32+
- Re-add Clang 12 [\#2986](https://github.com/nlohmann/json/pull/2986) ([nlohmann](https://github.com/nlohmann))
33+
- Use new Docker image [\#2981](https://github.com/nlohmann/json/pull/2981) ([nlohmann](https://github.com/nlohmann))
34+
- Fix -Wunused warnings on JSON\_DIAGNOSTICS [\#2976](https://github.com/nlohmann/json/pull/2976) ([gcerretani](https://github.com/gcerretani))
35+
- Update docset generation script [\#2967](https://github.com/nlohmann/json/pull/2967) ([nlohmann](https://github.com/nlohmann))
36+
37+
## [v3.10.2](https://github.com/nlohmann/json/releases/tag/v3.10.2) (2021-08-26)
538

6-
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.1...3.10.2)
39+
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.1...v3.10.2)
740

841
- Annoying -Wundef on new JSON\_DIAGNOSTICS macro [\#2975](https://github.com/nlohmann/json/issues/2975)
942
- += issue with multiple redirection. [\#2970](https://github.com/nlohmann/json/issues/2970)
1043
- "incomplete type ‘nlohmann::detail::wide\_string\_input\_helper" compilation error [\#2969](https://github.com/nlohmann/json/issues/2969)
1144

12-
- Fix -Wunused warnings on JSON\_DIAGNOSTICS [\#2976](https://github.com/nlohmann/json/pull/2976) ([gcerretani](https://github.com/gcerretani))
13-
1445
## [v3.10.1](https://github.com/nlohmann/json/releases/tag/v3.10.1) (2021-08-24)
1546

1647
[Full Changelog](https://github.com/nlohmann/json/compare/v3.10.0...v3.10.1)

Diff for: ‎README.md

+11-5
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/7p8sQckddTc0Y81T)
13+
[![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/0LzTlmYG06u8qJN5)
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)
@@ -90,6 +90,7 @@ Thanks everyone!
9090

9191
:bug: If you found a **bug**, please check the [**FAQ**](https://json.nlohmann.me/home/faq/) if it is a known issue or the result of a design decision. Please also have a look at the [**issue list**](https://github.com/nlohmann/json/issues) before you [**create a new issue**](https://github.com/nlohmann/json/issues/new/choose). Please provide as many information as possible to help us understand and reproduce your issue.
9292

93+
There is also a [**docset**](https://github.com/Kapeli/Dash-User-Contributions/tree/master/docsets/JSON_for_Modern_C%2B%2B) for the documentation browsers [Dash](https://kapeli.com/dash), [Velocity](https://velocity.silverlakesoftware.com), and [Zeal](https://zealdocs.org) that contains the full [documentation](https://json.nlohmann.me) as offline resource.
9394

9495
## Examples
9596

@@ -1038,7 +1039,7 @@ auto cbor = json::to_msgpack(j); // 0xD5 (fixext2), 0x10, 0xCA, 0xFE
10381039
Though it's 2021 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work:
10391040
10401041
- GCC 4.8 - 11.0 (and possibly later)
1041-
- Clang 3.4 - 12.0 (and possibly later)
1042+
- Clang 3.4 - 13.0 (and possibly later)
10421043
- Apple Clang 9.1 - 12.4 (and possibly later)
10431044
- Intel C++ Compiler 17.0.2 (and possibly later)
10441045
- Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later)
@@ -1110,7 +1111,8 @@ The following compilers are currently used in continuous integration at [Travis]
11101111
| Clang 11.0.0 with GNU-like command-line | Windows-10.0.17763 | GitHub Actions |
11111112
| Clang 11.0.0 with MSVC-like command-line | Windows-10.0.17763 | GitHub Actions |
11121113
| Clang 11.0.0 (11.0.0-2~ubuntu20.04.1) | Ubuntu 20.04.2 LTS | GitHub Actions |
1113-
| Clang 12.1.0 (12.0.1-++20210423082613+072c90a863aa-1~exp1~20210423063319.76 | Ubuntu 20.04.2 LTS | GitHub Actions |
1114+
| Clang 12.0.0 (12.0.0-3ubuntu1~20.04.3) | Ubuntu 20.04.2 LTS | GitHub Actions |
1115+
| Clang 13.0.0 (13.0.0-++20210828094952+9c49fee5e7ac-1exp120210828075752.71 | Ubuntu 20.04.2 LTS | GitHub Actions |
11141116
| Visual Studio 14 2015 MSVC 19.0.24241.7 (Build Engine version 14.0.25420.1) | Windows-6.3.9600 | AppVeyor |
11151117
| Visual Studio 15 2017 MSVC 19.16.27035.0 (Build Engine version 15.9.21+g9802d43bc3 for .NET Framework) | Windows-10.0.14393 | AppVeyor |
11161118
| Visual Studio 15 2017 MSVC 19.16.27045.0 (Build Engine version 15.9.21+g9802d43bc3 for .NET Framework) | Windows-10.0.14393 | GitHub Actions |
@@ -1262,7 +1264,9 @@ If you are using [NuGet](https://www.nuget.org), you can use the package [nlohma
12621264

12631265
If you are using [conda](https://conda.io/), you can use the package [nlohmann_json](https://github.com/conda-forge/nlohmann_json-feedstock) from [conda-forge](https://conda-forge.org) executing `conda install -c conda-forge nlohmann_json`. Please file issues [here](https://github.com/conda-forge/nlohmann_json-feedstock/issues).
12641266

1265-
If you are using [MSYS2](https://www.msys2.org/), your can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
1267+
If you are using [MSYS2](https://www.msys2.org/), you can use the [mingw-w64-nlohmann-json](https://packages.msys2.org/base/mingw-w64-nlohmann-json) package, just type `pacman -S mingw-w64-i686-nlohmann-json` or `pacman -S mingw-w64-x86_64-nlohmann-json` for installation. Please file issues [here](https://github.com/msys2/MINGW-packages/issues/new?title=%5Bnlohmann-json%5D) if you experience problems with the packages.
1268+
1269+
If you are using [MacPorts](https://ports.macports.org), execute `sudo port install nlohmann-json` to install the [nlohmann-json](https://ports.macports.org/port/nlohmann-json/) package.
12661270

12671271
If you are using [`build2`](https://build2.org), you can use the [`nlohmann-json`](https://cppget.org/nlohmann-json) package from the public repository https://cppget.org or directly from the [package's sources repository](https://github.com/build2-packaging/nlohmann-json). In your project's `manifest` file, just add `depends: nlohmann-json` (probably with some [version constraints](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml#guide-add-remove-deps)). If you are not familiar with using dependencies in `build2`, [please read this introduction](https://build2.org/build2-toolchain/doc/build2-toolchain-intro.xhtml).
12681272
Please file issues [here](https://github.com/build2-packaging/nlohmann-json) if you experience problems with the packages.
@@ -1591,6 +1595,8 @@ I deeply appreciate the help of the following people.
15911595
- [Amir Masoud Abdol](https://github.com/amirmasoudabdol) updated the Homebrew command as nlohmann/json is now in homebrew-core.
15921596
- [Hallot](https://github.com/Hallot) fixed some `-Wextra-semi-stmt warnings`.
15931597
- [Giovanni Cerretani](https://github.com/gcerretani) fixed `-Wunused` warnings on `JSON_DIAGNOSTICS`.
1598+
- [Bogdan Popescu](https://github.com/Kapeli) hosts the [docset](https://github.com/Kapeli/Dash-User-Contributions/tree/master/docsets/JSON_for_Modern_C%2B%2B) for offline documentation viewers.
1599+
- [Carl Smedstad](https://github.com/carlsmedstad) fixed an assertion error when using `JSON_DIAGNOSTICS`.
15941600

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

@@ -1622,7 +1628,7 @@ The library itself consists of a single header file licensed under the MIT licen
16221628
- [**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)
16231629
- [**Travis**](https://travis-ci.org) for [continuous integration](https://travis-ci.org/nlohmann/json) on Linux and macOS
16241630
- [**Valgrind**](https://valgrind.org) to check for correct memory management
1625-
- [**Wandbox**](https://wandbox.org) for [online examples](https://wandbox.org/permlink/7p8sQckddTc0Y81T)
1631+
- [**Wandbox**](https://wandbox.org) for [online examples](https://wandbox.org/permlink/0LzTlmYG06u8qJN5)
16261632

16271633

16281634
## Projects using JSON for Modern C++

Diff for: ‎cmake/ci.cmake

+5-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ execute_process(COMMAND ${ASTYLE_TOOL} --version OUTPUT_VARIABLE ASTYLE_TOOL_VER
1313
string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" ASTYLE_TOOL_VERSION "${ASTYLE_TOOL_VERSION}")
1414
message(STATUS "🔖 Artistic Style ${ASTYLE_TOOL_VERSION} (${ASTYLE_TOOL})")
1515

16-
find_program(CLANG_TOOL NAMES clang++-HEAD clang++-12 clang++-11 clang++)
16+
find_program(CLANG_TOOL NAMES clang++-HEAD clang++-13 clang++-12 clang++-11 clang++)
1717
execute_process(COMMAND ${CLANG_TOOL} --version OUTPUT_VARIABLE CLANG_TOOL_VERSION ERROR_VARIABLE CLANG_TOOL_VERSION)
1818
string(REGEX MATCH "[0-9]+(\\.[0-9]+)+" CLANG_TOOL_VERSION "${CLANG_TOOL_VERSION}")
1919
message(STATUS "🔖 Clang ${CLANG_TOOL_VERSION} (${CLANG_TOOL})")
@@ -79,7 +79,7 @@ message(STATUS "🔖 Valgrind ${VALGRIND_TOOL_VERSION} (${VALGRIND_TOOL})")
7979
find_program(GENHTML_TOOL NAMES genhtml)
8080
find_program(PLOG_CONVERTER_TOOL NAMES plog-converter)
8181
find_program(PVS_STUDIO_ANALYZER_TOOL NAMES pvs-studio-analyzer)
82-
find_program(SCAN_BUILD_TOOL NAMES scan-build-11 scan-build)
82+
find_program(SCAN_BUILD_TOOL NAMES scan-build-12 scan-build-11 scan-build)
8383

8484
# the individual source files
8585
file(GLOB_RECURSE SRC_FILES ${PROJECT_SOURCE_DIR}/include/nlohmann/*.hpp)
@@ -96,6 +96,7 @@ file(GLOB_RECURSE SRC_FILES ${PROJECT_SOURCE_DIR}/include/nlohmann/*.hpp)
9696
# -Wno-padded We do not care about padding warnings.
9797
# -Wno-covered-switch-default All switches list all cases and a default case.
9898
# -Wno-weak-vtables The library is header-only.
99+
# -Wreserved-identifier See https://github.com/onqtam/doctest/issues/536.
99100

100101
set(CLANG_CXXFLAGS "-std=c++11 \
101102
-Werror \
@@ -107,6 +108,7 @@ set(CLANG_CXXFLAGS "-std=c++11 \
107108
-Wno-padded \
108109
-Wno-covered-switch-default \
109110
-Wno-weak-vtables \
111+
-Wno-reserved-identifier \
110112
")
111113

112114
# Ignored GCC warnings:
@@ -809,7 +811,7 @@ add_custom_target(ci_cmake_flags
809811
# Use more installed compilers.
810812
###############################################################################
811813

812-
foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-7 g++-8 g++-9 g++-10 clang++-3.5 clang++-3.6 clang++-3.7 clang++-3.8 clang++-3.9 clang++-4.0 clang++-5.0 clang++-6.0 clang++-7 clang++-8 clang++-9 clang++-10 clang++-11)
814+
foreach(COMPILER g++-4.8 g++-4.9 g++-5 g++-7 g++-8 g++-9 g++-10 clang++-3.5 clang++-3.6 clang++-3.7 clang++-3.8 clang++-3.9 clang++-4.0 clang++-5.0 clang++-6.0 clang++-7 clang++-8 clang++-9 clang++-10 clang++-11 clang++-12)
813815
find_program(COMPILER_TOOL NAMES ${COMPILER})
814816
if (COMPILER_TOOL)
815817
add_custom_target(ci_test_compiler_${COMPILER}

Diff for: ‎doc/Doxyfile

+2-2
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.2
8+
PROJECT_NUMBER = 3.10.3
99
PROJECT_BRIEF =
1010
PROJECT_LOGO =
1111
OUTPUT_DIRECTORY = .
@@ -252,7 +252,7 @@ MAN_LINKS = NO
252252
#---------------------------------------------------------------------------
253253
# Configuration options related to the XML output
254254
#---------------------------------------------------------------------------
255-
GENERATE_XML = YES
255+
GENERATE_XML = NO
256256
XML_OUTPUT = xml
257257
XML_PROGRAMLISTING = YES
258258
XML_NS_MEMB_FILE_SCOPE = NO

0 commit comments

Comments
 (0)