-
-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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
[C++][Pistache] Add compatibility for nlohmann-json 3.5.0 #3306
Merged
stkrwork
merged 2 commits into
OpenAPITools:master
from
muttleyxd:pistache-compatibility-json-35
Jul 13, 2019
Merged
[C++][Pistache] Add compatibility for nlohmann-json 3.5.0 #3306
stkrwork
merged 2 commits into
OpenAPITools:master
from
muttleyxd:pistache-compatibility-json-35
Jul 13, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
muttleyxd
force-pushed
the
pistache-compatibility-json-35
branch
2 times, most recently
from
July 9, 2019 10:53
5deeadc
to
4ef1553
Compare
How do I restart CI here? CircleCI failed with
I don't think the error is related to my change |
This makes generator compatible with nlohmann-json 3.5.0
muttleyxd
force-pushed
the
pistache-compatibility-json-35
branch
from
July 11, 2019 06:35
4ef1553
to
184b7ca
Compare
@muttleyxd next time you can restart the CI by closing and then reopening the PR. |
stkrwork
approved these changes
Jul 13, 2019
@muttleyxd thanks for the PR, which has been included in the 4.1.0 release: https://twitter.com/oas_generator/status/1160000504455319553 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR checklist
./bin/
to update Petstore sample so that CIs can verify the change. (For instance, only need to run./bin/{LANG}-petstore.sh
,./bin/openapi3/{LANG}-petstore.sh
if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in.\bin\windows\
. If contributing template-only or documentation-only changes which will change sample output, be sure to build the project first.master
,4.1.x
,5.0.x
. Default:master
.@ravinikam @stkrwork @etherealjoy @MartinDelille
Description of the PR
While generated sample downloads nlohmann-json from GitHub, it could also be provided by operating system. Debian 10 Buster provides nlohmann-json3-dev package with 3.5.0 version https://packages.debian.org/buster/nlohmann-json3-dev.
contains
was added in 3.6.0 https://github.com/nlohmann/json/releases/tag/v3.6.0This change makes generated code compatible with 3.5.0.
Here's the code I tested it with:
Output:
contains
is implemented as:So it's almost the same code