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.

Sign up for GitHub

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

Jump to bottom

Templatize basic_json constructor from json_ref #2034

Merged
merged 2 commits into from
Apr 13, 2020
Merged

Templatize basic_json constructor from json_ref #2034

merged 2 commits into from
Apr 13, 2020

Conversation

ArtemSarmini
Copy link
Contributor

@ArtemSarmini ArtemSarmini commented Apr 12, 2020 •
edited by nlohmann
Loading

Closes #1920. Closes #1912.

Compiles on experimental g++ 10.0.1 20200405.
Side effect is that json_ref is forward-declared in type_traits.hpp.

Pull request checklist

Read the Contribution Guidelines for detailed information.

  • Changes are described in the pull request, or an existing issue is referenced.
  • The test suite compiles and runs without error.
  • Code coverage is 100%. Test cases can be added by editing the test suite.
  • The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

Please don't

  • The C++11 support varies between different compilers and versions. Please note the list of supported compilers. Some compilers like GCC 4.7 (and earlier), Clang 3.3 (and earlier), or Microsoft Visual Studio 13.0 and earlier are known not to work due to missing or incomplete C++11 support. Please refrain from proposing changes that work around these compiler's limitations with #ifdefs or other means.
  • Specifically, I am aware of compilation problems with Microsoft Visual Studio (there even is an issue label for these kind of bugs). I understand that even in 2016, complete C++11 support isn't there yet. But please also understand that I do not want to drop features or uglify the code just to make Microsoft's sub-standard compiler happy. The past has shown that there are ways to express the functionality such that the code compiles with the most recent MSVC - unfortunately, this is not the main objective of the project.
  • Please refrain from proposing changes that would break JSON conformance. If you propose a conformant extension of JSON to be supported by the library, please motivate this extension.
  • Please do not open pull requests that address multiple issues.

@ArtemSarmini
Copy link
Contributor Author

Also solves #1912.

nlohmann
nlohmann approved these changes Apr 13, 2020
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nlohmann nlohmann self-assigned this Apr 13, 2020
@nlohmann nlohmann added this to the Release 3.7.4 milestone Apr 13, 2020
@nlohmann nlohmann merged commit 84f19d6 into nlohmann:develop Apr 13, 2020
@nlohmann
Copy link
Owner

Thanks!

@nlohmann
Copy link
Owner

🔖 Release item

This issue/PR will be part of the next release of the library. This template helps preparing the release notes.

Type

  • ✨ New Feature
  • 🐛 Bug Fix
  • ⚡️ Improvement
  • 🔨 Further Change
  • 🔥 Deprecated function

Description

@ArtemSarmini ArtemSarmini deleted the gh-1920-gcc-10-incomplete-types branch April 13, 2020 12:45
@deepbluev7 deepbluev7 mentioned this pull request May 14, 2020
Closed
geissonator added a commit to geissonator/meta-openembedded that referenced this pull request May 17, 2020
@geissonator
nlohmann-json: backport gcc10 fix
7d0b0e5 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.
@geissonator geissonator mentioned this pull request May 17, 2020
Closed
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request May 17, 2020
@geissonator @kraj
nlohmann-json: backport gcc10 fix
81467a0 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
halstead pushed a commit to openembedded/meta-openembedded that referenced this pull request May 17, 2020
@geissonator @kraj
nlohmann-json: backport gcc10 fix
12b707c 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
paulgessinger added a commit to paulgessinger/acts that referenced this pull request May 19, 2020
@paulgessinger
Bump bundled nlohmann::json to commit 84f19d6
fb6aa05 
There is a gcc10 compilation issue that got resolved in
[acts-project#2034](nlohmann/json#2034). There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.
@paulgessinger paulgessinger mentioned this pull request May 19, 2020
Merged
asalzburger pushed a commit to acts-project/acts that referenced this pull request May 19, 2020
@paulgessinger
Bump bundled nlohmann::json to commit 84f19d6 (#209)
fd95c91 
There is a gcc10 compilation issue that got resolved in
[#2034](nlohmann/json#2034). There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.
geissonator added a commit to openbmc/openbmc that referenced this pull request May 22, 2020
@geissonator
nlohmann-json: backport gcc10 fix
dce5cf9 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Change-Id: I92f641bf4859708fbf78d78448e16c39577a2e39
Signed-off-by: Andrew Geissler <[email protected]>
@deepbluev7 deepbluev7 mentioned this pull request May 25, 2020
Closed
5 tasks
halstead pushed a commit to openembedded/meta-openembedded that referenced this pull request Jun 3, 2020
@geissonator @akuster
nlohmann-json: backport gcc10 fix
3575cb4 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 12b707c)
Signed-off-by: Armin Kuster <[email protected]>
iipeace pushed a commit to iipeace/meta-openembedded that referenced this pull request Jun 16, 2020
@geissonator @iipeace
nlohmann-json: backport gcc10 fix
afa8a97 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
paulgessinger added a commit to paulgessinger/acts that referenced this pull request Jul 13, 2020
@paulgessinger
Bump bundled nlohmann::json to commit 84f19d6 (acts-project#209)
74a5a0f 
There is a gcc10 compilation issue that got resolved in
[acts-project#2034](nlohmann/json#2034). There has not been
a tag since this was merged so I'm bumping the bundled version to the
develop branch immediately after that PR went in.
billpittman pushed a commit to billpittman/meta-openembedded that referenced this pull request Apr 26, 2021
@geissonator
nlohmann-json: backport gcc10 fix
b64b916 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
(cherry picked from commit 12b707c)
Signed-off-by: Armin Kuster <[email protected]>
daregit pushed a commit to daregit/yocto-combined that referenced this pull request May 22, 2024
@geissonator @kraj
src/meta-openembedded:nlohmann-json: backport gcc10 fix
087dfb8 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
daregit pushed a commit to daregit/yocto-combined that referenced this pull request May 22, 2024
@geissonator @kraj
src/meta-openembedded:nlohmann-json: backport gcc10 fix
d11f03a 
The following issue and PR describe an issue with nlohmann-json and
GCC10.

nlohmann/json#1920
nlohmann/json#2034

Confirmed that this fixed the issue seen in OpenBMC when pulling in the
latest upstream meta-openembedded.

Signed-off-by: Khem Raj <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees

@nlohmann nlohmann

Labels
release item: 🐛 bug fix
Projects
None yet
Milestone
Release 3.8.0
Development

Successfully merging this pull request may close these issues.

GCC 10 tests build failure Incomplete types reported by (experimental) GCC10
2 participants
@ArtemSarmini @nlohmann