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

Keep consistent formatting #2770

Merged
merged 2 commits into from
Jun 14, 2021
Merged

Keep consistent formatting #2770

merged 2 commits into from
Jun 14, 2021

Conversation

jasmcaus
Copy link
Contributor

[Describe your pull request here. Please read the text below the line, and make sure you follow the checklist.]

Fix a few formatting issues - adhere to the 4-space indentation + indented an endif().


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.

@jasmcaus jasmcaus requested a review from nlohmann as a code owner May 12, 2021 13:57
@coveralls
Copy link

coveralls commented May 15, 2021

Coverage Status

Coverage remained the same at 99.982% when pulling f118091 on jasmcaus:patch-1 into 7cafc5c on nlohmann:develop.

CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
@jasmcaus
Copy link
Contributor Author

Changes updated as per request

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 May 19, 2021
@nlohmann nlohmann added this to the Release 3.9.2 milestone May 19, 2021
@nlohmann nlohmann merged commit 71a514a into nlohmann:develop Jun 14, 2021
@nlohmann
Copy link
Owner

Thanks!

@jasmcaus jasmcaus deleted the patch-1 branch June 14, 2021 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants