Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nlohmann/json
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.11.2
Choose a base ref
...
head repository: nlohmann/json
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref

Commits on Aug 12, 2022

  1. Merge tag 'v3.11.2' into develop

    JSON for Modern C++ 3.11.2 v3.11.2
    nlohmann committed Aug 12, 2022
    Copy the full SHA
    8fcdbf2 View commit details

Commits on Aug 27, 2022

  1. Copy the full SHA
    4c8cdd7 View commit details
  2. 1
    Copy the full SHA
    f7973f4 View commit details

Commits on Aug 28, 2022

  1. Allow custom base class as node customization point (#3110)

    Co-authored-by: Niels Lohmann <niels.lohmann@gmail.com>
    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    Co-authored-by: barcode <barcode@example.com>
    4 people authored Aug 28, 2022
    Copy the full SHA
    bed648c View commit details

Commits on Aug 30, 2022

  1. Copy the full SHA
    307c053 View commit details

Commits on Sep 13, 2022

  1. Add clang-tools to required tools for ci_static_analysis_clang (#3724)

    * 💚 add clang-tools to required tools for ci_static_analysis_clang
    
    * 🚨 update Clang-Tidy warning selection
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings
    
    * 🚨 fix Clang-Tidy warnings (#3738)
    
    * ⏪ revert fix
    
    * ⏪ revert fix
    
    * 🚨 fix Clang-Tidy warnings (#3739)
    
    Co-authored-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
    nlohmann and falbrechtskirchinger authored Sep 13, 2022
    Copy the full SHA
    58bd97e View commit details

Commits on Sep 15, 2022

  1. Copy the full SHA
    15ca78a View commit details

Commits on Sep 16, 2022

  1. Update Codacy link (#3740)

    nlohmann authored Sep 16, 2022
    Copy the full SHA
    c920f3f View commit details

Commits on Sep 17, 2022

  1. Fix typos in .md files (#3748)

    tocic authored Sep 17, 2022
    Copy the full SHA
    9dfa722 View commit details

Commits on Sep 18, 2022

  1. Copy the full SHA
    2d1f9b6 View commit details

Commits on Sep 19, 2022

  1. Copy the full SHA
    3d1252b View commit details
  2. Copy the full SHA
    f4658de View commit details

Commits on Sep 25, 2022

  1. Copy the full SHA
    17d9eac View commit details

Commits on Sep 26, 2022

  1. Copy the full SHA
    4b2c8ce View commit details

Commits on Oct 2, 2022

  1. Bump joblib from 1.1.0 to 1.2.0 in /docs/mkdocs (#3781)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Oct 2, 2022
    Copy the full SHA
    a3e6e26 View commit details

Commits on Dec 4, 2022

  1. Fix pipeline (#3862)

    nlohmann authored Dec 4, 2022
    Copy the full SHA
    24ba54e View commit details
  2. 🐛 fix natvis XML

    nlohmann committed Dec 4, 2022
    Copy the full SHA
    8f83153 View commit details

Commits on Dec 9, 2022

  1. Fix natvis XML (#3863)

    * 🐛 fix natvis XML
    
    * 🐛 fix natvis XML
    nlohmann authored Dec 9, 2022
    Copy the full SHA
    349e4b3 View commit details

Commits on Dec 10, 2022

  1. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    c5a03c2 View commit details
  2. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    c700a9e View commit details
  3. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    5fa4e66 View commit details
  4. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    23e6922 View commit details
  5. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    84e5a32 View commit details
  6. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    f7d46b8 View commit details
  7. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    07182eb View commit details
  8. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    b6dcf3e View commit details
  9. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    3e99087 View commit details
  10. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    44423b4 View commit details
  11. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    97f88ce View commit details
  12. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    813c329 View commit details
  13. 💚 fix Ubuntu build

    nlohmann committed Dec 10, 2022
    Copy the full SHA
    3c616ed View commit details

Commits on Dec 11, 2022

  1. Bump certifi from 2022.6.15 to 2022.12.7 in /docs/mkdocs (#3872)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Dec 11, 2022
    Copy the full SHA
    ea870ea View commit details
  2. Copy the full SHA
    094a3dc View commit details
  3. Clang 15 (#3876)

    nlohmann authored Dec 11, 2022
    Copy the full SHA
    7f72eed View commit details

Commits on Dec 18, 2022

  1. Add migration guide (#3887)

    nlohmann authored Dec 18, 2022
    Copy the full SHA
    885aa00 View commit details
  2. Copy the full SHA
    2ca8dab View commit details
  3. Copy the full SHA
    80dfb04 View commit details

Commits on Dec 19, 2022

  1. Copy the full SHA
    a2f0593 View commit details

Commits on Dec 21, 2022

  1. Try old MinGW script (#3892)

    * ⚗️ try old MinGW script
    
    * ⚗️ add Clang 13, 14, and 15 for Windows
    
    * 📝 add Clang version to README
    nlohmann authored Dec 21, 2022
    Copy the full SHA
    4c6cde7 View commit details

Commits on Jan 14, 2023

  1. Copy the full SHA
    da6b908 View commit details

Commits on Jan 31, 2023

  1. Fix CI issues (#3906)

    Co-authored-by: barcode <barcode@example.com>
    barcode and barcode authored Jan 31, 2023
    Copy the full SHA
    233d233 View commit details
  2. Copy the full SHA
    8fa0d7b View commit details

Commits on Feb 1, 2023

  1. Copy the full SHA
    b230614 View commit details

Commits on Mar 5, 2023

  1. Copy the full SHA
    660d0b5 View commit details
  2. Copy the full SHA
    b504dca View commit details

Commits on Mar 8, 2023

  1. Copy the full SHA
    6cec5ae View commit details
  2. Copy the full SHA
    31c00dc View commit details
  3. ⬆️ Bump future from 0.18.2 to 0.18.3 in /docs/mkdocs (#3934)

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Mar 8, 2023
    Copy the full SHA
    fe4b663 View commit details
  4. Prevent memory leak when exception is thrown in adl_serializer::to_js…

    …on (#3901)
    
    Co-authored-by: barcode <barcode@example.com>
    barcode and barcode authored Mar 8, 2023
    1
    Copy the full SHA
    bbe337c View commit details

Commits on Mar 13, 2023

  1. Copy the full SHA
    546370c View commit details
Showing 808 changed files with 21,815 additions and 17,742 deletions.
19 changes: 7 additions & 12 deletions .github/external_ci/.drone.yml → .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
kind: pipeline
name: test-on-arm64
arm_container:
image: gcc:latest

platform:
arch: arm64

steps:
- name: build
image: gcc
commands:
check_task:
check_script:
- wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2.tar.gz
- tar xfz cmake-3.20.2.tar.gz
- cd cmake-3.20.2
- ./configure
- make cmake ctest -j10
- make cmake ctest -j4
- cd ..
- mkdir build
- cd build
- ../cmake-3.20.2/bin/cmake .. -DJSON_FastTests=ON
- make -j10
- make -j4
- cd tests
- ../../cmake-3.20.2/bin/ctest -j10
- ../../cmake-3.20.2/bin/ctest -j4
84 changes: 0 additions & 84 deletions .clang-format

This file was deleted.

20 changes: 20 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
# TODO: The first three checks are only removed to get the CI going. They have to be addressed at some point.

Checks: '*,
-portability-template-virtual-member-function,
-bugprone-use-after-move,
-hicpp-invalid-access-moved,
-altera-id-dependent-backward-branch,
-altera-struct-pack-align,
-altera-unroll-loops,
-android-cloexec-fopen,
-boost-use-ranges,
-bugprone-easily-swappable-parameters,
-cert-err58-cpp,
-concurrency-mt-unsafe,
-cppcoreguidelines-avoid-const-or-ref-data-members,
-cppcoreguidelines-avoid-do-while,
-cppcoreguidelines-avoid-goto,
-cppcoreguidelines-avoid-magic-numbers,
-cppcoreguidelines-avoid-non-const-global-variables,
@@ -15,6 +25,7 @@ Checks: '*,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-union-access,
-cppcoreguidelines-rvalue-reference-param-not-moved,
-cppcoreguidelines-virtual-class-destructor,
-fuchsia-default-arguments-calls,
-fuchsia-default-arguments-declarations,
@@ -33,11 +44,20 @@ Checks: '*,
-llvm-header-guard,
-llvm-include-order,
-llvmlibc-*,
-misc-use-anonymous-namespace,
-misc-confusable-identifiers,
-misc-include-cleaner,
-misc-no-recursion,
-misc-non-private-member-variables-in-classes,
-modernize-concat-nested-namespaces,
-modernize-type-traits,
-modernize-use-constraints,
-modernize-use-designated-initializers,
-modernize-use-nodiscard,
-modernize-use-ranges,
-modernize-use-std-numbers,
-modernize-use-trailing-return-type,
-performance-enum-size,
-readability-function-cognitive-complexity,
-readability-function-size,
-readability-identifier-length,
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# JSON for Modern C++ has been originally written by Niels Lohmann.
# Since 2013 over 140 contributors have helped to improve the library.
# JSON for Modern C++ was originally written by Niels Lohmann.
# Since 2013, over 250 contributors have helped to improve the library.
# This CODEOWNERS file is only to make sure that @nlohmann is requested
# for a code review in case of a pull request.

128 changes: 107 additions & 21 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -2,45 +2,131 @@

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:
Examples of behavior that contributes to a positive environment for our
community include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior by participants include:
Examples of unacceptable behavior include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities
## Enforcement Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official email address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mail@nlohmann.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[mail@nlohmann.me](mailto:mail@nlohmann.me).
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.1, available at
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
[https://www.contributor-covenant.org/translations][translations].

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[homepage]: https://www.contributor-covenant.org
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
Loading