Skip to content

Commit 0261bc0

Browse files
authored
Fix CI (again) (#4196)
1 parent 59da644 commit 0261bc0

12 files changed

Lines changed: 52 additions & 49 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
# Initializes the CodeQL tools for scanning.
3333
- name: Initialize CodeQL
3434
uses: github/codeql-action/init@v2
35+
with:
36+
languages: c-cpp
3537

3638
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3739
# If this step fails, then you should remove it and run the build manually (see below)

docs/mkdocs/docs/api/adl_serializer/from_json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_
1414
-> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
1515
```
1616
17-
This function is usually called by the [`get()`](../basic_json/get.md) function of the [basic_json](../basic_json)
17+
This function is usually called by the [`get()`](../basic_json/get.md) function of the [basic_json](../basic_json/index.md)
1818
class (either explicitly or via the conversion operators).
1919
2020
1. This function is chosen for default-constructible value types.

docs/mkdocs/docs/api/adl_serializer/to_json.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
77
-> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
88
```
99
10-
This function is usually called by the constructors of the [basic_json](../basic_json) class.
10+
This function is usually called by the constructors of the [basic_json](../basic_json/index.md) class.
1111
1212
## Parameters
1313

docs/mkdocs/docs/api/basic_json/exception.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ constructor.
6868

6969
## See also
7070

71-
[List of exceptions](127.0.0.1:8000/home/exceptions/)
71+
[List of exceptions](../../home/exceptions.md)
7272

7373
## Version history
7474

docs/mkdocs/docs/api/basic_json/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The class satisfies the following concept requirements:
7373
- [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable): JSON values can be compared with
7474
`==`, see [`operator==`](operator_eq.md).
7575
- [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable): JSON values can be compared with
76-
`<`, see [`operator<`](operator_le).
76+
`<`, see [`operator<`](operator_le.md).
7777
- [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable): Any JSON lvalue or rvalue of can be swapped with
7878
any lvalue or rvalue of other compatible types, using unqualified function `swap`.
7979
- [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer): JSON values can be compared against
@@ -88,7 +88,7 @@ The class satisfies the following concept requirements:
8888

8989
## Member types
9090

91-
- [**adl_serializer**](../adl_serializer) - the default serializer
91+
- [**adl_serializer**](../adl_serializer/index.md) - the default serializer
9292
- [**value_t**](value_t.md) - the JSON type enumeration
9393
- [**json_pointer**](../json_pointer/index.md) - JSON Pointer implementation
9494
- [**json_serializer**](json_serializer.md) - type of the serializer to for conversions from/to JSON

docs/mkdocs/docs/api/basic_json/json_serializer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using json_serializer = JSONSerializer<T, SFINAE>;
1717

1818
#### Default type
1919

20-
The default values for `json_serializer` is [`adl_serializer`](../adl_serializer).
20+
The default values for `json_serializer` is [`adl_serializer`](../adl_serializer/index.md).
2121

2222
## Examples
2323

docs/mkdocs/docs/api/macros/json_throw_user.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ replaced by calling [`std::abort`](https://en.cppreference.com/w/cpp/utility/pro
6868
## See also
6969
7070
- [Switch off exceptions](../../home/exceptions.md#switch-off-exceptions) for more information how to switch off exceptions
71-
- [JSON_NOEXCEPTION](JSON_NOEXCEPTION) - switch off exceptions
71+
- [JSON_NOEXCEPTION](json_noexception.md) - switch off exceptions
7272
7373
## Version history
7474

docs/mkdocs/docs/features/types/number_handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ integers, and between integers and floating-point values to integers. This beha
245245

246246
The rationale is twofold:
247247

248-
1. JSON does not define a number type or precision (see [#json-specification](above)).
248+
1. JSON does not define a number type or precision (see above).
249249
2. C++ also allows to silently convert between number types.
250250

251251
!!! success "Conditional number conversion"

docs/mkdocs/docs/integration/package_managers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Throughout this page, we will describe how to compile the example file `example.
99
When executed, this program should create output similar to
1010

1111
```json
12-
--8<-- "../../examples/meta.output"
12+
--8<-- "examples/meta.output"
1313
```
1414

1515
## Homebrew

docs/mkdocs/mkdocs.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repo_url: https://github.com/nlohmann/json
99
edit_uri: edit/develop/docs/mkdocs/docs
1010

1111
# Copyright
12-
copyright: Copyright &copy; 2013 - 2022 Niels Lohmann
12+
copyright: Copyright &copy; 2013 - 2023 Niels Lohmann
1313

1414
# Configuration
1515
theme:
@@ -270,6 +270,7 @@ nav:
270270
- 'JSON_HAS_EXPERIMENTAL_FILESYSTEM': api/macros/json_has_filesystem.md
271271
- 'JSON_HAS_FILESYSTEM': api/macros/json_has_filesystem.md
272272
- 'JSON_HAS_RANGES': api/macros/json_has_ranges.md
273+
- 'JSON_HAS_STATIC_RTTI': api/macros/json_has_static_rtti.md
273274
- 'JSON_HAS_THREE_WAY_COMPARISON': api/macros/json_has_three_way_comparison.md
274275
- 'JSON_NOEXCEPTION': api/macros/json_noexception.md
275276
- 'JSON_NO_IO': api/macros/json_no_io.md
@@ -325,8 +326,8 @@ markdown_extensions:
325326
- pymdownx.critic
326327
- pymdownx.details
327328
- pymdownx.emoji:
328-
emoji_index: !!python/name:materialx.emoji.twemoji
329-
emoji_generator: !!python/name:materialx.emoji.to_svg
329+
emoji_index: !!python/name:material.extensions.emoji.twemoji
330+
emoji_generator: !!python/name:material.extensions.emoji.to_svg
330331
- pymdownx.inlinehilite
331332
- pymdownx.magiclink
332333
- pymdownx.mark

0 commit comments

Comments
 (0)