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

Move lambda out of unevaluated context #1230

Merged
merged 1 commit into from
Sep 10, 2018

Conversation

vimpunk
Copy link
Contributor

@vimpunk vimpunk commented Sep 10, 2018

Fixes #1225.

As per issue #1225, the lambda has been moved out of the assert to prevent the "lambda-expression in unevaluated context" error that is present with older compilers, and has been wrapped in an #ifdef DEBUG directive to keep production and debug builds the same.


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.8 (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.

@coveralls
Copy link

coveralls commented Sep 10, 2018

Coverage Status

Coverage remained the same at 100.0% when pulling 6b5334c on mandreyel:lambda-unevaluated-context-fix into ebb3c03 on nlohmann:develop.

@@ -320,15 +320,18 @@ class input_adapter
int>::type = 0>
input_adapter(IteratorType first, IteratorType last)
{
#ifdef DEBUG
Copy link
Owner

Choose a reason for hiding this comment

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

I am sorry, I wrote it wrong in the original issue. This should be #ifndef NDEBUG, see https://en.cppreference.com/w/cpp/error/assert.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that's what I thought, should have asked. Brb then!

@vimpunk vimpunk force-pushed the lambda-unevaluated-context-fix branch from e234a17 to 6b5334c Compare September 10, 2018 11:35
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 Sep 10, 2018
@nlohmann nlohmann added this to the Release 3.2.1 milestone Sep 10, 2018
@nlohmann nlohmann merged commit 186c747 into nlohmann:develop Sep 10, 2018
@nlohmann
Copy link
Owner

Thanks a lot!

@vimpunk
Copy link
Contributor Author

vimpunk commented Sep 10, 2018

Thank you for the great lib!

@vimpunk vimpunk deleted the lambda-unevaluated-context-fix branch September 10, 2018 20:02
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.

3 participants