Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing your nlohmann/json pull request. #1

Closed
wants to merge 213 commits into from

Conversation

pketelsen
Copy link

Hi Harry!

I took the liberty to try and fix your pull request nlohmann#2819. It's a feature I would like as well.
It seems that something went wrong when you tried to rebase onto the develop branch. I fixed this in my repository by cherry-picking only your relevant commits onto the upstream's develop branch.

You shouldn't accept this pull request by merging, that would only make it messier. Fetch my repository and then reset your develop branch to the state from this repository. I can help you, if you're not sure what to do.

Best regards
pketelsen

nlohmann and others added 30 commits January 15, 2021 17:01
includes some macros to be defined for using without file io.
Without SYSTEM static analysis like clang-tidy raise warnings on
json.hpp.  This is not desirable for projects embedding nlohmann_json

Tests:
- Validated that without the option OFF the warnings are raised as
  before
- Validated that with the option ON the warnings are silenced
Possibility to use without the dependency to file io and streams to use in intel sgx enclaves
The default branch was renamed from "master" to "main", which breaks the cloning process.
Specified git branch for google benchmark fetch in benchmark test
nlohmann and others added 27 commits December 29, 2021 13:41
* 🔥 consolidate documentation
* ♻️ overwork std specializations
* 🚚 move images files to mkdocs
* ♻️ fix URLs
* 🔧 tweak MkDocs configuration
* 🔧 add namespaces
* 📝 document deprecations
* 📝 document documentation generation
* 🚸 improve search
* 🚸 add examples
* 🚧 start adding documentation for macros
* 📝 add note for nlohmann#874 (comment)
* 📝 overwork example handling
* 📝 fix Markdown tables
* 👷 add step for NVCC build nlohmann#2676
* 🚨 fix warning (code taken from nlohmann#2736)
* 👷 use version 2.2.0 of the CI image
…ohmann#3295)

* .github/workflows/windows.yml: Add support for Visual Studio 2022

This is available in github actions since some time now [1].

[1]: actions/runner-images#3949

* README.md: Add VS 2022 [skip ci]

The version and the build engine version (aka MSBuild version) were
taken from [1].

[1]: https://github.com/actions/virtual-environments/blob/win22/20220116.1/images/win/Windows2022-Readme.md
…MANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT accordingly
…OHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
@pketelsen
Copy link
Author

Fixed with nlohmann#3143

@pketelsen pketelsen closed this Jan 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.